修改部分日志

andrewbytecoder · andrewbytecoder · commit 40fd9cead289 · 2023-10-13T00:03:19.000+08:00
diff --git a/3rd/spdlog/fmt/bundled/format.h b/3rd/spdlog/fmt/bundled/format.h
@@ -570,7 +570,7 @@ FMT_CONSTEXPR inline size_t compute_width(string_view s) {
       *count += detail::to_unsigned(
           1 +
           (cp >= 0x1100 &&
-           (cp <= 0x115f ||  // Hangul Jamo init. consonants
+           (cp <= 0x115f ||  // Hangul Jamo CaptureScreen. consonants
             cp == 0x2329 ||  // LEFT-POINTING ANGLE BRACKET
             cp == 0x232a ||  // RIGHT-POINTING ANGLE BRACKET
             // CJK ... Yi except IDEOGRAPHIC HALF FILL SPACE:
diff --git a/3rd/spdlog/logger.h b/3rd/spdlog/logger.h
@@ -72,7 +72,7 @@ class SPDLOG_API logger
         : logger(std::move(name), {std::move(single_sink)})
     {}
 
-    // Logger with sinks init list
+    // Logger with sinks CaptureScreen list
     logger(std::string name, sinks_init_list sinks)
         : logger(std::move(name), sinks.begin(), sinks.end())
     {}
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,10 +15,10 @@ set(REQUIRED_LIBS Core Gui Widgets Network)
 set(REQUIRED_LIBS_QUALIFIED Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network)
 
 #宏定义在这里添加
-#add_definitions(
-#        -D_ENABLE_LOGGING
-#)
-add_compile_options(-D USE_SPDLOG_)
+add_definitions(
+        -DPDLOG_ACTIVE_LEVEL=0
+)
+add_compile_options(-DUSE_SPDLOG_)
 
 if(WIN32)
     set(CMAKE_PREFIX_PATH "D:/software/Qt5.13.0/mingw73_64/lib/cmake/Qt5")
@@ -107,6 +107,8 @@ target_sources(
 #    target_link_libraries(${PROJECT_NAME} xcb xcb-util)
 #endif()
 
+message(STATUS ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}_autogen/include)
+
 target_include_directories(${PROJECT_NAME}
     PUBLIC ./
         ${CMAKE_CURRENT_SOURCE_DIR}/include
diff --git a/core/screen_shot.cpp b/core/screen_shot.cpp
@@ -22,7 +22,7 @@ void ScreenShot::rasie() {
 
 }
 
-void ScreenShot::init(QWidget *parent) {
+void ScreenShot::CaptureScreen(QWidget *parent) {
 
 }
 
diff --git a/core/screen_shot.h b/core/screen_shot.h
@@ -8,6 +8,7 @@
 #include <QObject>
 #include <QWidget>
 #include <QList>
+#include <memory>
 //#include "widget.h"
 
 class FireShot;
@@ -18,7 +19,7 @@ class ScreenShot : public QObject {
     explicit ScreenShot(FireShot *lpFireShot);
     ~ScreenShot() override;
 
-    void init(QWidget* parent);
+    void CaptureScreen(QWidget* parent);
 
     void cleanup();
 
diff --git a/core/widget.cpp b/core/widget.cpp
@@ -23,7 +23,7 @@ Widget::Widget(QWidget* parent)
 
 Widget::~Widget()
 {
-    SPD_ERROR("{0}", __FUNCTION__);
+    //SPD_ERROR("{0}", __FUNCTION__);
 }
 
 void Widget::start(std::shared_ptr<ScreenList> list, int index)
diff --git a/fireshot.cpp b/fireshot.cpp
@@ -7,10 +7,12 @@
 #include <QAction>
 #include <QMenu>
 #include <QDesktopWidget>
+#include <QApplication>
 
 #include "fireshot.h"
 #include "utils/spdlog_wrapper.h"
 #include "fireshot_errno.h"
+#include "core/screen_shot.h"
 
 FireShot::FireShot(QWidget *parent) :
     QDialog(parent), m_lpTrayIcon(new QSystemTrayIcon(this)),
@@ -50,12 +52,12 @@ void FireShot::OnShowSetting()
 
 int32_t FireShot::CreateActions() {
     // construct tray setting icon
-    m_lpSettingAction = new QAction(tr("&Settings"), this);
+    m_lpSettingAction = new QAction(tr("Setting"), this);
     QIcon settingIcon(":/icons/icon/menu-setting.png");
     m_lpSettingAction->setIcon(settingIcon);
     connect(m_lpSettingAction, &QAction::triggered, this, &FireShot::OnShowSetting);
     // construct tray shot icon
-    m_lpShotAction = new QAction(tr("S$hot"), this);
+    m_lpShotAction = new QAction(tr("Shot"), this);
     QIcon shotIcon(":/icons/icon/menu-shot.png");
     m_lpShotAction->setIcon(shotIcon);
     connect(m_lpShotAction, &QAction::triggered, this, &FireShot::OnStartShot);
@@ -75,6 +77,20 @@ void FireShot::OnStartShot() {
         return;
     }
 
+    SPD_INFO("-----------------------start shot --------------------");
+    m_bShotting = true;
+    ScreenShot *lpScreenShot = nullptr;
+    if (m_screenShoter.empty()) {
+        lpScreenShot = new ScreenShot(this);
+        // 通过信号将两个对象之间互通有无
+        connect(this, &FireShot::StopShot, lpScreenShot, &ScreenShot::ShotDone);
+        connect(lpScreenShot, &ScreenShot::ShotDone, this, &FireShot::OnShotDone);
+    } else {
+        lpScreenShot = m_screenShoter.back();
+        m_screenShoter.pop_front();
+    }
+
+    lpScreenShot->CaptureScreen(this);
 
 }
 
@@ -83,7 +99,8 @@ void FireShot::OnShotDone(ScreenShot *starer) {
 }
 
 void FireShot::OnExitShot() {
-
+    m_lpTrayIcon->hide();
+    QApplication::exit(0);
 }
 
 int32_t FireShot::CreateTrayWithIcon() {
diff --git a/fireshot.h b/fireshot.h
@@ -27,13 +27,14 @@ Q_OBJECT
 
 signals:
     void SatrtShot();
-    void ShotDone(FireShot* starer);
+    void ShotDone(ScreenShot* starer);
     void CheckHotKey(uint32_t value);
-    void StopShot(FireShot* starter);
+    void StopShot(ScreenShot* starter);
 
 private slots:
     void OnStartShot();
     void OnShotDone(ScreenShot* starer);
+    // 点击退出时能退出截图进程
     void OnExitShot();
     void OnShowSetting();
 
@@ -48,6 +49,8 @@ private slots:
     SettingDlg *m_lpSettingDlg; // tray settings
     bool m_bShotting; // 是否正在截图
 
+    std::list<ScreenShot*> m_screenShoter;
+
 };
 
 
diff --git a/main.cpp b/main.cpp
@@ -16,7 +16,7 @@ int main(int argc, char *argv[]) {
 
     // 查看系统是否支持托盘功能
     if (!QSystemTrayIcon::isSystemTrayAvailable()) {
-        SPD_ERROR("system tray disabled");
+        SPD_ERROR("fmt string", "system tray disabled");
         return 1;
     }
 
diff --git a/utils/spdlog_wrapper.cpp b/utils/spdlog_wrapper.cpp
@@ -2,6 +2,7 @@
 // Created by wangyz38535 on 2023/10/11.
 //
 #include <QDir>
+
 #include "spdlog_wrapper.h"
 #include "spdlog/spdlog.h"
 #include "spdlog/cfg/env.h"  // support for loading levels from the environment variable
@@ -34,7 +35,11 @@ namespace spdlog
         logger_->set_level(static_cast<level::level_enum>(lv));
         logger_->flush_on(static_cast<level::level_enum>(flv));
 
-        set_pattern("[%H:%M:%S %z] [thread %t] %v");
+        //set_pattern("[%H:%M:%S %z] [thread %t] %v");
+        logger_->set_pattern("[%Y-%m-%d %H:%M:%S] [%n] [%^%l%$] [%s:%#] %v");
+
+        SPDLOG_LOGGER_INFO(logger_, "test3 {}", 3);//会输出文件名和行号
+
 #endif // USE_SPDLOG_
 
     }
@@ -43,4 +48,4 @@ namespace spdlog
     {
         return logger_;
     }
-}
+}
diff --git a/utils/spdlog_wrapper.h b/utils/spdlog_wrapper.h
@@ -4,7 +4,7 @@
 
 #ifndef QT_CLION_SPDLOG_WRAPPER_H
 #define QT_CLION_SPDLOG_WRAPPER_H
-
+#define SPDLOG_ACTIVE_LEVEL 0
 #include "spdlog/spdlog.h"
 
 namespace spdlog
@@ -14,7 +14,8 @@ namespace spdlog
 } // spdlog
 
 #ifdef USE_SPDLOG_
-#define SPD_TRACE(fmt, ...)   spdlog::logger_ptr()->trace(fmt, ##__VA_ARGS__);
+
+#define SPD_TRACE(fmt, ...)    spdlog::logger_ptr()->trace(fmt, ##__VA_ARGS__);
 #define SPD_DEBUG(fmt, ...)   spdlog::logger_ptr()->debug(fmt, ##__VA_ARGS__);
 #define SPD_INFO(fmt, ...)        spdlog::logger_ptr()->info(fmt, ##__VA_ARGS__);
 #define SPD_WARN(fmt, ...)        spdlog::logger_ptr()->warn(fmt, ##__VA_ARGS__);

Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ void ScreenShot::rasie() {`
`22`	`22`
`23`	`23`	`}`
`24`	`24`
`25`		`-void ScreenShot::init(QWidget *parent) {`
	`25`	`+void ScreenShot::CaptureScreen(QWidget *parent) {`
`26`	`26`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ Widget::Widget(QWidget* parent)`
`23`	`23`
`24`	`24`	`Widget::~Widget()`
`25`	`25`	`{`
`26`		`- SPD_ERROR("{0}", __FUNCTION__);`
	`26`	`+ //SPD_ERROR("{0}", __FUNCTION__);`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`void Widget::start(std::shared_ptr<ScreenList> list, int index)`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ int main(int argc, char *argv[]) {`
`16`	`16`
`17`	`17`	`// 查看系统是否支持托盘功能`
`18`	`18`	`if (!QSystemTrayIcon::isSystemTrayAvailable()) {`
`19`		`- SPD_ERROR("system tray disabled");`
	`19`	`+ SPD_ERROR("fmt string", "system tray disabled");`
`20`	`20`	`return 1;`
`21`	`21`	`}`
`22`	`22`