FIX: DockDebugLog core dump

KangLin · Aug 31, 2023 · af2e434 · af2e434
1 parent c79973f
commit af2e434
Show file tree

Hide file tree

Showing 39 changed files with 629 additions and 965 deletions.
diff --git a/Src/Log/DockDebugLog.cpp b/Src/Log/DockDebugLog.cpp
@@ -16,11 +16,15 @@ CDockDebugLog::CDockDebugLog(QWidget *parent) :
     ui->setupUi(this);
     this->hide();
 
-    connect(this, &QDockWidget::visibilityChanged, this, [=](bool visible) {
+    bool check = connect(this, &QDockWidget::visibilityChanged, this, [=](bool visible) {
         if (visible) {
             ui->txtDebugLog->horizontalScrollBar()->setValue(0);
         }
     });
+    Q_ASSERT(check);
+    check = connect(this, SIGNAL(sigAddLog(QString)),
+                    this, SLOT(slotAddLog(QString)));
+    Q_ASSERT(check);
 
     QSettings set(RabbitCommon::CDir::Instance()->GetFileUserConfigure(),
                   QSettings::IniFormat);
@@ -98,7 +102,7 @@ CDockDebugLog::~CDockDebugLog()
     delete ui;
 }
 
-int CDockDebugLog::AddLog(const QString &szLog)
+int CDockDebugLog::slotAddLog(const QString &szLog)
 {
     ui->txtDebugLog->appendPlainText(szLog);
     return 0;

diff --git a/Src/Log/DockDebugLog.h b/Src/Log/DockDebugLog.h
@@ -19,8 +19,12 @@ class CDockDebugLog : public QDockWidget
 public:
     explicit CDockDebugLog(QWidget *parent = nullptr);
     virtual ~CDockDebugLog();
+
+Q_SIGNALS:
+    void sigAddLog(const QString& szLog);
 
-    int AddLog(const QString& szLog);
+private Q_SLOTS:
+    int slotAddLog(const QString& szLog);
 
 private:
     Ui::CDockDebugLog *ui;

diff --git a/Src/Log/Log.cpp b/Src/Log/Log.cpp
@@ -495,7 +495,7 @@ int CLog::Print(const char *pszFile, int nLine, const char* pszFunction, int nLe
     //std::cout << szTemp;
 #ifdef HAVE_RABBITCOMMON_GUI
     if(g_pDcokDebugLog)
-        g_pDcokDebugLog->AddLog(szTemp.c_str());
+        emit g_pDcokDebugLog->sigAddLog(szTemp.c_str());
 #endif
     qDebug() << szTemp.c_str();
 
@@ -537,7 +537,7 @@ void CLog::myMessageOutput(QtMsgType type,
 
 #ifdef HAVE_RABBITCOMMON_GUI
         if(g_pDcokDebugLog)
-            g_pDcokDebugLog->AddLog(szMsg);
+            emit g_pDcokDebugLog->sigAddLog(szMsg);
 #endif
 
     /*

diff --git a/Src/Resource/Translations/RabbitCommon_ar.ts b/Src/Resource/Translations/RabbitCommon_ar.ts
@@ -162,31 +162,31 @@
 <context>
     <name>CDockDebugLog</name>
     <message>
-        <location filename="../../Log/DockDebugLog.cpp" line="34"/>
+        <location filename="../../Log/DockDebugLog.cpp" line="38"/>
         <source>Tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Log/DockDebugLog.cpp" line="37"/>
-        <location filename="../../Log/DockDebugLog.cpp" line="50"/>
-        <location filename="../../Log/DockDebugLog.cpp" line="56"/>
-        <location filename="../../Log/DockDebugLog.cpp" line="73"/>
+        <location filename="../../Log/DockDebugLog.cpp" line="41"/>
+        <location filename="../../Log/DockDebugLog.cpp" line="54"/>
+        <location filename="../../Log/DockDebugLog.cpp" line="60"/>
+        <location filename="../../Log/DockDebugLog.cpp" line="77"/>
         <source>Wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Log/DockDebugLog.cpp" line="45"/>
+        <location filename="../../Log/DockDebugLog.cpp" line="49"/>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Log/DockDebugLog.cpp" line="59"/>
-        <location filename="../../Log/DockDebugLog.cpp" line="68"/>
+        <location filename="../../Log/DockDebugLog.cpp" line="63"/>
+        <location filename="../../Log/DockDebugLog.cpp" line="72"/>
         <source>No wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Log/DockDebugLog.cpp" line="85"/>
+        <location filename="../../Log/DockDebugLog.cpp" line="89"/>
         <source>Open log folder</source>
         <translation type="unfinished"></translation>
     </message>
@@ -920,47 +920,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../RabbitCommonTools.cpp" line="431"/>
-        <location filename="../../RabbitCommonTools.cpp" line="441"/>
+        <location filename="../../RabbitCommonTools.cpp" line="438"/>
+        <location filename="../../RabbitCommonTools.cpp" line="448"/>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../RabbitCommonTools.cpp" line="451"/>
+        <location filename="../../RabbitCommonTools.cpp" line="458"/>
         <source>Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../RabbitCommonTools.cpp" line="455"/>
-        <location filename="../../Log/DockDebugLog.cpp" line="82"/>
+        <location filename="../../RabbitCommonTools.cpp" line="462"/>
+        <location filename="../../Log/DockDebugLog.cpp" line="86"/>
         <source>Open Log configure file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../RabbitCommonTools.cpp" line="458"/>
+        <location filename="../../RabbitCommonTools.cpp" line="465"/>
         <source>Open Log file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../RabbitCommonTools.cpp" line="461"/>
+        <location filename="../../RabbitCommonTools.cpp" line="468"/>
         <source>Open log folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../RabbitCommonTools.cpp" line="479"/>
+        <location filename="../../RabbitCommonTools.cpp" line="486"/>
         <source>Log dock</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../../CoreDump/QMiniDumper.cpp" line="55"/>
-        <source>Application Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../CoreDump/QMiniDumper.cpp" line="56"/>
-        <source>I&apos;m Sorry, Application is Crash! The path: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>RabbitCommon::CDownloadFile</name>

diff --git a/Src/Resource/Translations/RabbitCommon_ca.ts b/Src/Resource/Translations/RabbitCommon_ca.ts
@@ -162,31 +162,31 @@
 <context>
     <name>CDockDebugLog</name>
     <message>
-        <location filename="../../Log/DockDebugLog.cpp" line="34"/>
+        <location filename="../../Log/DockDebugLog.cpp" line="38"/>
         <source>Tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Log/DockDebugLog.cpp" line="37"/>
-        <location filename="../../Log/DockDebugLog.cpp" line="50"/>
-        <location filename="../../Log/DockDebugLog.cpp" line="56"/>
-        <location filename="../../Log/DockDebugLog.cpp" line="73"/>
+        <location filename="../../Log/DockDebugLog.cpp" line="41"/>
+        <location filename="../../Log/DockDebugLog.cpp" line="54"/>
+        <location filename="../../Log/DockDebugLog.cpp" line="60"/>
+        <location filename="../../Log/DockDebugLog.cpp" line="77"/>
         <source>Wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Log/DockDebugLog.cpp" line="45"/>
+        <location filename="../../Log/DockDebugLog.cpp" line="49"/>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Log/DockDebugLog.cpp" line="59"/>
-        <location filename="../../Log/DockDebugLog.cpp" line="68"/>
+        <location filename="../../Log/DockDebugLog.cpp" line="63"/>
+        <location filename="../../Log/DockDebugLog.cpp" line="72"/>
         <source>No wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Log/DockDebugLog.cpp" line="85"/>
+        <location filename="../../Log/DockDebugLog.cpp" line="89"/>
         <source>Open log folder</source>
         <translation type="unfinished"></translation>
     </message>
@@ -920,47 +920,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../RabbitCommonTools.cpp" line="431"/>
-        <location filename="../../RabbitCommonTools.cpp" line="441"/>
+        <location filename="../../RabbitCommonTools.cpp" line="438"/>
+        <location filename="../../RabbitCommonTools.cpp" line="448"/>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../RabbitCommonTools.cpp" line="451"/>
+        <location filename="../../RabbitCommonTools.cpp" line="458"/>
         <source>Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../RabbitCommonTools.cpp" line="455"/>
-        <location filename="../../Log/DockDebugLog.cpp" line="82"/>
+        <location filename="../../RabbitCommonTools.cpp" line="462"/>
+        <location filename="../../Log/DockDebugLog.cpp" line="86"/>
         <source>Open Log configure file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../RabbitCommonTools.cpp" line="458"/>
+        <location filename="../../RabbitCommonTools.cpp" line="465"/>
         <source>Open Log file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../RabbitCommonTools.cpp" line="461"/>
+        <location filename="../../RabbitCommonTools.cpp" line="468"/>
         <source>Open log folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../RabbitCommonTools.cpp" line="479"/>
+        <location filename="../../RabbitCommonTools.cpp" line="486"/>
         <source>Log dock</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../../CoreDump/QMiniDumper.cpp" line="55"/>
-        <source>Application Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../CoreDump/QMiniDumper.cpp" line="56"/>
-        <source>I&apos;m Sorry, Application is Crash! The path: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>RabbitCommon::CDownloadFile</name>

diff --git a/Src/Resource/Translations/RabbitCommon_cs.ts b/Src/Resource/Translations/RabbitCommon_cs.ts
@@ -162,31 +162,31 @@
 <context>
     <name>CDockDebugLog</name>
     <message>
-        <location filename="../../Log/DockDebugLog.cpp" line="34"/>
+        <location filename="../../Log/DockDebugLog.cpp" line="38"/>
         <source>Tools</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Log/DockDebugLog.cpp" line="37"/>
-        <location filename="../../Log/DockDebugLog.cpp" line="50"/>
-        <location filename="../../Log/DockDebugLog.cpp" line="56"/>
-        <location filename="../../Log/DockDebugLog.cpp" line="73"/>
+        <location filename="../../Log/DockDebugLog.cpp" line="41"/>
+        <location filename="../../Log/DockDebugLog.cpp" line="54"/>
+        <location filename="../../Log/DockDebugLog.cpp" line="60"/>
+        <location filename="../../Log/DockDebugLog.cpp" line="77"/>
         <source>Wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Log/DockDebugLog.cpp" line="45"/>
+        <location filename="../../Log/DockDebugLog.cpp" line="49"/>
         <source>Clear</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Log/DockDebugLog.cpp" line="59"/>
-        <location filename="../../Log/DockDebugLog.cpp" line="68"/>
+        <location filename="../../Log/DockDebugLog.cpp" line="63"/>
+        <location filename="../../Log/DockDebugLog.cpp" line="72"/>
         <source>No wrap</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../Log/DockDebugLog.cpp" line="85"/>
+        <location filename="../../Log/DockDebugLog.cpp" line="89"/>
         <source>Open log folder</source>
         <translation type="unfinished"></translation>
     </message>
@@ -920,47 +920,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../RabbitCommonTools.cpp" line="431"/>
-        <location filename="../../RabbitCommonTools.cpp" line="441"/>
+        <location filename="../../RabbitCommonTools.cpp" line="438"/>
+        <location filename="../../RabbitCommonTools.cpp" line="448"/>
         <source>Style</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../RabbitCommonTools.cpp" line="451"/>
+        <location filename="../../RabbitCommonTools.cpp" line="458"/>
         <source>Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../RabbitCommonTools.cpp" line="455"/>
-        <location filename="../../Log/DockDebugLog.cpp" line="82"/>
+        <location filename="../../RabbitCommonTools.cpp" line="462"/>
+        <location filename="../../Log/DockDebugLog.cpp" line="86"/>
         <source>Open Log configure file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../RabbitCommonTools.cpp" line="458"/>
+        <location filename="../../RabbitCommonTools.cpp" line="465"/>
         <source>Open Log file</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../RabbitCommonTools.cpp" line="461"/>
+        <location filename="../../RabbitCommonTools.cpp" line="468"/>
         <source>Open log folder</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../../RabbitCommonTools.cpp" line="479"/>
+        <location filename="../../RabbitCommonTools.cpp" line="486"/>
         <source>Log dock</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../../CoreDump/QMiniDumper.cpp" line="55"/>
-        <source>Application Error</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../../CoreDump/QMiniDumper.cpp" line="56"/>
-        <source>I&apos;m Sorry, Application is Crash! The path: </source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>RabbitCommon::CDownloadFile</name>