From eac49a90f082c2b659d3c73605929a2a0a6d30ed Mon Sep 17 00:00:00 2001 From: Roy Qu Date: Sun, 5 May 2024 10:24:36 +0800 Subject: [PATCH] - fix: The memory usage displayed after program execution is wrong. - enhancement: New compiler option "stack size" in the link subpage. - change: Set "Ctrl+G" as the shortcut for "Goto page..." - change: Set "Ctrl+B" as the shortcut for "Toggle Bookmark" --- NEWS.md | 4 + RedPandaIDE/compiler/compiler.cpp | 3 +- RedPandaIDE/compiler/compilerinfo.cpp | 7 +- RedPandaIDE/compiler/compilerinfo.h | 4 +- RedPandaIDE/compiler/ojproblemcasesrunner.cpp | 2 +- RedPandaIDE/editor.cpp | 9 + RedPandaIDE/editor.h | 1 + RedPandaIDE/mainwindow.cpp | 68 +-- RedPandaIDE/mainwindow.h | 6 +- RedPandaIDE/mainwindow.ui | 27 +- RedPandaIDE/translations/RedPandaIDE_pt_BR.ts | 448 +++++++++--------- RedPandaIDE/translations/RedPandaIDE_zh_CN.ts | 440 +++++++++-------- RedPandaIDE/translations/RedPandaIDE_zh_TW.ts | 446 ++++++++--------- .../widgets/compileargumentswidget.cpp | 5 +- libs/qsynedit/qsynedit_zh_CN.ts | 2 +- tools/consolepauser/main.windows.cpp | 2 +- 16 files changed, 763 insertions(+), 711 deletions(-) diff --git a/NEWS.md b/NEWS.md index d5959f5a..5293e534 100644 --- a/NEWS.md +++ b/NEWS.md @@ -160,6 +160,10 @@ Red Panda C++ Version 2.27 - fix: project not correctly reparsed after rename unit. - enhancement: support C++ 17 structured binding in stl map containers foreach loop. - fix: Crash when has source line like "std::cout << (3+4*4>5*(4+3)-1 && (4-3>5)) <forceEnglishOutput()) env.insert("LANG","en"); - env.insert("LDFLAGS","-Wl,--stack,12582912"); + //env.insert("LDFLAGS","-Wl,--stack,12582912"); + env.insert("LDFLAGS",""); env.insert("CFLAGS",""); env.insert("CXXFLAGS",""); process.setProcessEnvironment(env); diff --git a/RedPandaIDE/compiler/compilerinfo.cpp b/RedPandaIDE/compiler/compilerinfo.cpp index c56d282a..c44caf60 100644 --- a/RedPandaIDE/compiler/compilerinfo.cpp +++ b/RedPandaIDE/compiler/compilerinfo.cpp @@ -53,7 +53,7 @@ PCompilerOption CompilerInfo::addOption(const QString &key, const QString &name, return pOption; } -PCompilerOption CompilerInfo::addNumberOption(const QString &key, const QString &name, const QString section, bool isC, bool isCpp, bool isLinker, const QString &setting, const QString &suffix, int scale, int minValue, int maxValue) +PCompilerOption CompilerInfo::addNumberOption(const QString &key, const QString &name, const QString section, bool isC, bool isCpp, bool isLinker, const QString &setting, const QString &suffix, int scale, int defaultValue, int minValue, int maxValue) { PCompilerOption pOption = std::make_shared(); pOption->key = key; @@ -64,8 +64,9 @@ PCompilerOption CompilerInfo::addNumberOption(const QString &key, const QString pOption->isLinker = isLinker; pOption->setting= setting; pOption->type = CompilerOptionType::Number; - pOption->unit = suffix; + pOption->suffix = suffix; pOption->scale = scale; + pOption->defaultValue = defaultValue; pOption->minValue = minValue; pOption->maxValue = maxValue; mCompilerOptions.insert(key,pOption); @@ -216,7 +217,7 @@ void CompilerInfo::prepareCompilerOptions() // Linker groupName = QObject::tr("Linker"); - //addNumberOption(LINK_CMD_OPT_STACK_SIZE, QObject::tr("Stack Size"), groupName, false, false, true, "-Wl,--stack,","MB",1024*1024,0,99999); + addNumberOption(LINK_CMD_OPT_STACK_SIZE, QObject::tr("Stack Size"), groupName, false, false, true, "-Wl,--stack,","MB",1024*1024,12,0,99999); addOption(CC_CMD_OPT_USE_PIPE, QObject::tr("Use pipes instead of temporary files during compilation (-pipe)"), groupName, true, true, false, "-pipe"); //addOption(LINK_CMD_OPT_LINK_OBJC, QObject::tr("Link an Objective C program (-lobjc)"), groupName, false, false, true, "-lobjc"); diff --git a/RedPandaIDE/compiler/compilerinfo.h b/RedPandaIDE/compiler/compilerinfo.h index 74d71e3a..1f0c3d53 100644 --- a/RedPandaIDE/compiler/compilerinfo.h +++ b/RedPandaIDE/compiler/compilerinfo.h @@ -103,8 +103,9 @@ typedef struct { CompilerOptionType type; CompileOptionChoiceList choices; // replaces "Yes/No" standard choices (max 30 different choices) /* for spin control */ - QString unit; //suffix int scale; //Scale + QString suffix; //suffix + int defaultValue; int minValue; int maxValue; } CompilerOption; @@ -150,6 +151,7 @@ protected: const QString& setting, const QString& suffix, int scale, + int defaultValue, int minValue, int maxValue ); diff --git a/RedPandaIDE/compiler/ojproblemcasesrunner.cpp b/RedPandaIDE/compiler/ojproblemcasesrunner.cpp index 245c697c..9d8672d2 100644 --- a/RedPandaIDE/compiler/ojproblemcasesrunner.cpp +++ b/RedPandaIDE/compiler/ojproblemcasesrunner.cpp @@ -160,7 +160,7 @@ void OJProblemCasesRunner::runCase(int index,POJProblemCase problemCase) counter.cb = sizeof(counter); if (GetProcessMemoryInfo(hProcess,&counter, sizeof(counter))){ - problemCase->runningMemory = counter.PeakWorkingSetSize; + problemCase->runningMemory = counter.PeakPagefileUsage; } FILETIME creationTime; FILETIME exitTime; diff --git a/RedPandaIDE/editor.cpp b/RedPandaIDE/editor.cpp index 7cae8c53..8e6186c5 100644 --- a/RedPandaIDE/editor.cpp +++ b/RedPandaIDE/editor.cpp @@ -5212,6 +5212,15 @@ bool Editor::hasBreakpoint(int line) return mBreakpointLines.contains(line); } +void Editor::toggleBookmark(int line) +{ + if (hasBookmark(line)) { + removeBookmark(line); + } else { + addBookmark(line); + } +} + void Editor::addBookmark(int line) { mBookmarkLines.insert(line); diff --git a/RedPandaIDE/editor.h b/RedPandaIDE/editor.h index bb948dd3..5d8fd1a0 100644 --- a/RedPandaIDE/editor.h +++ b/RedPandaIDE/editor.h @@ -178,6 +178,7 @@ public: void toggleBreakpoint(int line); void clearBreakpoints(); bool hasBreakpoint(int line); + void toggleBookmark(int line); void addBookmark(int line); void removeBookmark(int line); bool hasBookmark(int line) const; diff --git a/RedPandaIDE/mainwindow.cpp b/RedPandaIDE/mainwindow.cpp index 9fff5e34..998c9b0a 100644 --- a/RedPandaIDE/mainwindow.cpp +++ b/RedPandaIDE/mainwindow.cpp @@ -673,8 +673,7 @@ void MainWindow::updateEditorActions(const Editor *e) ui->actionClose_All->setEnabled(false); ui->actionClose_Others->setEnabled(false); - ui->actionAdd_bookmark->setEnabled(false); - ui->actionRemove_Bookmark->setEnabled(false); + ui->actionToggle_Bookmark->setEnabled(false); ui->actionModify_Bookmark_Description->setEnabled(false); ui->actionMatch_Bracket->setEnabled(false); @@ -755,8 +754,7 @@ void MainWindow::updateEditorActions(const Editor *e) ui->actionClose_Others->setEnabled(mEditorList->pageCount()>1); int line = e->caretY(); - ui->actionAdd_bookmark->setEnabled(e->lineCount()>0 && !e->hasBookmark(line)); - ui->actionRemove_Bookmark->setEnabled(e->hasBookmark(line)); + ui->actionToggle_Bookmark->setEnabled(e->lineCount()>0); ui->actionModify_Bookmark_Description->setEnabled(e->hasBookmark(line)); ui->actionMatch_Bracket->setEnabled(true); @@ -2018,8 +2016,7 @@ void MainWindow::updateActionIcons() ui->actionBack->setIcon(pIconsManager->getIcon(IconsManager::ACTION_CODE_BACK)); ui->actionForward->setIcon(pIconsManager->getIcon(IconsManager::ACTION_CODE_FORWARD)); - ui->actionAdd_bookmark->setIcon(pIconsManager->getIcon(IconsManager::ACTION_CODE_ADD_BOOKMARK)); - ui->actionRemove_Bookmark->setIcon(pIconsManager->getIcon(IconsManager::ACTION_CODE_REMOVE_BOOKMARK)); + ui->actionToggle_Bookmark->setIcon(pIconsManager->getIcon(IconsManager::ACTION_CODE_ADD_BOOKMARK)); ui->actionReformat_Code->setIcon(pIconsManager->getIcon(IconsManager::ACTION_CODE_REFORMAT)); ui->actionProject_New_File->setIcon(pIconsManager->getIcon(IconsManager::ACTION_PROJECT_NEW_FILE)); @@ -5189,8 +5186,7 @@ void MainWindow::onEditorContextMenu(const QPoint& pos) menu.addAction(ui->actionClear_all_breakpoints); menu.addSeparator(); } - menu.addAction(ui->actionAdd_bookmark); - menu.addAction(ui->actionRemove_Bookmark); + menu.addAction(ui->actionToggle_Bookmark); menu.addAction(ui->actionModify_Bookmark_Description); menu.addSeparator(); menu.addAction(ui->actionGo_to_Line); @@ -5207,19 +5203,16 @@ void MainWindow::onEditorContextMenu(const QPoint& pos) menu.addAction(ui->actionClear_all_breakpoints); menu.addSeparator(); } - menu.addAction(ui->actionAdd_bookmark); - menu.addAction(ui->actionRemove_Bookmark); + menu.addAction(ui->actionToggle_Bookmark); menu.addAction(ui->actionModify_Bookmark_Description); menu.addSeparator(); menu.addAction(ui->actionGo_to_Line); } ui->actionLocate_in_Files_View->setEnabled(!editor->isNew()); ui->actionBreakpoint_property->setEnabled(editor->hasBreakpoint(line)); - ui->actionAdd_bookmark->setEnabled( + ui->actionToggle_Bookmark->setEnabled( line>=0 && editor->lineCount()>0 - && !editor->hasBookmark(line) ); - ui->actionRemove_Bookmark->setEnabled(editor->hasBookmark(line)); ui->actionModify_Bookmark_Description->setEnabled(editor->hasBookmark(line)); menu.exec(editor->viewport()->mapToGlobal(pos)); } @@ -8572,35 +8565,6 @@ TodoModel *MainWindow::todoModel() return &mTodoModel; } - -void MainWindow::on_actionAdd_bookmark_triggered() -{ - Editor* editor = mEditorList->getEditor(); - if (editor) { - if (editor->lineCount()<=0) - return; - int line = editor->caretY(); - QString desc = QInputDialog::getText(editor,tr("Bookmark Description"), - tr("Description:"),QLineEdit::Normal, - editor->lineText(line).trimmed()); - desc = desc.trimmed(); - editor->addBookmark(line); - mBookmarkModel->addBookmark(editor->filename(),line,desc,editor->inProject()); - } -} - - -void MainWindow::on_actionRemove_Bookmark_triggered() -{ - Editor* editor = mEditorList->getEditor(); - if (editor) { - int line = editor->caretY(); - editor->removeBookmark(line); - mBookmarkModel->removeBookmark(editor->filename(),line,editor->inProject()); - } -} - - void MainWindow::on_tableBookmark_doubleClicked(const QModelIndex &index) { if (!index.isValid()) @@ -10319,3 +10283,23 @@ void MainWindow::on_cbProblemCaseValidateType_currentIndexChanged(int index) pSettings->executor().save(); } + +void MainWindow::on_actionToggle_Bookmark_triggered() +{ + Editor* editor = mEditorList->getEditor(); + if (editor) { + if (editor->lineCount()<=0) + return; + int line = editor->caretY(); + editor->toggleBookmark(line); + if (editor->hasBookmark(line)) { + QString desc = QInputDialog::getText(editor,tr("Bookmark Description"), + tr("Description:"),QLineEdit::Normal, + editor->lineText(line).trimmed()); + desc = desc.trimmed(); + mBookmarkModel->addBookmark(editor->filename(),line,desc,editor->inProject()); + } else + mBookmarkModel->removeBookmark(editor->filename(),line,editor->inProject()); + } +} + diff --git a/RedPandaIDE/mainwindow.h b/RedPandaIDE/mainwindow.h index f2df7eaf..a678d0b9 100644 --- a/RedPandaIDE/mainwindow.h +++ b/RedPandaIDE/mainwindow.h @@ -630,10 +630,6 @@ private slots: void on_actionEGE_Manual_triggered(); - void on_actionAdd_bookmark_triggered(); - - void on_actionRemove_Bookmark_triggered(); - void on_tableBookmark_doubleClicked(const QModelIndex &index); void on_actionModify_Bookmark_Description_triggered(); @@ -860,6 +856,8 @@ private slots: void on_cbProblemCaseValidateType_currentIndexChanged(int index); + void on_actionToggle_Bookmark_triggered(); + private: Ui::MainWindow *ui; bool mFullInitialized; diff --git a/RedPandaIDE/mainwindow.ui b/RedPandaIDE/mainwindow.ui index 586f2724..e10c9355 100644 --- a/RedPandaIDE/mainwindow.ui +++ b/RedPandaIDE/mainwindow.ui @@ -241,8 +241,7 @@ - - + @@ -2562,9 +2561,6 @@ Open containing folder - - Ctrl+B - Qt::ApplicationShortcut @@ -2687,16 +2683,6 @@ EGE Manual - - - Add Bookmark - - - - - Remove Bookmark - - Modify Bookmark Description @@ -3271,6 +3257,17 @@ QAction::NoRole + + + Toggle Bookmark + + + Ctrl+B + + + QAction::NoRole + + diff --git a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts index 2d3ec33a..f555239c 100644 --- a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts +++ b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts @@ -149,7 +149,7 @@ BacktraceModel - + Function Função @@ -555,7 +555,7 @@ [Nota] - + The compiler process for '%1' failed to start. Falha ao iniciar a compilação para '%1'. @@ -590,7 +590,7 @@ - + - Command: %1 @@ -660,7 +660,7 @@ CompilerManager - + @@ -1276,7 +1276,7 @@ Debugger - + No compiler set Nenhum compilador @@ -1425,25 +1425,25 @@ Imprimir documento - + Ctrl+click for more info Ctrl+clik para mais informações - + astyle not found astyle não encontrado - + Can't find astyle in "%1". Impossível encontrar astyle em "%1" - + Break point condition Condição de parada @@ -3420,7 +3420,7 @@ - + No minimal indent @@ -3467,7 +3467,7 @@ FormatterStyleModel - + Default Padrão @@ -4277,54 +4277,54 @@ MainWindow - + Red Panda C++ Red Panda C++ - - + + Files Arquivos - + - + Project Projeto - - + + Watch Observar - - + + Structure Estrutura - + - + Problem Set Conjunto de problemas - + - - + + New Problem Set Novo conjunto de problemas - + Add Problem Acrescentar problema @@ -4339,58 +4339,58 @@ - + Save Problem Set Salvar conjunto de problemas - - + + Load Problem Set Carregar conjunto de problemas - - + + - + Issues Problemas - - + + Tools Output Saída das ferramentas - + - - + + - + Debug Depurar - + Evaluate: Avaliar: - + Debug Console Console do depurador @@ -4420,15 +4420,15 @@ Expressão de endereço: - - - - + + + + Search Procurar - + History: Histórico @@ -4454,21 +4454,21 @@ - + TODO TODO - - + + Bookmark Bookmark - + - - + + Problem @@ -4480,7 +4480,7 @@ Acrescentar caso de problema - + Remove Problem Case @@ -4544,7 +4544,7 @@ ... - + File Arquivo @@ -4566,8 +4566,8 @@ - - + + @@ -4723,7 +4723,7 @@ - + Copy @@ -5079,7 +5079,7 @@ - + Clear all breakpoints Limpar todos os pontos de paradas @@ -5094,37 +5094,51 @@ Declaração Goto - Ctrl+Shift+G - Ctrl+Shift+G + Ctrl+Shift+G - + Goto Definition Definição Goto - + Ctrl+G Ctrl+G - + Find references Encontrar referências - + + Ctrl+J + + + + + Ctrl+Shift+J + + + + Open containing folder Abrir pasta com o conteúdo + + + Toggle Bookmark + + Ctrl+B Ctrl+B - + Open a terminal here Abrir terminal aqui @@ -5191,7 +5205,7 @@ - + Rename Symbol Renomear símbolo @@ -5244,14 +5258,12 @@ Manual EGE - Add Bookmark - Acrescentar bookmark + Acrescentar bookmark - Remove Bookmark - Remover bookmark + Remover bookmark @@ -5266,7 +5278,7 @@ - + Choose Working Folder Fechar a pasta atual @@ -5407,7 +5419,7 @@ Website - + F1 F1 @@ -5440,7 +5452,7 @@ Push - + Hide Non Support Files Ocultar arquivos sem suporte @@ -5485,25 +5497,25 @@ Ctrl+Shift+Down - + - - + + - + - + Error Erro - + New Novo @@ -5529,12 +5541,12 @@ - + Problem Set %1 Conjunto de problemas %1 - + Load Theme Error Erro ao carregar tema @@ -5607,7 +5619,7 @@ Confirmar - + Source file is not compiled. Arquivo fonte não compilado. @@ -5733,7 +5745,7 @@ Propriedades... - + - Command: %1 @@ -5753,7 +5765,7 @@ - + Open Source File Abrir arquivo fonte @@ -5819,12 +5831,12 @@ - + Add Folder Acrescentar pasta - + Rename Folder Renomear pasta @@ -5881,15 +5893,15 @@ - + - + Delete Remover - + Open in Editor Abrir no editor @@ -5925,22 +5937,22 @@ - + - + Confirm Convertion Confirmar conversão - - + + - + The editing file will be saved using %1 encoding. <br />This operation can't be reverted. <br />Are you sure to continue? O arquivo editado será salvo usando a codificação %1. <br /> Essa operação não poderá ser revertida. <br />Quer mesmo continuar? - + %1 files autosaved Salvamento automático dos arquivos %1 @@ -5972,17 +5984,17 @@ - + Problem Case %1 Caso do problema %1 - + New Folder %1 Nova pasta %1 - + Do you really want to delete %1? Quer mesmo remover %1? @@ -6004,20 +6016,20 @@ - - + + Bookmark Description Marcar descrição - - - + + + Description: Descrição: - + New folder Nova pasta @@ -6028,7 +6040,7 @@ Nome da pasta: - + Break point condition Condição para o ponto de parada @@ -6038,7 +6050,7 @@ Inserir a condição do ponto de parada: - + Save project Salvar projeto @@ -6049,12 +6061,12 @@ - + Do you want to save it? Quer salvar? - + File Changed Arquivo alterado @@ -6081,20 +6093,20 @@ - + New Project File? Novo arquivo de projeto? - - + + Do you want to add the new file to the project? Quer acrescentar novo arquivo ao projeto? - + Open Abrir @@ -6103,12 +6115,12 @@ - + Save Error Salvar erro - + Change Project Compiler Set Alterar o compilador do projeto @@ -6118,8 +6130,8 @@ 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? @@ -6265,7 +6277,7 @@ Quer mesmo remover isso? - + Rename Error Erro ao renomear @@ -6308,7 +6320,7 @@ Arquivos HTML (*.html) - + Change working folder Alterar pasta de trabalho @@ -6423,7 +6435,7 @@ Escolher arquivo para a saída esperada de dados - + Batch Set Cases Conjunto de casos em lote @@ -6459,7 +6471,7 @@ Opções para compilar... - + Explorer Navegador de arquivos @@ -6469,7 +6481,7 @@ Mensagens - + Toggle Explorer Panel Altenar painel do explorador de arquivos (sim/não) @@ -6489,7 +6501,7 @@ Ctrl+F10 - + Modify Watch Modificar observações @@ -6499,7 +6511,7 @@ Expressão a observar - + Rename Renomear @@ -6517,12 +6529,12 @@ sem nome%1 - + Selection Seleção - + Select Word Selecionar palavra @@ -6532,7 +6544,7 @@ Deslocar para a linha ... - + Go to Line Deslocar para linha @@ -6542,7 +6554,7 @@ Linha - + Add Probem Case @@ -6550,7 +6562,7 @@ - + Open Anwser Source File @@ -6560,7 +6572,7 @@ - + New Template... @@ -6570,7 +6582,7 @@ - + Template Exists @@ -6580,35 +6592,35 @@ - + - + Wrong Compiler Settings - + - + Compiler is set not to generate executable. - - + + We need the executabe to run problem case. - - + + Please correct this before start debugging - + Can't open last open information file '%1' for write! @@ -6658,14 +6670,14 @@ - + - + Import FPS Problem Set - + Rename Problem @@ -6675,19 +6687,19 @@ - + FPS Problem Set Files (*.fps;*.xml) - + Trim trailing spaces - - - + + + Export FPS Problem Set @@ -6702,7 +6714,7 @@ - + Rename Problem Set @@ -6712,7 +6724,7 @@ - + Toggle Readonly @@ -6722,12 +6734,17 @@ - + Open file in editors - + + Ctrl+Shift+R + + + + Submit Issues @@ -6737,17 +6754,17 @@ - + New C/C++ File - + New GAS File - + Failed to generate the executable. @@ -6792,7 +6809,7 @@ - + Watchpoint variable name @@ -6802,7 +6819,7 @@ - + Watchpoint hitted @@ -6817,17 +6834,17 @@ - + Ctrl+F12 Ctrl+F12 - + New Text File - + Missing Project Files @@ -6837,7 +6854,7 @@ - + Save settings failed! @@ -6857,19 +6874,19 @@ - + Ctrl+K, Ctrl+S - + - + Correct compile settings for debug - + The generated executable won't have debug symbol infos, and can't be debugged. @@ -6877,55 +6894,55 @@ - + Or you can manually change the following settings in the options dialog's compiler set page: - + - + - Turned on the "Generate debug info (-g3)" option. - + - + - Turned off the "Strip executable (-s)" option. - + - + - Turned off the "Optimization level (-O)" option or set it to "Debug (-Og)". - + - + If you are using the Release compiler set, please use choose the Debug version from toolbar. - + - + Do you want to mannually change the compiler set settings now? - + - + You should recompile after change the compiler set or it's settings. - + Page Up @@ -7020,7 +7037,7 @@ - + Exact @@ -7035,7 +7052,7 @@ - + Folder Not Empty @@ -7050,7 +7067,7 @@ - + Line: %1/%2 Char: %3/%4 @@ -7060,7 +7077,7 @@ - + Move Caret @@ -7068,7 +7085,7 @@ MemoryModel - + ascii: '%1' @@ -7232,7 +7249,7 @@ Projeto%1 - + Default Padrão @@ -7479,7 +7496,7 @@ Impossível salvar arquivo '%1' - + Error Load File Erro ao carregar arquivo @@ -7494,7 +7511,7 @@ Arquivo '%1' existente no projeto - + Project Updated Projeto atualizado @@ -7539,7 +7556,7 @@ Favor alterar as configurações em >> Opções de projeto >> Compilador e salvar o projeto. - + Compiler not found Compilador não encontrado @@ -7559,7 +7576,7 @@ Desenvolvido com uso da IDE Red Panda C++ - + Error Erro @@ -8024,7 +8041,7 @@ %1 arquivos [ %2 fontes, %3 cabeçalhos, %4 recursos, %5 outros ] - + Can't remove old icon file Impossível remover antigo arquivo de ícone @@ -8034,7 +8051,7 @@ Impossível remover antigo arquivo de ícone '%1' - + Select icon file Escolher arquivo de ícone @@ -8101,7 +8118,7 @@ ProjectModel - + File exists Arquivo existente @@ -8370,7 +8387,7 @@ QApplication - + Error Erro @@ -8391,7 +8408,7 @@ QFileSystemModel - + <b>The name "%1" cannot be used.</b><p>Try using another name, with fewer characters or no punctuation marks. @@ -8653,7 +8670,7 @@ - + Error Erro @@ -8691,7 +8708,7 @@ - + Save Salvar @@ -8717,7 +8734,7 @@ Impossível carregar configurações para autolink - + constructor constructor @@ -8795,8 +8812,8 @@ Imitar preprocessores C tradicionais (-traditional-cpp) - - + + Code Generation Geração de código @@ -8809,7 +8826,7 @@ Otimizar menor, porém mantendo completa compatibilidade (-tune) - + Enable use of specific instructions (-mx) Habilitar uso de instruções específicar (-mx) @@ -8881,7 +8898,7 @@ Link para um programa Objective C (-lobjc) - + Do not use standard system libraries (-nostdlib) Não usar bibliotecas padrões do sistema (-nostdlib) @@ -8896,7 +8913,7 @@ Não gerar executável (-s) - + Generate debugging information (-g3) Gerar informação para depuração (-g3) @@ -8913,7 +8930,7 @@ Não montar, compilar e gerar código em assembly (-S) - + Use pipes instead of temporary files during compilation (-pipe) Usar pipes em lugar de arquivos temporários durante compilação (-pipe) @@ -9064,7 +9081,7 @@ - + C++ Language standard (-std) @@ -9134,7 +9151,7 @@ - + Processor (-m) @@ -9154,7 +9171,12 @@ - + + Stack Size + + + + Use movc instead of movx to read from external ram @@ -9237,7 +9259,7 @@ RegisterModel - + Register Registrador @@ -10212,7 +10234,7 @@ Cancelar - + @@ -10276,9 +10298,9 @@ Desempenho - + - + @@ -10286,8 +10308,8 @@ Compilador - - + + Compiler @@ -10396,8 +10418,8 @@ Opções de projeto - - + + @@ -10661,7 +10683,7 @@ TodoModel - + Filename Nome do arquivo diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts index 1c25c53a..d76d5bbd 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_CN.ts @@ -217,7 +217,7 @@ p, li { white-space: pre-wrap; } BacktraceModel - + Function 函数 @@ -692,7 +692,7 @@ p, li { white-space: pre-wrap; } 警告： - + Can't open file "%1" for write! 无法写入文件“%1”。 @@ -772,7 +772,7 @@ p, li { white-space: pre-wrap; } CompilerManager - + @@ -1470,7 +1470,7 @@ p, li { white-space: pre-wrap; } Debugger - + No compiler set 无编译器设置 @@ -1683,7 +1683,7 @@ p, li { white-space: pre-wrap; } 打印文档 - + Ctrl+click for more info @@ -1694,18 +1694,18 @@ p, li { white-space: pre-wrap; } 未找到符号'%1'! - + astyle not found 找不到astyle程序 - + Can't find astyle in "%1". 找不到astyle程序"%1". - + Break point condition 断点条件 @@ -3773,7 +3773,7 @@ p, li { white-space: pre-wrap; } 字符 - + No minimal indent 无最小缩进量 @@ -3820,7 +3820,7 @@ p, li { white-space: pre-wrap; } FormatterStyleModel - + Default 默认 @@ -4654,18 +4654,18 @@ p, li { white-space: pre-wrap; } MainWindow - + Red Panda C++ 小熊猫C++ - - - + + + - + Issues 编译器 @@ -4674,49 +4674,49 @@ p, li { white-space: pre-wrap; } 编译日志 - + File 文件 - + Tools 工具 - + Run 运行 - + Edit 编辑 - + - + Project 项目 - - + + Watch 监视 - - + + Structure 结构 - - + + Files 文件 @@ -4725,28 +4725,28 @@ p, li { white-space: pre-wrap; } 资源 - + - - + + - + Debug 调试 - + Evaluate: 求值 - + Debug Console 调试主控台 @@ -4766,15 +4766,15 @@ p, li { white-space: pre-wrap; } 局部变量 - - - - + + + + Search 查找 - + History: 历史： @@ -4799,13 +4799,13 @@ p, li { white-space: pre-wrap; } 关闭 - + Execute 运行 - + @@ -4828,7 +4828,7 @@ p, li { white-space: pre-wrap; } 工具栏2 - + New 新建 @@ -4891,12 +4891,12 @@ p, li { white-space: pre-wrap; } - + Tools Output 工具输出 - + Choose Input File 选择输入文件 @@ -4960,7 +4960,7 @@ p, li { white-space: pre-wrap; } - + Copy @@ -5100,29 +5100,29 @@ p, li { white-space: pre-wrap; } 单步进入 - + Move Caret 移动光标 - + - + Problem Set 试题集 - + - + New Problem Set 新建试题集 - + Add Problem 添加试题 @@ -5137,15 +5137,15 @@ p, li { white-space: pre-wrap; } - + Save Problem Set 保存试题集 - - + + Load Problem Set 载入试题集 @@ -5167,28 +5167,28 @@ p, li { white-space: pre-wrap; } - + TODO TODO - - + + Bookmark 书签 - + - - + + Problem 试题 - + Add Probem Case 添加试题案例 @@ -5279,14 +5279,14 @@ p, li { white-space: pre-wrap; } - + Import FPS Problem Set 导入FPS试题集 - - + + Export FPS Problem Set 导出FPS试题集 @@ -5537,7 +5537,7 @@ p, li { white-space: pre-wrap; } - + Clear all breakpoints 删除所有断点 @@ -5552,37 +5552,51 @@ p, li { white-space: pre-wrap; } 跳转到声明处 - Ctrl+Shift+G - Ctrl+Shift+G + Ctrl+Shift+G - + Goto Definition 跳转到定义处 - + Ctrl+G Ctrl+G - + Find references 查找符号的引用 - + + Ctrl+J + Ctrl+J + + + + Ctrl+Shift+J + Ctrl+Shift+J + + + Open containing folder 打开所在的文件夹 + + + Toggle Bookmark + 切换书签 + Ctrl+B Ctrl+B - + Open a terminal here 打开命令行窗口 @@ -5613,12 +5627,17 @@ p, li { white-space: pre-wrap; } 新建项目文件 - + Ctrl+F12 Ctrl+F12 - + + Ctrl+Shift+R + Ctrl+Shift+R + + + F1 F1 @@ -5757,7 +5776,7 @@ p, li { white-space: pre-wrap; } 关闭其他窗口 - + Move Selection Up 向上移动选中的行 @@ -5831,7 +5850,7 @@ p, li { white-space: pre-wrap; } 跳转到行... - + New Template... 新建模板... @@ -5886,7 +5905,7 @@ p, li { white-space: pre-wrap; } 切换只读模式 - + Submit Issues 反馈与建议 @@ -5900,12 +5919,12 @@ p, li { white-space: pre-wrap; } 保存为模板... - + New File 新建文件 - + Add to project... 添加到项目... @@ -5941,7 +5960,7 @@ p, li { white-space: pre-wrap; } - + Rename Symbol 重命名符号 @@ -5989,7 +6008,7 @@ p, li { white-space: pre-wrap; } C++参考手册 - + C Reference C参考手册 @@ -6189,19 +6208,17 @@ p, li { white-space: pre-wrap; } C/C++参考 - + EGE Manual EGE图形库手册 - Add Bookmark - 添加书签 + 添加书签 - Remove Bookmark - 删除书签 + 删除书签 @@ -6223,17 +6240,17 @@ p, li { white-space: pre-wrap; } 运行参数... - + File Encoding 文件编码 - + Recent Files 文件历史 - + @@ -6299,7 +6316,7 @@ p, li { white-space: pre-wrap; } 确认 - + Source file is not compiled. 源文件尚未编译。 @@ -6318,27 +6335,27 @@ p, li { white-space: pre-wrap; } - + Wrong Compiler Settings 错误的编译器设置 - + - + Compiler is set not to generate executable. 编译器被设置为不生成可执行文件。 - - + + We need the executabe to run problem case. 我们需要可执行文件来运行试题案例。 - + No compiler set 无编译器设置 @@ -6395,7 +6412,7 @@ p, li { white-space: pre-wrap; } - + Please correct this before start debugging 请在调试前改正设置。 @@ -6404,7 +6421,7 @@ p, li { white-space: pre-wrap; } 重新编译？ - + Save last open info error 保存上次打开信息失败 @@ -6444,19 +6461,19 @@ p, li { white-space: pre-wrap; } 行: %1/%2 字符: %3/%4 选中:%5 - + Line: %1/%2 Char: %3/%4 行: %1/%2 字符: %3/%4 - + - + Correct compile settings for debug 纠正调试用编译设置 - + The generated executable won't have debug symbol infos, and can't be debugged. 生成的可执行文件中会缺少调试符号信息，因此无法编译。 @@ -6468,48 +6485,48 @@ p, li { white-space: pre-wrap; } - + Or you can manually change the following settings in the options dialog's compiler set page: 您也可以手动在选项对话框的编译器设置页中修正下列选项： - + - + - Turned on the "Generate debug info (-g3)" option. - 打开“生成调试信息(-g3)"选项. - + - + - Turned off the "Strip executable (-s)" option. - 关闭"剥除附加信息(-s)"选项. - + - + - Turned off the "Optimization level (-O)" option or set it to "Debug (-Og)". - 关闭"优化级别(-O)选项，或将其设置为"调试(-Og)"级别. - + - + You should recompile after change the compiler set or it's settings. 在更换编译器设置集或修改其设置后，需要重新编译. - + - + Do you want to mannually change the compiler set settings now? 您现在就要手动修改编译器设置集的设置吗？ - + Batch Set Cases 批量设置案例 @@ -6525,7 +6542,7 @@ p, li { white-space: pre-wrap; } 全部复制 - + Go to Line 跳转到行 @@ -6545,17 +6562,17 @@ p, li { white-space: pre-wrap; } 模板%1已存在。是否覆盖？ - + - + Clear 清除 - + Export 导出 @@ -6566,7 +6583,7 @@ p, li { white-space: pre-wrap; } - + Problem Set %1 试题集%1 @@ -6595,7 +6612,7 @@ p, li { white-space: pre-wrap; } 项目已经被修改过，是否需要重新构建？ - + Auto Save Error 自动保存出错 @@ -6610,7 +6627,7 @@ p, li { white-space: pre-wrap; } 试题属性... - + Set Problem Set Name 设置试题集名称 @@ -6620,12 +6637,12 @@ p, li { white-space: pre-wrap; } 试题集名称： - + Remove 删除 - + - Command: %1 - 命令: %1 @@ -6650,7 +6667,7 @@ p, li { white-space: pre-wrap; } 行: %1/%2 字符: %3/%4 选中: %5 - + Remove All Bookmarks 删除全部书签 @@ -6660,16 +6677,16 @@ p, li { white-space: pre-wrap; } 修改描述 - - - + + + Bookmark Description 书签描述 - - - + + + Description: 描述： @@ -6678,7 +6695,7 @@ p, li { white-space: pre-wrap; } 在调试主控台中显示调试器输出 - + Remove this search 清除这次搜索 @@ -6693,7 +6710,7 @@ p, li { white-space: pre-wrap; } 断点条件... - + Break point condition 断点条件 @@ -6703,7 +6720,7 @@ p, li { white-space: pre-wrap; } 输入当前断点的生效条件: - + Remove All Breakpoints Remove all breakpoints 删除所有断点 @@ -6724,7 +6741,7 @@ p, li { white-space: pre-wrap; } - + Add Folder 添加文件夹 @@ -6740,7 +6757,7 @@ p, li { white-space: pre-wrap; } 文件夹： - + Rename Folder 重命名 @@ -6895,15 +6912,15 @@ p, li { white-space: pre-wrap; } - + - + Delete 删除 - + Open in Editor 在编辑器中打开 @@ -6958,7 +6975,7 @@ p, li { white-space: pre-wrap; } 选择答案源代码文件 - + Watchpoint hitted 变量断点被触发 @@ -7008,7 +7025,7 @@ p, li { white-space: pre-wrap; } 您确定要继续吗？ - + Watchpoint variable name 被监控的变量 @@ -7042,7 +7059,7 @@ p, li { white-space: pre-wrap; } C/C++源代码文件 (*.c *.cpp *.cc *.cxx) - + New Folder %1 新建文件夹%1 @@ -7055,7 +7072,7 @@ p, li { white-space: pre-wrap; } 无标题%1 - + Do you really want to delete %1? 你真的要删除%1吗？ @@ -7074,7 +7091,7 @@ p, li { white-space: pre-wrap; } 变量"%1"有改动： - + Old value: %1 旧值: %1 @@ -7094,41 +7111,41 @@ p, li { white-space: pre-wrap; } - + 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 改变项目编译器配置集 @@ -7138,8 +7155,8 @@ p, li { white-space: pre-wrap; } 改变项目的编译器配置集会导致所有的自定义编译器选项被重置。 - - + + Do you really want to do that? 你真的想要那么做吗？ @@ -7148,7 +7165,7 @@ p, li { white-space: pre-wrap; } 批量设置案例 - + Choose input files 选择输入数据文件 @@ -7162,7 +7179,7 @@ p, li { white-space: pre-wrap; } 无标题%1 - + Modify Watch 修改监视表达式 @@ -7222,7 +7239,7 @@ p, li { white-space: pre-wrap; } 你真的要删除它吗？ - + Change working folder 改变工作文件夹 @@ -7273,7 +7290,7 @@ p, li { white-space: pre-wrap; } 第%1行 - + Choose Working Folder @@ -7336,7 +7353,7 @@ p, li { white-space: pre-wrap; } 小熊猫Dev-C++项目文件 (*.dev) - + New project fail 新建项目失败 @@ -7397,7 +7414,7 @@ p, li { white-space: pre-wrap; } 请在工具栏中选择Debug编译器配置集，或者在“编译器配置集”设置的“编译/链接选项”页中<b>启用</b>“生成调试信息(-g3)”、<b>禁用</b>“剥除附件信息(-3)”。 - + C/C++ Source Files (*.c *.cpp *.cc *.cxx) C/C++源代码文件 (*.c *.cpp *.cc *.cxx) @@ -7411,7 +7428,7 @@ p, li { white-space: pre-wrap; } 调试失败 - + The executable doesn't have symbol table, and can't be debugged. 可执行文件中没有符号表信息，无法调试。 @@ -7451,7 +7468,7 @@ p, li { white-space: pre-wrap; } 小熊猫C++项目文件(*.dev) - + Rename Error 重命名出错 @@ -7494,7 +7511,7 @@ p, li { white-space: pre-wrap; } HTML文件 (*.html) - + The current problem set is not empty. 当前的试题集不是空的。 @@ -7516,36 +7533,36 @@ p, li { white-space: pre-wrap; } 载入失败 - - + + Problem Case %1 试题案例%1 - + - - + + - + - + Error 错误 - + Recent Projects 项目历史 - + Load Theme Error 载入主题失败 @@ -7561,7 +7578,7 @@ p, li { white-space: pre-wrap; } 编译生成的可执行文件中没有符号表，无法被调试。 - + Version Control 版本控制 @@ -7571,7 +7588,7 @@ p, li { white-space: pre-wrap; } 请在工具栏中选用Debug编译器配置集，或者在选项对话框的编辑器配置集页中勾选“生成调试信息(-g3)"选项。 - + File '%1' was changed. 磁盘文件'%1'已被修改。 @@ -7607,15 +7624,15 @@ p, li { white-space: pre-wrap; } 运行失败 - - + + - + Confirm Convertion 确认转换 - + Exact 完全一致 @@ -7634,22 +7651,22 @@ p, li { white-space: pre-wrap; } 行: %1 列: %2 (%3个字符) 总行数: %4 - + - + If you are using the Release compiler set, please use choose the Debug version from toolbar. 如果你正在使用Release版的编译器设置集，请在工具栏中将其改为Debug版本。 - - + + - + 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 新监视表达式 @@ -7678,7 +7695,7 @@ p, li { white-space: pre-wrap; } MemoryModel - + addr: %1 地址: %1 @@ -7867,7 +7884,7 @@ p, li { white-space: pre-wrap; } 项目%1 - + Default 默认 @@ -8134,7 +8151,7 @@ p, li { white-space: pre-wrap; } 您确定要继续吗？ - + Error Load File 载入文件错误 @@ -8171,7 +8188,7 @@ p, li { white-space: pre-wrap; } 文件'%1'已在项目中 - + Project Updated 项目已升级 @@ -8217,7 +8234,7 @@ p, li { white-space: pre-wrap; } 请在项目 >> 项目属性 >> 编译器设置中修改您的设置并保存您的项目 - + Compiler not found 未找到编译器 @@ -8707,7 +8724,7 @@ p, li { white-space: pre-wrap; } 共%1个文件[%2个源程序文件，%3个头文件，%4个资源文件，%5个其他文件] - + Can't remove old icon file 无法删除旧图标文件 @@ -8717,7 +8734,7 @@ p, li { white-space: pre-wrap; } 无法删除旧图标文件'%1' - + Select icon file 选择图标文件 @@ -9070,7 +9087,7 @@ p, li { white-space: pre-wrap; } QApplication - + Error 错误 @@ -9091,7 +9108,7 @@ p, li { white-space: pre-wrap; } QFileSystemModel - + <b>The name "%1" cannot be used.</b><p>Try using another name, with fewer characters or no punctuation marks. <b>文件名 "%1" 无法被使用！</b><p>可能是重名、过长、为空或者是使用了不能出现在文件名里的符号。 @@ -9100,7 +9117,7 @@ p, li { white-space: pre-wrap; } QObject - + Save 保存 @@ -9172,7 +9189,7 @@ p, li { white-space: pre-wrap; } - + Error 错误 @@ -9249,8 +9266,8 @@ p, li { white-space: pre-wrap; } 模仿传统C预处理器行为(-traditional-cpp) - - + + Code Generation 代码生成 @@ -9263,7 +9280,7 @@ p, li { white-space: pre-wrap; } 完整兼容特定机器，较少优化(-tune) - + Enable use of specific instructions (-mx) 启用特定指令集(-mx) @@ -9278,7 +9295,7 @@ p, li { white-space: pre-wrap; } 使用下列指针大小编译(-mx) - + Processor (-m) 处理器类型(-m) @@ -9291,7 +9308,7 @@ p, li { white-space: pre-wrap; } 性能分析 - + Generate debugging information (-g3) 生成调试信息(-g3) @@ -9359,7 +9376,12 @@ p, li { white-space: pre-wrap; } 检查是否严格遵守ISO C/C++标准 - + + Stack Size + 栈空间大小 + + + Language standard (--std) C语言标准(--std) @@ -9443,7 +9465,7 @@ p, li { white-space: pre-wrap; } 检查ISO C/C++/C++0x语法一致性(-pedantic) - + Only check the code for syntax errors (-fsyntax-only) 只进行语法检查（不编译）(-fsyntax-only) @@ -9467,7 +9489,7 @@ p, li { white-space: pre-wrap; } 链接Objective-C程序 (-lobjc) - + Do not use standard system libraries (-nostdlib) 不使用标准库和系统启动文件(-nostdlib) @@ -9890,7 +9912,7 @@ p, li { white-space: pre-wrap; } 无标题 - + constructor 构造函数 @@ -9966,7 +9988,7 @@ p, li { white-space: pre-wrap; } RegisterModel - + @@ -11166,7 +11188,7 @@ p, li { white-space: pre-wrap; } - + @@ -11174,8 +11196,8 @@ p, li { white-space: pre-wrap; } 编译器配置集 - - + + Compiler @@ -11330,8 +11352,8 @@ p, li { white-space: pre-wrap; } 项目选项 - - + + @@ -11592,7 +11614,7 @@ p, li { white-space: pre-wrap; } TodoModel - + Filename 文件名 diff --git a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts index dce75392..74422b5a 100644 --- a/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts +++ b/RedPandaIDE/translations/RedPandaIDE_zh_TW.ts @@ -137,7 +137,7 @@ BacktraceModel - + Function @@ -456,7 +456,7 @@ - + The compiler process for '%1' failed to start. @@ -491,7 +491,7 @@ - + - Command: %1 @@ -561,7 +561,7 @@ CompilerManager - + @@ -1121,7 +1121,7 @@ Debugger - + No compiler set @@ -1246,25 +1246,25 @@ - + Ctrl+click for more info - + astyle not found - + Can't find astyle in "%1". - + Break point condition @@ -3165,7 +3165,7 @@ - + No minimal indent @@ -3212,7 +3212,7 @@ FormatterStyleModel - + Default @@ -4014,54 +4014,54 @@ MainWindow - + Red Panda C++ - - + + Files - + - + Project - - + + Watch - - + + Structure - + - + Problem Set - + - - + + New Problem Set - + Add Problem @@ -4076,58 +4076,58 @@ - + Save Problem Set - - + + Load Problem Set - - + + - + Issues - - + + Tools Output - + - - + + - + Debug - + Evaluate: - + Debug Console @@ -4157,15 +4157,15 @@ - - - - + + + + Search - + History: @@ -4191,28 +4191,28 @@ - + TODO - - + + Bookmark - + - - + + Problem - + Add Probem Case @@ -4281,7 +4281,7 @@ - + File @@ -4303,8 +4303,8 @@ - - + + @@ -4452,7 +4452,7 @@ - + Copy @@ -4799,7 +4799,7 @@ - + Clear all breakpoints @@ -4814,37 +4814,47 @@ - - Ctrl+Shift+G - - - - + Goto Definition - + Ctrl+G - + Find references - + + Ctrl+J + + + + + Ctrl+Shift+J + + + + Open containing folder + + + Toggle Bookmark + + Ctrl+B - + Open a terminal here @@ -4911,7 +4921,7 @@ - + Rename Symbol @@ -4963,16 +4973,6 @@ EGE Manual - - - Add Bookmark - - - - - Remove Bookmark - - Modify Bookmark Description @@ -4986,7 +4986,7 @@ - + Choose Working Folder @@ -5103,12 +5103,17 @@ - + + Ctrl+Shift+R + + + + F1 - + Hide Non Support Files @@ -5153,25 +5158,25 @@ - + - - + + - + - + Error - + New @@ -5197,12 +5202,12 @@ - + Problem Set %1 - + Load Theme Error @@ -5259,7 +5264,7 @@ - + Source file is not compiled. @@ -5342,7 +5347,7 @@ - + - Command: %1 @@ -5362,7 +5367,7 @@ - + Open Source File @@ -5434,12 +5439,12 @@ - + Add Folder - + Rename Folder @@ -5496,15 +5501,15 @@ - + - + Delete - + Open in Editor @@ -5540,22 +5545,22 @@ - + - + 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 files autosaved @@ -5592,12 +5597,12 @@ - + Do you really want to do that? - + Choose input files @@ -5608,17 +5613,17 @@ - + Problem Case %1 - + New Folder %1 - + Do you really want to delete %1? @@ -5640,20 +5645,20 @@ - - + + Bookmark Description - - - + + + Description: - + New folder @@ -5664,7 +5669,7 @@ - + Break point condition @@ -5674,7 +5679,7 @@ - + Save project @@ -5685,12 +5690,12 @@ - + Do you want to save it? - + File Changed @@ -5717,20 +5722,20 @@ - + New Project File? - - + + Do you want to add the new file to the project? - + Open @@ -5739,12 +5744,12 @@ - + Save Error - + Change Project Compiler Set @@ -5891,7 +5896,7 @@ - + Rename Error @@ -5934,7 +5939,7 @@ - + Change working folder @@ -6064,7 +6069,7 @@ - + Explorer @@ -6074,7 +6079,7 @@ - + Toggle Explorer Panel @@ -6094,7 +6099,7 @@ - + Modify Watch @@ -6104,7 +6109,7 @@ - + Rename @@ -6114,12 +6119,12 @@ - + Selection - + Select Word @@ -6129,7 +6134,7 @@ - + Go to Line @@ -6139,7 +6144,7 @@ - + New Template... @@ -6159,35 +6164,35 @@ - + - + Wrong Compiler Settings - + - + Compiler is set not to generate executable. - - + + We need the executabe to run problem case. - - + + Please correct this before start debugging - + Can't open last open information file '%1' for write! @@ -6237,14 +6242,14 @@ - + - + Import FPS Problem Set - + Rename Problem @@ -6254,19 +6259,19 @@ - + FPS Problem Set Files (*.fps;*.xml) - + Trim trailing spaces - - - + + + Export FPS Problem Set @@ -6281,7 +6286,7 @@ - + Rename Problem Set @@ -6296,7 +6301,7 @@ - + Toggle Readonly @@ -6306,12 +6311,12 @@ - + Open file in editors - + Submit Issues @@ -6321,17 +6326,17 @@ - + New C/C++ File - + New GAS File - + Failed to generate the executable. @@ -6376,7 +6381,7 @@ - + Watchpoint variable name @@ -6386,7 +6391,7 @@ - + Watchpoint hitted @@ -6401,17 +6406,17 @@ - + Ctrl+F12 - + New Text File - + Missing Project Files @@ -6421,12 +6426,12 @@ - + Save settings failed! - + F11 @@ -6451,14 +6456,14 @@ - + - + Correct compile settings for debug - + The generated executable won't have debug symbol infos, and can't be debugged. @@ -6466,55 +6471,55 @@ - + Or you can manually change the following settings in the options dialog's compiler set page: - + - + - Turned on the "Generate debug info (-g3)" option. - + - + - Turned off the "Strip executable (-s)" option. - + - + - Turned off the "Optimization level (-O)" option or set it to "Debug (-Og)". - + - + If you are using the Release compiler set, please use choose the Debug version from toolbar. - + - + Do you want to mannually change the compiler set settings now? - + - + You should recompile after change the compiler set or it's settings. - + Page Up @@ -6609,7 +6614,7 @@ - + Exact @@ -6624,7 +6629,7 @@ - + Folder Not Empty @@ -6639,7 +6644,7 @@ - + Line: %1/%2 Char: %3/%4 @@ -6649,7 +6654,7 @@ - + Move Caret @@ -6657,7 +6662,7 @@ MemoryModel - + ascii: '%1' @@ -6817,7 +6822,7 @@ - + Default @@ -7040,7 +7045,7 @@ Project - + Error Load File @@ -7055,7 +7060,7 @@ - + Project Updated @@ -7100,7 +7105,7 @@ - + Compiler not found @@ -7120,7 +7125,7 @@ - + Error @@ -7545,7 +7550,7 @@ - + Can't remove old icon file @@ -7555,7 +7560,7 @@ - + Select icon file @@ -7622,7 +7627,7 @@ ProjectModel - + File exists @@ -7875,7 +7880,7 @@ QApplication - + Error @@ -7883,7 +7888,7 @@ QFileSystemModel - + <b>The name "%1" cannot be used.</b><p>Try using another name, with fewer characters or no punctuation marks. @@ -8142,7 +8147,7 @@ - + Error @@ -8176,7 +8181,7 @@ - + Save @@ -8202,7 +8207,7 @@ - + constructor @@ -8212,13 +8217,13 @@ - - + + Code Generation - + Enable use of specific instructions (-mx) @@ -8278,7 +8283,7 @@ - + Do not use standard system libraries (-nostdlib) @@ -8293,12 +8298,12 @@ - + Generate debugging information (-g3) - + Use pipes instead of temporary files during compilation (-pipe) @@ -8416,7 +8421,7 @@ - + C++ Language standard (-std) @@ -8486,7 +8491,7 @@ - + Processor (-m) @@ -8506,7 +8511,12 @@ - + + Stack Size + + + + Use movc instead of movx to read from external ram @@ -8589,7 +8599,7 @@ RegisterModel - + Register @@ -9369,7 +9379,7 @@ - + @@ -9429,9 +9439,9 @@ - + - + @@ -9439,8 +9449,8 @@ - - + + Compiler @@ -9549,8 +9559,8 @@ - - + + @@ -9788,7 +9798,7 @@ TodoModel - + Filename diff --git a/RedPandaIDE/widgets/compileargumentswidget.cpp b/RedPandaIDE/widgets/compileargumentswidget.cpp index d61c1c3d..bd1abcf7 100644 --- a/RedPandaIDE/widgets/compileargumentswidget.cpp +++ b/RedPandaIDE/widgets/compileargumentswidget.cpp @@ -177,11 +177,12 @@ void CompileArgumentsWidget::resetUI(Settings::PCompilerSet pSet, const QMapaddWidget(new QLabel(pOption->name,pWidget),row,1); QSpinBox* pInput = new QSpinBox(pWidget); + QString defaultValue = QString("%1").arg(pOption->defaultValue); bool ok; - int val = options.value(pOption->key,"").toInt(&ok); + int val = options.value(pOption->key,defaultValue).toInt(&ok); if (!ok) val = 0; - pInput->setSuffix(pOption->unit); + pInput->setSuffix(pOption->suffix); pInput->setMinimum(pOption->minValue); pInput->setMaximum(pOption->maxValue); pInput->setValue(val); diff --git a/libs/qsynedit/qsynedit_zh_CN.ts b/libs/qsynedit/qsynedit_zh_CN.ts index ad677a38..06661511 100644 --- a/libs/qsynedit/qsynedit_zh_CN.ts +++ b/libs/qsynedit/qsynedit_zh_CN.ts @@ -4288,7 +4288,7 @@ QSynedit::Document - + Can't open file '%1' for read! 无法读取文件"%1". diff --git a/tools/consolepauser/main.windows.cpp b/tools/consolepauser/main.windows.cpp index 05ae9466..1f6eef17 100644 --- a/tools/consolepauser/main.windows.cpp +++ b/tools/consolepauser/main.windows.cpp @@ -154,7 +154,7 @@ DWORD ExecuteCommand(string& command,bool reInp, LONGLONG &peakMemory, LONGLONG counter.cb = sizeof(counter); if (GetProcessMemoryInfo(pi.hProcess,&counter, sizeof(counter))){ - peakMemory = counter.PeakWorkingSetSize/1024; + peakMemory = counter.PeakPagefileUsage/1024; } FILETIME creationTime; FILETIME exitTime;