Merge branch 'master' of github.com:royqh1979/RedPanda-CPP

royqh1979 · Apr 25, 2023 · b93dac4 · b93dac4
2 parents 4020525 + 9275f97
commit b93dac4
Show file tree

Hide file tree

Showing 19 changed files with 454 additions and 333 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,14 @@
+Red Panda C++ Version 2.21
+
+  - change: The option "Check for stack smashing attacks (-fstack-protector)" is turned off by default in the Debug compiler set settings.
+  - fix: Project makefile generated for C files is not correct.
+  - fix: Horizontal scroll by touchpad is not working.
+  - fix: Horizontal scroll by touchpad is inversed.
+  - fix: Error message when save bookmarks.
+  - enhancement: Auto skip ; and , when input.
+  - enhancement: Add 'characters' column in the file properties dialog.
+  - enhancement: Just keeping two digits after the decimal point for file size in the file properties dialog.
+
 Red Panda C++ Version 2.20
 
   - change: Remove the compiler set option "Syntax error when object larger than"

diff --git a/RedPandaIDE/RedPandaIDE.pro b/RedPandaIDE/RedPandaIDE.pro
@@ -8,7 +8,7 @@ isEmpty(APP_NAME) {
 }
 
 isEmpty(APP_VERSION) {
-    APP_VERSION = 2.20
+    APP_VERSION = 2.21
 }
 
 contains(QMAKE_HOST.arch, x86_64):{

diff --git a/RedPandaIDE/compiler/projectcompiler.cpp b/RedPandaIDE/compiler/projectcompiler.cpp
@@ -467,12 +467,12 @@ void ProjectCompiler::writeMakeObjFilesRules(QFile &file)
                 }
             }
 
-            if (fileType==FileType::CppSource || fileType==FileType::CppSource) {
+            if (fileType==FileType::CSource || fileType==FileType::CppSource) {
                 if (mOnlyCheckSyntax) {
                     if (unit->compileCpp())
                         writeln(file, "\t$(CPP) -c " + genMakePath1(shortFileName) + " $(CXXFLAGS) " + encodingStr);
                     else
-                        writeln(file, "\t(CC) -c " + genMakePath1(shortFileName) + " $(CFLAGS) " + encodingStr);
+                        writeln(file, "\t$(CC) -c " + genMakePath1(shortFileName) + " $(CFLAGS) " + encodingStr);
                 } else {
                     if (unit->compileCpp())
                         writeln(file, "\t$(CPP) -c " + genMakePath1(shortFileName) + " -o " + objFileName2 + " $(CXXFLAGS) " + encodingStr);

diff --git a/RedPandaIDE/debugger.cpp b/RedPandaIDE/debugger.cpp
@@ -745,7 +745,13 @@ void Debugger::save(const QString &filename, const QString& projectFolder)
     foreach (const PWatchVar& watchVar, watchVars) {
         watchVarCompareSet.insert(watchVar->expression);
     }
-    std::shared_ptr<DebugConfig> pConfig = load(filename, forProject);
+    std::shared_ptr<DebugConfig> pConfig;
+    try {
+        pConfig = load(filename, forProject);
+    } catch (FileError& e) {
+
+    }
+
     QFile file(filename);
     if (file.open(QFile::WriteOnly | QFile::Truncate)) {
         foreach (const PBreakpoint& breakpoint, pConfig->breakpoints) {

diff --git a/RedPandaIDE/editor.cpp b/RedPandaIDE/editor.cpp
@@ -1005,6 +1005,8 @@ void Editor::keyPressEvent(QKeyEvent *event)
         case ']':
         case '<':
         case '*':
+        case ';':
+        case ',':
             handled = handleSymbolCompletion(ch);
             return;
         case '(': {
@@ -2561,6 +2563,20 @@ bool Editor::handleSymbolCompletion(QChar key)
             return handleGlobalIncludeSkip();
         }
         return false;
+    case ';':
+        if (selAvail())
+            return false;
+        if (pSettings->editor().overwriteSymbols()) {
+            return handleSemiColonSkip();
+        }
+        return false;
+    case ',':
+        if (selAvail())
+            return false;
+        if (pSettings->editor().overwriteSymbols()) {
+            return handlePeriodSkip();
+        }
+        return false;
     }
     return false;
 }
@@ -2758,6 +2774,29 @@ bool Editor::handleBraceSkip()
     return false;
 }
 
+bool Editor::handleSemiColonSkip()
+{
+    if (getCurrentChar() != ';')
+        return false;
+    bool oldInsertMode = insertMode();
+    setInsertMode(false); //set mode to overwrite
+    processCommand(QSynedit::EditCommand::Char,';');
+    setInsertMode(oldInsertMode);
+    return true;
+}
+
+bool Editor::handlePeriodSkip()
+{
+    if (getCurrentChar() != ',')
+        return false;
+
+    bool oldInsertMode = insertMode();
+    setInsertMode(false); //set mode to overwrite
+    processCommand(QSynedit::EditCommand::Char,',');
+    setInsertMode(oldInsertMode);
+    return true;
+}
+
 bool Editor::handleSingleQuoteCompletion()
 {
     QuoteStatus status = getQuoteStatus();

diff --git a/RedPandaIDE/editor.h b/RedPandaIDE/editor.h
@@ -254,6 +254,8 @@ private slots:
     bool handleMultilineCommentCompletion();
     bool handleBraceCompletion();
     bool handleBraceSkip();
+    bool handleSemiColonSkip();
+    bool handlePeriodSkip();
     bool handleSingleQuoteCompletion();
     bool handleDoubleQuoteCompletion();
     bool handleGlobalIncludeCompletion();

diff --git a/RedPandaIDE/settings.cpp b/RedPandaIDE/settings.cpp
@@ -2748,7 +2748,8 @@ static void setDebugOptions(Settings::PCompilerSet pSet, bool enableAsan = false
 //        pSet->setCustomLinkParams("-fsanitize=address");
 //        pSet->setUseCustomLinkParams(true);
     }
-    pSet->setCompileOption(CC_CMD_OPT_STACK_PROTECTOR, "-strong");
+    //Some windows gcc don't correctly support this
+    //pSet->setCompileOption(CC_CMD_OPT_STACK_PROTECTOR, "-strong");
     pSet->setStaticLink(false);
 
 }

diff --git a/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts b/RedPandaIDE/translations/RedPandaIDE_pt_BR.ts
@@ -757,11 +757,7 @@
     </message>
     <message>
         <source>MB</source>
-        <translation type="unfinished">MB</translation>
-    </message>
-    <message>
-        <source>Syntax error for stack frame larger than</source>
-        <translation type="unfinished"></translation>
+        <translation type="obsolete">MB</translation>
     </message>
 </context>
 <context>
@@ -2215,6 +2211,10 @@
         <source>OK</source>
         <translation>OK</translation>
     </message>
+    <message>
+        <source>Characters:</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>FormatterGeneralWidget</name>