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

NEWS.md

@@ -22,6 +22,8 @@ Red Panda C++ Version 0.13.2
   - fix: If project's compiler set is not the same with the default compiler set, auto openned project's file will use wrong compiler set to do syntax check.
   - fix: open a project file through "File"->"Open" will not correctly connect it with the project internally
   - fix: wrong project program directory parameter is sent to the debugger
+  - enhancement: better behavior of mouse tips
+  - fix: in linux, projects no need of winres to be built
 
 Red Panda C++ Version 0.13.1
  - enhancement: suppoort localization info in project templates

RedPandaIDE/compiler/projectcompiler.cpp

@@ -176,6 +176,7 @@ void ProjectCompiler::writeMakeDefines(QFile &file)
 
     // Get windres file
     QString ObjResFile;
+#ifdef Q_OS_WIN
     if (!mProject->options().privateResource.isEmpty()) {
       if (!mProject->options().objectOutput.isEmpty()) {
           ObjResFile = includeTrailingPathDelimiter(mProject->options().objectOutput) +
@@ -183,6 +184,7 @@ void ProjectCompiler::writeMakeDefines(QFile &file)
       } else
           ObjResFile = changeFileExt(mProject->options().privateResource, RES_EXT);
     }
+#endif
 
     // Mention progress in the logs
     if (!ObjResFile.isEmpty()) {
@@ -204,7 +206,9 @@ void ProjectCompiler::writeMakeDefines(QFile &file)
     }
     writeln(file,"CPP      = " + extractFileName(compilerSet()->cppCompiler()));
     writeln(file,"CC       = " + extractFileName(compilerSet()->CCompiler()));
+#ifdef Q_OS_WIN
     writeln(file,"WINDRES  = " + extractFileName(compilerSet()->resourceCompiler()));
+#endif
     if (!ObjResFile.isEmpty()) {
       writeln(file,"RES      = " + genMakePath1(ObjResFile));
       writeln(file,"OBJ      = " + Objects + " $(RES)");
@@ -381,6 +385,7 @@ void ProjectCompiler::writeMakeObjFilesRules(QFile &file)
         }
     }
 
+#ifdef Q_OS_WIN
     if (!mProject->options().privateResource.isEmpty()) {
 
         // Concatenate all resource include directories
@@ -433,6 +438,7 @@ void ProjectCompiler::writeMakeObjFilesRules(QFile &file)
         }
         writeln(file);
     }
+#endif
 }
 
 void ProjectCompiler::writeln(QFile &file, const QString &s)

RedPandaIDE/editor.cpp

@@ -1017,6 +1017,8 @@ bool Editor::event(QEvent *event)
             break;
         case TipType::None:
             cancelHint();
+            mCurrentWord = "";
+            mCurrentTipType = TipType::None;
             event->ignore();
             return true;
         }
@@ -1080,6 +1082,9 @@ bool Editor::event(QEvent *event)
             } else if (cursor() == Qt::PointingHandCursor) {
                 updateMouseCursor();
             }
+            if (pMainWindow->functionTip()->isVisible()) {
+                pMainWindow->functionTip()->hide();
+            }
             QToolTip::showText(mapToGlobal(helpEvent->pos()),hint);
             event->ignore();
         } else {
@@ -2577,6 +2582,9 @@ void Editor::exportAsHTML(const QString &htmlFilename)
 
 void Editor::showCompletion(const QString& preWord,bool autoComplete)
 {
+    if (pMainWindow->functionTip()->isVisible()) {
+        pMainWindow->functionTip()->hide();
+    }
     if (!pSettings->codeCompletion().enabled())
         return;
     if (!mParser->enabled())
@@ -3060,8 +3068,8 @@ void Editor::cancelHint()
 
     // disable editor hint
     QToolTip::hideText();
-    mCurrentWord = "";
+    //mCurrentWord = "";
-    mCurrentTipType = TipType::None;
+    //mCurrentTipType = TipType::None;
     updateMouseCursor();
 }
 
@@ -3129,6 +3137,9 @@ void Editor::showDebugHint(const QString &s, int line)
     }
     if (pMainWindow->debugger()->commandRunning())
         return;
