Add log menu in application

KangLin · Nov 1, 2023 · 6d4ac2b · 6d4ac2b
1 parent fb90ba9
commit 6d4ac2b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 14 deletions.
diff --git a/App/MainWindow.cpp b/App/MainWindow.cpp
@@ -11,7 +11,7 @@
 #ifdef RABBITCOMMON
     #include "DlgAbout.h"
     #include "FrmUpdater.h"
-    #include "FrmStyle.h"
+    #include "RabbitCommonTools.h"
 #endif
 
 MainWindow::MainWindow(QWidget *parent) :
@@ -76,17 +76,15 @@ MainWindow::MainWindow(QWidget *parent) :
     pViewHeadposition->addAction(pHeadRight);
 
     pViewMenu->addSeparator();
-    QAction* pActionStyle = pViewMenu->addAction(QIcon::fromTheme("style"),
-                                                 tr("Style"),
-                                            this, SLOT(slotStyle()));
-    Q_UNUSED(pActionStyle);
+    pViewMenu->addAction(RabbitCommon::CTools::Instance()->AddStyleMenu(pViewMenu));
 
 #ifdef RABBITCOMMON
     QMenu* pHelp = menuBar()->addMenu(tr("Help"));
     CFrmUpdater updater;
     pHelp->addAction(updater.windowIcon(), tr("Update"),
                      this, SLOT(slotUpdate()));
     pHelp->addAction(windowIcon(), tr("About"), this, SLOT(slotAbout()));
+    pHelp->addMenu(RabbitCommon::CTools::Instance()->GetLogMenu(this));
 #endif
 
     //m_pLunarCalendar->setLocale(QLocale("zh_CN"));
@@ -163,14 +161,6 @@ void MainWindow::slotUpdate()
 #endif
 }
 
-void MainWindow::slotStyle()
-{
-#ifdef RABBITCOMMON
-    CFrmStyle* f = new CFrmStyle();
-    f->show();
-#endif
-}
-
 void MainWindow::slotUpdateCalendar()
 {
     qDebug() << m_pLunarCalendar->SelectedLunar();

diff --git a/App/MainWindow.h b/App/MainWindow.h
@@ -32,7 +32,6 @@ private Q_SLOTS:
     void slotHeadpositionDown();
     void slotHeadpositionLeft();
     void slotHeadpositionRight();
-    void slotStyle();
 
 private:
     Ui::MainWindow *ui;

diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,5 +1,6 @@
 - v0.2.8
   + [增加 2024 年节假日](https://www.gov.cn/zhengce/content/202310/content_6911527.htm)
+  + 在应用程序中增加日志菜单
 
 - v0.2.7
   + 修复 DockDebugLog 崩溃. 详见: [RabbitCommon](https://github.com/KangLin/RabbitCommon/commit/af2e434e39af35876113436ead2a946efcf74199)