- enhancement: Autowrap tool output text.

NEWS.md

@@ -27,7 +27,8 @@ Red Panda C++ Version 2.24
   - fix: Wrong compiler settings if xcode is not installed in mac os.
   - enhancement: Name for new files will not be different from files openned.
   - fix: Crash if close file while auto syntax checking.
-  - enhancement: support sdcc compiler.
+  - enhancement: Support sdcc compiler.
+  - enhancement: Autowrap tool output text.
 
 Red Panda C++ Version 2.23
 

RedPandaIDE/compiler/compilerinfo.cpp

@@ -4,7 +4,6 @@
 CompilerInfo::CompilerInfo(const QString &name):
     mName(name)
 {
-    init();
 }
 
 const QList<PCompilerOption> &CompilerInfo::compilerOptions() const
@@ -199,10 +198,21 @@ void CompilerInfo::prepareCompilerOptions()
 
 CompilerInfoManager::CompilerInfoManager()
 {
-    mInfos.insert(CompilerType::Clang, std::make_shared<ClangCompilerInfo>());
-    mInfos.insert(CompilerType::GCC, std::make_shared<GCCCompilerInfo>());
-    mInfos.insert(CompilerType::GCC_UTF8, std::make_shared<GCCUTF8CompilerInfo>());
-    mInfos.insert(CompilerType::SDCC, std::make_shared<SDCCCompilerInfo>());
+    PCompilerInfo compilerInfo = std::make_shared<ClangCompilerInfo>();
+    compilerInfo->init();
+    mInfos.insert(CompilerType::Clang, compilerInfo);
+
+    compilerInfo = std::make_shared<GCCCompilerInfo>();
+    compilerInfo->init();
+    mInfos.insert(CompilerType::GCC, compilerInfo);
+
+    compilerInfo = std::make_shared<GCCUTF8CompilerInfo>();
+    compilerInfo->init();
+    mInfos.insert(CompilerType::GCC_UTF8, compilerInfo);
+
+    compilerInfo = std::make_shared<SDCCCompilerInfo>();
+    compilerInfo->init();
+    mInfos.insert(CompilerType::SDCC, compilerInfo);
 }
 
 PCompilerInfo CompilerInfoManager::getInfo(CompilerType compilerType)
@@ -414,7 +424,7 @@ void SDCCCompilerInfo::prepareCompilerOptions()
     sl.append(QPair<QString,QString>("Padauk processors with 15 bit wide program memory","pdk15"));
     sl.append(QPair<QString,QString>("Padauk processors with 15 bit wide program memory","pdk15"));
     sl.append(QPair<QString,QString>("Padauk processors with 15 bit wide program memory","pdk15"));
-    addOption(SDCC_CMD_OPT_PROCESSOR, QObject::tr("Optimization level (-Ox)"), groupName, true, true, false, "-m", sl);
+    addOption(SDCC_CMD_OPT_PROCESSOR, QObject::tr("Processor (-m)"), groupName, true, true, false, "-m", sl);
 
     // C++ Language Standards
     sl.clear();

RedPandaIDE/compiler/compilerinfo.h

@@ -88,6 +88,7 @@ public:
     const QString &name() const;
     PCompilerOption getCompilerOption(const QString& key) const;
     bool hasCompilerOption(const QString& key) const;
+    void init();
 
     virtual bool supportConvertingCharset()=0;
     virtual bool forceUTF8InDebugger()=0;
@@ -103,7 +104,6 @@ protected:
                    bool isLinker,
                    const QString& setting,
                    const CompileOptionChoiceList& choices = CompileOptionChoiceList());
-    void init();
     virtual void prepareCompilerOptions();
 protected:
     CompilerOptionMap mCompilerOptions;

RedPandaIDE/mainwindow.ui

@@ -120,7 +120,7 @@
      <x>0</x>
      <y>0</y>
      <width>955</width>
-     <height>30</height>
+     <height>24</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuFile">
@@ -965,7 +965,7 @@
      <enum>QTabWidget::South</enum>
     </property>
     <property name="currentIndex">
-     <number>2</number>
+     <number>1</number>
     </property>
     <property name="iconSize">
      <size>
@@ -1055,7 +1055,7 @@
          <bool>false</bool>
         </property>
         <property name="lineWrapMode">
-         <enum>QPlainTextEdit::NoWrap</enum>
+         <enum>QPlainTextEdit::WidgetWidth</enum>
         </property>
         <property name="readOnly">
          <bool>true</bool>

RedPandaIDE/settings.cpp

@@ -1701,6 +1701,11 @@ Settings::CompilerSet::CompilerSet(const QString& compilerFolder, const QString&
 
         setProperties(compilerFolder,c_prog);
 
+        if (mName.isEmpty()) {
+            mFullLoaded = false;
+            return;
+        }
+
         //manually set the directories
         setDirectories(compilerFolder);
 
@@ -1708,6 +1713,10 @@ Settings::CompilerSet::CompilerSet(const QString& compilerFolder, const QString&
 
         setUserInput();
 
+        if (mCompilerType == CompilerType::SDCC) {
+            mExecutableSuffix = "ihx";
+        }
+
         mFullLoaded = true;
     } else {
         mFullLoaded = false;

RedPandaIDE/translations/RedPandaIDE_pt_BR.ts

@@ -6639,7 +6639,7 @@
     </message>
     <message>
         <source>Language standard (-std)</source>
-        <translation type="vanished">Linguagem padrão (-std)</translation>
+        <translation>Linguagem padrão (-std)</translation>
     </message>
     <message>
         <source>Warnings</source>
@@ -6885,6 +6885,10 @@
         <source>Enable Sanitizer (-fsanitize=)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Processor (-m)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>RegisterModel</name>

RedPandaIDE/translations/RedPandaIDE_zh_TW.ts

@@ -6418,6 +6418,14 @@
         <source>Enable Sanitizer (-fsanitize=)</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <source>Processor (-m)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <source>Language standard (-std)</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>RegisterModel</name>