+    if (pMainWindow->functionTip()->isVisible()) {
+        pMainWindow->functionTip()->hide();
+    }
     connect(pMainWindow->debugger(), &Debugger::evalValueReady,
                this, &Editor::onTipEvalValueReady);
     mCurrentDebugTipWord = s;
@@ -3358,6 +3369,7 @@ void Editor::updateFunctionTip()
     pMainWindow->functionTip()->setParamIndex(
                 paramPos
                 );
+    cancelHint();
     pMainWindow->functionTip()->show();
 }
 

RedPandaIDE/parser/cpptokenizer.cpp

@@ -585,7 +585,7 @@ void CppTokenizer::skipToNextToken()
 
 bool CppTokenizer::isIdentChar(const QChar &ch)
 {
-    return ch.isLetter();
+    return ch=='_' || ch.isLetter() ;
 }
 
 void CppTokenizer::advance()

RedPandaIDE/settings.cpp

@@ -2422,8 +2422,10 @@ static void setDebugOptions(Settings::PCompilerSet pSet) {
     }
 
 #ifdef Q_OS_LINUX
-    pSet->setCustomCompileParams("--sanitize=address");
+    pSet->setCustomCompileParams("-fsanitize=address");
     pSet->setUseCustomCompileParams(true);
+    pSet->setCustomLinkParams("-fsanitize=address");
+    pSet->setUseCustomLinkParams(true);
 #endif
 
 //    pOption = pSet->findOption("-static");

packages/deb/builddeb.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 TMP_FOLDER=/tmp/redpandaide
-version=0.12.6
+version=0.13.2
 make install
 mkdir $TMP_FOLDER
 mkdir $TMP_FOLDER/DEBIAN

packages/deb/control

@@ -1,5 +1,5 @@
 Package: RedPanda-IDE
-Version: 0.12.6
+Version: 0.13.2
 Section: devel
 Priority: optional
 Architecture: amd64

packages/debian/changelog

@@ -1,3 +1,9 @@
+redpanda-cpp (0.13.2-1) unstable; urgency=medium
+
+  * Update to 0.13.2
+
+ -- Roy Qu (瞿华) <royqh1979@gmail.com>  Thu, 6 Jan 2022 14:52:00 +0800
+
 redpanda-cpp (0.12.6-1) unstable; urgency=medium
 
   * Initial release

templates/CL_GLUT.template

@@ -4,7 +4,7 @@ Name=GLUT
 Icon=CL_GLUT.ico
 Description=A simple GLUT program
 Description[zh_CN]=一个简单的GLUT程序
-Category=Multimedia
+Category=3D
 Category[zh_CN]=3D
 
 [Unit0]

templates/GLFW.template

@@ -4,7 +4,7 @@ Name=GLFW
 Description=A simple GLFW program
 Description[zh_CN]=一个简单的GLFW程序
 Icon=GLFW.ico
-Category=Multimedia
+Category=3D
 Category[zh_CN]=3D
 
 [Unit0]

templates/Hello.template

@@ -6,7 +6,7 @@ Icon=Communication.ico
 Description=A classic Hello World program
 Description[zh_CN]=一个经典的“世界，你好！”程序
 Category=Console
-Category=控制台
+Category[zh_CN]=控制台
 
 [Unit0]
 CName=main.c

templates/OpenGL.template

@@ -4,7 +4,7 @@ Name=OpenGL
 Icon=Pizza.ico
 Description=A basic OpenGL program
 Description[zh_CN]=一个基本的OpenGL程序
-Category=Multimedia
+Category=3D
 Category[zh_CN]=3D
 
 [Unit0]

templates/raylib_3d.template

@@ -5,7 +5,7 @@ Name[zh_CN]=raylib 3D
 Icon=raylib.ico
 Description=A simple 3D program using raylib ( https://raylib.com )
 Description[zh_CN]=简单的raylib 3D程序 ( https://raylib.com )
-Category=Multimedia
+Category=3D
 Category[zh_CN]=3D
 
 [Unit0]