andrewbytecoder
diff --git a/‎qt_screenshot/CMakeLists.txt
Lines changed: 1 addition & 0 deletions b/‎qt_screenshot/CMakeLists.txt
Lines changed: 1 addition & 0 deletions
diff --git a/‎qt_screenshot/CMakeLists.txt.user
Lines changed: 385 additions & 0 deletions b/‎qt_screenshot/CMakeLists.txt.user
Lines changed: 385 additions & 0 deletions
diff --git a/‎qt_screenshot/fireshot.cpp
Lines changed: 13 additions & 5 deletions b/‎qt_screenshot/fireshot.cpp
Lines changed: 13 additions & 5 deletions
diff --git a/‎qt_screenshot/fireshot.h
Lines changed: 10 additions & 7 deletions b/‎qt_screenshot/fireshot.h
Lines changed: 10 additions & 7 deletions
diff --git a/‎qt_screenshot/main.cpp
Lines changed: 10 additions & 0 deletions b/‎qt_screenshot/main.cpp
Lines changed: 10 additions & 0 deletions
diff --git a/‎qt_screenshot/mainwindow.ui
Lines changed: 0 additions & 19 deletions b/‎qt_screenshot/mainwindow.ui
Lines changed: 0 additions & 19 deletions
diff --git a/‎qt_screenshot/resources/icon/bug-check.png
2.68 KB b/‎qt_screenshot/resources/icon/bug-check.png
2.68 KB
diff --git a/‎qt_screenshot/resources/icon/bug-uncheck.png
1.7 KB b/‎qt_screenshot/resources/icon/bug-uncheck.png
1.7 KB
diff --git a/‎qt_screenshot/resources/icon/cbx-down.png
317 Bytes b/‎qt_screenshot/resources/icon/cbx-down.png
317 Bytes
diff --git a/‎qt_screenshot/resources/icon/check.png
552 Bytes b/‎qt_screenshot/resources/icon/check.png
552 Bytes
@@ -52,6 +52,7 @@ add_executable(${PROJECT_NAME}
         fireshot.cpp
         ${core_src}
         ${utils_src}
+        ${CMAKE_CURRENT_SOURCE_DIR}/resources/res.qrc
         )
 
 
 
@@ -4,17 +4,25 @@
 
 // You may need to build the project (run Qt uic code generator) to get "ui_MainWindow.h" resolved
 
+#include <QAction>
+
 #include "fireshot.h"
-#include "ui_mainwindow.h"
 #include "utils/spdlog_wrapper.h"
 
-FireShot::FireShot(QWidget *parent) :
-        QMainWindow(parent), ui(new Ui::FireShot) {
-    ui->setupUi(this);
+FireShot::FireShot(QWidget *parent) : QDialog(parent) {
+
 }
 
 FireShot::~FireShot() {
-    delete ui;
     SPD_FLUSH();
 }
+int32_t FireShot::CreateActions() {
+
+    m_lpSettingAction = new QAction(tr("&Settings"), this);
+    QIcon settingIcon(":/images/menu-setting.png");
+    m_lpShotAction;  // 截图按钮
+    m_lpQuitAction; // 退出按钮
+
+    return 0;
+}
 
@@ -5,23 +5,26 @@
 #ifndef TEST_MAINWINDOW_H
 #define TEST_MAINWINDOW_H
 
-#include <QMainWindow>
+#include <QDialog>
+#include <QSystemTrayIcon>
 
 
-QT_BEGIN_NAMESPACE
-namespace Ui { class FireShot; }
-QT_END_NAMESPACE
-
-class FireShot : public QMainWindow {
+class FireShot : public QDialog {
 Q_OBJECT
 
 public:
     explicit FireShot(QWidget *parent = nullptr);
+    int32_t CreateActions();
+
 
     ~FireShot() override;
 
 private:
-    Ui::FireShot *ui;
+    QSystemTrayIcon* m_lpTrayIcon; // 放置一个系统托盘图标
+    QAction* m_lpSettingAction;  // 系统托盘上的设置按钮
+    QAction* m_lpShotAction;  // 截图按钮
+    QAction* m_lpQuitAction; // 退出按钮
+
 };
 
 
 
@@ -1,5 +1,6 @@
 #include <QApplication>
 #include <QPushButton>
+#include <QSystemTrayIcon>
 
 #include "utils/spdlog_wrapper.h"
 #include "fireshot.h"
@@ -13,6 +14,15 @@ int main(int argc, char *argv[]) {
     spdlog::SpdlogInit("FireShot", "logs/log.log", 23, 57, 0, 0);
     SPD_TRACE("start");
 
+    // 查看系统是否支持托盘功能
+    if (!QSystemTrayIcon::isSystemTrayAvailable()) {
+        SPD_ERROR("system tray disabled");
+        return 1;
+    }
+
+    //设置系统默认字体
+    QFont defaultFont("微软雅黑",9);
+    QApplication::setFont(defaultFont);
 
     QPushButton button("Hello world!", nullptr);
     button.resize(200, 100);
Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,7 @@ add_executable(${PROJECT_NAME}`
`52`	`52`	`fireshot.cpp`
`53`	`53`	`${core_src}`
`54`	`54`	`${utils_src}`
	`55`	`+ ${CMAKE_CURRENT_SOURCE_DIR}/resources/res.qrc`
`55`	`56`	`)`
`56`	`57`
`57`	`58`