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 0000000..72535f4 Binary files /dev/null and b/logo.ico differ 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();