From 7111ecd877963b586b434f8762053e81afca84d5 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Tue, 23 Apr 2024 21:23:13 +0800
Subject: [PATCH] add logo

---
 .gitignore            |   2 +-
 .vscode/settings.json |   3 ++-
 CMakeLists.txt        |   6 ++++++
 README.md             |   2 ++
 app.rc                |   1 +
 logo.ico              | Bin 0 -> 4286 bytes
 mainwindow.cpp        |   2 ++
 7 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 app.rc
 create mode 100644 logo.ico

diff --git a/.gitignore b/.gitignore
index 4d76f33..7f96686 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,7 +31,7 @@ ui_*.h
 qrc_*.cpp
 Thumbs.db
 *.res
-*.rc
+# *.rc
 /.qmake.cache
 /.qmake.stash
 
diff --git a/.vscode/settings.json b/.vscode/settings.json
index e4c1bae..9476081 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -87,7 +87,8 @@
         "qserialportinfo": "cpp",
         "qmessagebox": "cpp",
         "qgridlayout": "cpp",
-        "qmenu": "cpp"
+        "qmenu": "cpp",
+        "qmenubar": "cpp"
     },
     "files.autoGuessEncoding": false,
 }
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b723cd..bc254eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,6 +21,7 @@ include_directories(./)
 include_directories(libzqt)
 
 add_compile_options(-Wall )
+
 set(PROJECT_SOURCES
         libzqt/logger.cpp
         libzqt/zqthread.cpp
@@ -38,6 +39,8 @@ set(PROJECT_SOURCES
 
         zaf_protocol/zaf_ecode.c
         zaf_protocol/zaf_protocol.c
+
+        app.rc
         # libxsync/src/xsync_v2.cpp
         # src/xsync_udp_factory_impl.cpp
         # libxsync/src/xsync_v2_sig_type.cpp
@@ -45,9 +48,12 @@ set(PROJECT_SOURCES
 )
 
 
+
 add_executable(CameraLightingController WIN32
     ${PROJECT_SOURCES}
 )
+# set_target_properties(CameraLightingController PROPERTIES RC_ICONS "${CMAKE_CURRENT_SOURCE_DIR}/logo.ico")
+
 target_link_options(CameraLightingController PRIVATE  -static -static-libgcc -static-libstdc++)
 
 target_link_libraries(CameraLightingController PRIVATE Qt${QT_VERSION_MAJOR}::Widgets Qt${QT_VERSION_MAJOR}::SerialPort Qt${QT_VERSION_MAJOR}::Charts  Qt${QT_VERSION_MAJOR}::Concurrent   wsock32)
diff --git a/README.md b/README.md
index eafefc6..eeed97a 100644
--- a/README.md
+++ b/README.md
@@ -2,6 +2,8 @@
 QT打包:
 参考教程
 https://blog.csdn.net/ColinFhz/article/details/107879769
+logo
+https://www.bitbug.net/
 
 V4:
     1.修改样式
diff --git a/app.rc b/app.rc
new file mode 100644
index 0000000..3c29047
--- /dev/null
+++ b/app.rc
@@ -0,0 +1 @@
+IDI_ICON1       ICON      "logo.ico"
\ No newline at end of file
diff --git a/logo.ico b/logo.ico
new file mode 100644
index 0000000000000000000000000000000000000000..72535f41db23d4fb2b4d59f92ddff58143998bfd
GIT binary patch
literal 4286
zcmeH}y^l;$7>Ccb8@n32iG;$}5E2C%N}C`W`~?&gYD)Fckcf(2bP5F})oO@DB@`M)
zfviMA6o`-OdB(kR_c%LqXXef(l6^PNo^#&wp5O1x{SG1Huhk0v54UDRSRX>z1*F13
zFy9U4R-*P1$f#_RI>xIgIsg~p2Hb22wJyLM=&@9sVB#I*V`2eaJyNlQ<O>*=cd4t#
z&cp@|k^8a?{(9&Y$59gBpxo!UT0QiN;~0rS{eQAX2HC3~dc{%K{}&58a2-w-T%+wk
zoqdeze-EGCP`!^b#(UsC^xMNI{*Te$4ij)3t`yjxgl%9=uRRRw?{Pm1#%cHnrH}nn
zV4Q<8pK6Eoe~+%mcnv&Ac$jl;FIb!MHaD#QE7op?b?_8oeRIxPV{JTNj)(RCgr@HX
z&;9L$zB%XSz}nI;Zin?(=Q0@k;R$>#u)hxsYhuspcohG)XnU<2o8WMPeZyzS8>srl
z{ZahYdJSh_17rn$a+z~3_KU}(`m3kLbMTzYGcXr>rN&G7A7TA+z5n!z!)xjTr1soo
zP7l4}m?Ci%zC)9KRjnU|$7<SCtR;CK9zh4Zo<2iWW01aU)#$)OP<sY?h1aw-KF2mf
z8wT;L)?O+!)avI;Niuxqd*4@e>+}~`Q$CZD!ZnlA)ZK+Tp4A%HxVDM#cc}LgJfFR=
z<_<LR+mZPjzFU3HZs~(H)~>{Va0K!qc#&`IgfJ!Zd`J94*8Y>5o?SfWc(S!PSFBfy
U55pO5io8oZ%k%k((z4tB25pB-{Qv*}

literal 0
HcmV?d00001

diff --git a/mainwindow.cpp b/mainwindow.cpp
index ddbe79a..142f481 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -868,6 +868,8 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
   // qInstallMessageHandler(log_output);
   connect(this, SIGNAL(doinui_signal(QFunction)), this, SLOT(doinui_slot(QFunction)));
   constructUI();
+  // setWindowIcon(QIcon(QApplication::applicationDirPath() + "/logo.png"));
+  
 
   // 隐藏部分控件
   exitProfessionalModel();