diff --git a/RedPandaIDE/projecttemplate.cpp b/RedPandaIDE/projecttemplate.cpp index f1af5cec..62acf0e3 100644 --- a/RedPandaIDE/projecttemplate.cpp +++ b/RedPandaIDE/projecttemplate.cpp @@ -110,6 +110,7 @@ void ProjectTemplate::readTemplateFile(const QString &fileName) mName = fromByteArray(mIni->GetValue("Template", "Name", "")); if (mDescription.isEmpty()) mDescription = fromByteArray(mIni->GetValue("Template", "Description", "")); + mIconInfo=fromByteArray(mIni->GetValue("Template", "IconInfo", "")); mOptions.icon = mIni->GetValue("Project", "Icon", ""); mOptions.type = static_cast(mIni->GetLongValue("Project", "Type", 0)); // default = gui @@ -253,3 +254,13 @@ void ProjectTemplate::setVersion(int newVersion) mVersion = newVersion; } +QString ProjectTemplate::iconInfo() const +{ + return mIconInfo; +} + +void ProjectTemplate::setIconInfo(const QString &newIconInfo) +{ + mIconInfo = newIconInfo; +} + diff --git a/RedPandaIDE/projecttemplate.h b/RedPandaIDE/projecttemplate.h index 6ebaaeb2..69690ef8 100644 --- a/RedPandaIDE/projecttemplate.h +++ b/RedPandaIDE/projecttemplate.h @@ -65,6 +65,9 @@ public: void setVersion(int newVersion); + QString iconInfo() const; + void setIconInfo(const QString &newIconInfo); + private: QString mFileName; ProjectOptions mOptions; @@ -72,6 +75,7 @@ private: QString mCategory; QString mName; QString mIcon; // icon in project form + QString mIconInfo; PSimpleIni mIni; int mVersion; }; diff --git a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts index 3c63e877..4fa2732d 100644 --- a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts +++ b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts @@ -5463,6 +5463,14 @@ Choose directory Escolher pasta + + Icon Info: + + + + TextLabel + + NewProjectUnitDialog @@ -5881,6 +5889,30 @@ Set Encoding for the executable: Definir codificação para o executável: + + Wrong Compiler Type + + + + Compiler %1 can't compile a microcontroller project. + + + + Compiler %1 can only compile microcontroller project. + + + + Change Project Compiler Set + Alterar o compilador do projeto + + + Change the project's compiler set will lose all custom compiler set options. + Alterar o compilador do projeto resultará na perda de todas as opções personalizadas para compilação. + + + Do you really want to do that? + Quer mesmo fazer isso? + ProjectDLLHostWidget @@ -7185,6 +7217,53 @@ Impossível remover o antigo arquivo executável "%1". + + SDCCProjectCompiler + + Building makefile... + Montando makefile ... + + + - Filename: %1 + + + + Can't open '%1' for write! + Impossível abrir '%1' para gravar! + + + Compiling project changes... + Compilando alterações em projeto ... + + + - Project Filename: %1 + - Nome de arquivo de projeto: %1 + + + - Compiler Set Name: %1 + + + + Make program '%1' doesn't exists! + + + + Please check the "program" page of compiler settings. + + + + Processing makefile: + Processando makefile: + + + - makefile processer: %1 + - Processador do makefile: %1 + + + - Command: %1 %2 + - Comando: %1 %2 + + SearchDialog diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts index d13560e9..cf66bb4b 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts @@ -542,77 +542,77 @@ p, li { white-space: pre-wrap; } Compiler - + Clean before rebuild failed. 重编译前的清理准备工作失败！ - + - Command: %1 %2 - 命令: %1 %2 - + - Command: %1 %2 > "%3" - 命令: %1 %2 > "%3" - + Compile Result: 编译结果： - + - Errors: %1 - 错误数: %1 - + - Warnings: %1 - 警告数: %1 - + - Output Filename: %1 - 输出文件名: %1 - + - Output Size: %1 - 输出文件大小: %1 - + - Compilation Time: %1 secs - 编译时间: %1 秒 - + [Error] [错误] - + [Warning] [警告] - + [Info] [信息] - + [Note] [说明] - + Can't open file "%1" for write! 无法写入文件“%1”。 - + The compiler process for '%1' failed to start. 无法启动编译器进程'%1'。 @@ -621,27 +621,27 @@ p, li { white-space: pre-wrap; } 无法启动编译进程。 - + The compiler process crashed after starting successfully. 编译进程启动后崩溃。 - + The last waitFor...() function timed out. waitFor()函数等待超时。 - + An error occurred when attempting to write to the compiler process. 在向编译进程输入内容时出错。 - + An error occurred when attempting to read from the compiler process. 在从编译进程读取内容时出错。 - + An unknown error occurred. 发生了未知错误。 @@ -687,29 +687,29 @@ p, li { white-space: pre-wrap; } CompilerManager - - - - - + + + + + No compiler set 无编译器设置 - - - - - + + + + + No compiler set is configured. 没有配置编译器设置。 - - - - - + + + + + Can't start debugging. 无法启动调试器 @@ -726,12 +726,12 @@ p, li { white-space: pre-wrap; } 程序中的文字内容可能无法被正确处理和显示。 - + Can't find Console Pauser 找不到Console Pauser程序 - + Console Pauser "%1" doesn't exists! 找不到Console Pauser程序"%1"！ @@ -1505,10 +1505,10 @@ Are you really want to continue? - - - - + + + + Error 错误 @@ -1557,44 +1557,44 @@ Are you really want to continue? 文件%1已经被打开！ - + The text to be copied exceeds count limit! 要复制的内容超过了行数限制！ - + The text to be copied exceeds character limit! 要复制的内容超过了字符数限制！ - + The text to be cut exceeds count limit! 要剪切的内容超过了行数限制！ - + The text to be cut exceeds character limit! 要剪切的内容超过了字符数限制！ - + hex: %1 16进制: %1 - + dec: %1 十进制: %1 - + Print Document 打印文档 - - - + + + Ctrl+click for more info Ctrl+单击以获取更多信息 @@ -1603,27 +1603,27 @@ Are you really want to continue? 未找到符号'%1'! - + astyle not found 找不到astyle程序 - + Can't find astyle in "%1". 找不到astyle程序"%1". - + Break point condition 断点条件 - + Enter the condition of the breakpoint: 输入当前断点的生效条件: - + Readonly 只读 @@ -2966,65 +2966,65 @@ Are you really want to continue? FileCompiler - + Checking single file... 检查单个文件... - + Compiling single file... 编译单个文件... - + - Filename: %1 - 文件名: %1 - + - Compiler Set Name: %1 - 编译器配置: %1 - - + + Can't delete the old executable file "%1". 无法删除旧的可执行文件"%1". - + GNU Assembler GNU汇编 - + Can't find the compiler for file %1 Can't the compiler for file %1 找不到适合文件%1的编译器 - + The Compiler '%1' doesn't exists! 编译器程序"%1"不存在！ - + Please check the "program" page of compiler settings. 请检查编译器设置中的“程序”页。 - + Processing %1 source file: 正在处理%1源程序文件: - + %1 Compiler: %2 %1编译器: %2 - + Command: %1 %2 命令: %1 %2 @@ -6793,20 +6793,17 @@ Are you really want to continue? - Change Project Compiler Set 改变项目编译器配置集 - Change the project's compiler set will lose all custom compiler set options. 改变项目的编译器配置集会导致所有的自定义编译器选项被重置。 - Do you really want to do that? 你真的想要那么做吗？ @@ -7477,17 +7474,27 @@ Are you really want to continue? C++语言项目 - + + Icon Info: + 图标信息: + + + + TextLabel + 文字标签 + + + Name: 项目名称： - + Create in 创建在 - + Use as the default project location 设为默认项目位置 @@ -7496,7 +7503,7 @@ Are you really want to continue? 文件夹： - + ... ... @@ -7505,13 +7512,13 @@ Are you really want to continue? 项目%1 - - + + Default 默认 - + Choose directory 选择文件夹 @@ -7755,105 +7762,105 @@ Are you really want to continue? 无法保存文件'%1'. - + Error Load File 载入文件错误 - - + + Error 错误 - + Can't create folder %1 无法创建文件夹%1 - + Warning 警告 - - + + Can't save file %1 无法保存文件%1 - + File Exists 文件已存在 - + File '%1' is already in the project 文件'%1'已在项目中 - + Project Updated 项目已升级 - + Your project was succesfully updated to a newer file format! 已成功将项目升级到新的格式 - + If something has gone wrong, we kept a backup-file: '%1'... 旧项目文件备份在'%1'。 - + Headers 头文件 - + Sources 源文件 - + Others 其他文件 - + Settings need update 设置需要更新 - + The compiler settings format of Red Panda C++ has changed. The compiler settings format of Dev-C++ has changed. 小熊猫C++的编译器设置格式已发生改变。 - + Please update your settings at Project >> Project Options >> Compiler and save your project. 请在项目 >> 项目属性 >> 编译器设置中修改您的设置并保存您的项目 - + Compiler not found 未找到编译器 - + The compiler set you have selected for this project, no longer exists. 您为该项目设置的编译器不存在。 - + It will be substituted by the global compiler set. 它将会被全局编译器设置代替。 - + Developed using the Red Panda C++ IDE Developed using the Red Panda Dev-C++ IDE 使用小熊猫C++编辑器开发 @@ -7957,62 +7964,62 @@ Are you really want to continue? ProjectCompiler - + Building makefile... 正在构建makefile... - + - Filename: %1 - 文件名: %1 - + Can't open '%1' for write! 无法写入文件'%1'！ - + - Resource File: %1 - 资源文件: %1 - + Compiling project changes... 正在编译项目修改... - + - Project Filename: %1 - 项目文件名: %1 - + - Compiler Set Name: %1 - 编译器配置: %1 - + Make program '%1' doesn't exists! Make程序“%1”不存在！ - + Please check the "program" page of compiler settings. 请检查编译器配置中的“程序”页。 - + Processing makefile: 正在处理makefile... - + - makefile processer: %1 - makefile处理器: %1 - + - Command: %1 %2 - 命令: %1 %2 @@ -8067,6 +8074,37 @@ Are you really want to continue? UTF-8 UTF-8 + + + + Wrong Compiler Type + 错误的编译器类型 + + + + Compiler %1 can't compile a microcontroller project. + 编译器"%1"无法编译嵌入式项目。 + + + + Compiler %1 can only compile microcontroller project. + 编译器"%1"只能编译嵌入式项目 + + + + Change Project Compiler Set + 改变项目编译器配置集 + + + + Change the project's compiler set will lose all custom compiler set options. + 改变项目的编译器配置集会导致所有的自定义编译器选项被重置。 + + + + Do you really want to do that? + 你真的想要那么做吗？ + ProjectDLLHostWidget @@ -8288,42 +8326,42 @@ Are you really want to continue? 输出文件： - + %1 files [ %2 sources, %3 headers, %4 resources, %5 other files ] 共%1个文件[%2个源程序文件，%3个头文件，%4个资源文件，%5个其他文件] - + Can't remove old icon file 无法删除旧图标文件 - + Can't remove old icon file '%1' 无法删除旧图标文件'%1' - + Select icon file 选择图标文件 - + Image Files (*.ico *.png *.jpg) 图像文件 (*.ico *.png *.jpg) - + ANSI ANSI - + UTF-8 UTF-8 - + UTF-8 BOM UTF-8 BOM @@ -8374,32 +8412,32 @@ Are you really want to continue? ProjectModel - + File exists 文件已存在 - + File '%1' already exists. Delete it now? 文件'%1'已存在。是否删除？ - + Remove failed 删除失败 - + Failed to remove file '%1' 无法删除文件'%1' - + Rename failed 改名失败 - + Failed to rename file '%1' to '%2' 无法将文件'%1'改名为'%2' @@ -8825,7 +8863,7 @@ Are you really want to continue? 使用下列指针大小编译(-mx) - + Processor (-m) 处理器类型(-m) @@ -8843,7 +8881,7 @@ Are you really want to continue? 生成调试信息(-g3) - + Would you like Red Panda C++ to search for compilers in PATH? 您同意小熊猫C++在PATH路径中寻找gcc编译器吗？ @@ -8906,12 +8944,12 @@ Are you really want to continue? 检查是否严格遵守ISO C/C++标准 - + Language standard (--std) C语言标准(--std) - + Don't generate startup code 无main函数时不生成起始代码(用于edsim51模拟器) @@ -8984,7 +9022,7 @@ Are you really want to continue? 只生成汇编代码(-S) - + Confirm 确认 @@ -9005,13 +9043,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 @@ -9367,12 +9405,12 @@ Are you really want to continue? 无标题 - + constructor 构造函数 - + destructor 析构函数 @@ -9869,59 +9907,117 @@ Are you really want to continue? SDCCFileCompiler - + Compiling single file... 编译单个文件... - + - Filename: %1 - 文件名: %1 - + - Compiler Set Name: %1 - 编译器配置: %1 - - + + Can't find "%1". 找不到文件"%1". - + The Compiler '%1' doesn't exists! 找不到编译器'%1'. - + Please check the "program" page of compiler settings. 请检查编译器设置页中的“程序”页。 - + Processing %1 source file: 正在处理%1源程序文件: - + - %1 Compiler: %2 - %1 编译器: %2 - + - Command: %1 %2 - 命令: %1 %2 - + Can't delete the old executable file "%1". 无法删除旧的可执行文件"%1". + + SDCCProjectCompiler + + + Building makefile... + 正在构建makefile... + + + + - Filename: %1 + - 文件名: %1 + + + + Can't open '%1' for write! + 无法写入文件'%1'！ + + + + Compiling project changes... + 正在编译项目修改... + + + + - Project Filename: %1 + - 项目文件名: %1 + + + + - Compiler Set Name: %1 + - 编译器配置: %1 + + + + Make program '%1' doesn't exists! + Make程序“%1”不存在！ + + + + Please check the "program" page of compiler settings. + 请检查编译器设置的“程序”标签页。 + + + + Processing makefile: + 正在处理makefile... + + + + - makefile processer: %1 + - makefile处理器: %1 + + + + - Command: %1 %2 + - 命令: %1 %2 + + SearchDialog @@ -10519,7 +10615,7 @@ Are you really want to continue? - + Compiler Set 编译器配置集 @@ -10543,7 +10639,7 @@ Are you really want to continue? - + General 通用 @@ -10675,73 +10771,73 @@ Are you really want to continue? Git - + Project Options 项目选项 - - - - - - - - - - + + + + + + + + + + Project 项目 - + Files 文件 - + Custom Compile options 自定义编译选项 - + Directories 文件夹 - + Precompiled Header 预编译头文件 - + Makefile Makefile - + Output 输出 - + DLL host DLL宿主 - + Version info 版本信息 - + Save Changes 保存修改 - + There are changes in the settings, do you want to save them before swtich to other page? 本页中有尚未保存的设置修改，是否保存后再切换到其他页？ diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts index 1fba16a0..af62ffb6 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts @@ -5188,6 +5188,14 @@ Choose directory + + Icon Info: + + + + TextLabel + + NewProjectUnitDialog @@ -5570,6 +5578,30 @@ Set Encoding for the executable: + + Wrong Compiler Type + + + + Compiler %1 can't compile a microcontroller project. + + + + Compiler %1 can only compile microcontroller project. + + + + Change Project Compiler Set + + + + Change the project's compiler set will lose all custom compiler set options. + + + + Do you really want to do that? + + ProjectDLLHostWidget @@ -6635,6 +6667,53 @@ + + SDCCProjectCompiler + + Building makefile... + + + + - Filename: %1 + + + + Can't open '%1' for write! + + + + Compiling project changes... + + + + - Project Filename: %1 + + + + - Compiler Set Name: %1 + + + + Make program '%1' doesn't exists! + + + + Please check the "program" page of compiler settings. + + + + Processing makefile: + + + + - makefile processer: %1 + + + + - Command: %1 %2 + + + SearchDialog diff --git a/RedPandaIDE/widgets/newprojectdialog.cpp b/RedPandaIDE/widgets/newprojectdialog.cpp index 10364414..1ed4bf72 100644 --- a/RedPandaIDE/widgets/newprojectdialog.cpp +++ b/RedPandaIDE/widgets/newprojectdialog.cpp @@ -255,11 +255,18 @@ void NewProjectDialog::on_lstTemplates_currentItemChanged(QListWidgetItem *curre ui->rdCProject->setChecked(true); } } + if (t->iconInfo().isEmpty()) { + ui->panelIconInfo->setVisible(false); + } else { + ui->panelIconInfo->setVisible(true); + ui->lblIconInfo->setText(t->iconInfo()); + } } else { ui->lblDescription->setText(""); ui->rdCProject->setChecked(false); ui->rdCppProject->setChecked(false); ui->chkMakeDefaultLanguage->setChecked(false); + ui->panelIconInfo->setVisible(false); } ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled( current && !ui->txtProjectName->text().isEmpty() diff --git a/RedPandaIDE/widgets/newprojectdialog.ui b/RedPandaIDE/widgets/newprojectdialog.ui index 27ca77ae..9f90c4d5 100644 --- a/RedPandaIDE/widgets/newprojectdialog.ui +++ b/RedPandaIDE/widgets/newprojectdialog.ui @@ -136,6 +136,44 @@ + + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + Icon Info: + + + + + + + + 0 + 0 + + + + + + + + + + diff --git a/platform/windows/templates/1-WinApp/Windows.ico b/platform/windows/templates/1-WinApp/Windows.ico index b2682537..ad4e9f5b 100644 Binary files a/platform/windows/templates/1-WinApp/Windows.ico and b/platform/windows/templates/1-WinApp/Windows.ico differ diff --git a/platform/windows/templates/2-ConsoleApp/ConsoleToo.ico b/platform/windows/templates/2-ConsoleApp/ConsoleToo.ico index 4238e81f..49c9bc8e 100644 Binary files a/platform/windows/templates/2-ConsoleApp/ConsoleToo.ico and b/platform/windows/templates/2-ConsoleApp/ConsoleToo.ico differ diff --git a/platform/windows/templates/3-StaticLib/StaticLib.ico b/platform/windows/templates/3-StaticLib/StaticLib.ico index 10d38f5c..db26498d 100644 Binary files a/platform/windows/templates/3-StaticLib/StaticLib.ico and b/platform/windows/templates/3-StaticLib/StaticLib.ico differ diff --git a/platform/windows/templates/4-DLL/DLL.ico b/platform/windows/templates/4-DLL/DLL.ico index 11c8e046..c195a0ec 100644 Binary files a/platform/windows/templates/4-DLL/DLL.ico and b/platform/windows/templates/4-DLL/DLL.ico differ diff --git a/platform/windows/templates/4-DLL/info.template b/platform/windows/templates/4-DLL/info.template index be9d32fa..142c0dae 100644 --- a/platform/windows/templates/4-DLL/info.template +++ b/platform/windows/templates/4-DLL/info.template @@ -3,6 +3,7 @@ ver=2 Name=DLL Name[zh_CN]=动态链接库 Icon=DLL.ico +IconInfo=Dll icons created by Freepik - Flaticon Description=A Dynamic Link Library (DLL) Description[zh_CN]=动态链接库(DLL) Category=Basic diff --git a/platform/windows/templates/sdcc-mcs51/info.template b/platform/windows/templates/sdcc-mcs51/info.template index 638d521c..e0266bd9 100644 --- a/platform/windows/templates/sdcc-mcs51/info.template +++ b/platform/windows/templates/sdcc-mcs51/info.template @@ -3,6 +3,7 @@ ver=2 Name=MCS51 Name[zh_CN]=MCS51 Icon=microcontroller.ico +IconInfo=Microcontroller icons created by Eucalyp - Flaticon Description=A simple MCS51 program Description[zh_CN]=MCS51单片机程序 Category=SDCC