Release v6.0.4

Author: arobenko

.github/workflows/actions_build.yml

@@ -8,7 +8,7 @@ on:
       - '**'
 
 env:
-  COMMS_TAG: v5.4.3
+  COMMS_TAG: v5.4.4
 
 jobs:
 
@@ -249,16 +249,74 @@ jobs:
       run: cmake --build . --config ${{matrix.type}} --target install
       env:
         VERBOSE: 1   
-   
-    
-  build_msvc_2019:
-    runs-on: windows-2019
+
+  build_msvc_2022:
+    runs-on: windows-2022
     strategy:
       fail-fast: false
       matrix:
         type: [Debug, Release]
         arch: [x64]
-        cpp: [17]
+        cpp: [17, 20]
+        qt_ver: [5, 6]
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Create Build Environment
+      run: cmake -E make_directory ${{runner.workspace}}/build   
+
+    - name: Install Curl
+      shell: cmd
+      run: |
+        choco install curl
+
+    - name: Install Qt
+      shell: cmd
+      run: |
+        curl -L https://github.com/martinrotter/qt-minimalistic-builds/releases/download/${{env.QT_VER}}/qt-${{env.QT_VER}}-dynamic-msvc2019-x86_64.7z -o ${{runner.workspace}}/qt.7z
+        7z x ${{runner.workspace}}/qt.7z -o${{runner.workspace}}/qt
+      env:
+        QT_VER: ${{matrix.qt_ver == '5' && '5.15.3' || '6.2.2'}}
+
+    - name: Prepare externals
+      shell: cmd
+      run: |
+        %GITHUB_WORKSPACE%\script\prepare_externals.bat
+      env:
+        BUILD_DIR: ${{runner.workspace}}/build
+        PLATFORM: ${{matrix.arch}}
+        EXTERNALS_DIR: ${{runner.workspace}}/externals
+        COMMON_INSTALL_DIR: ${{runner.workspace}}/build/install
+        COMMON_BUILD_TYPE: ${{matrix.type}}
+        COMMON_CXX_STANDARD: ${{matrix.cpp}}
+        COMMS_TAG: ${{env.COMMS_TAG}}
+
+    - name: Configure CMake
+      shell: cmd
+      working-directory: ${{runner.workspace}}/build
+      run: |
+        cmake %GITHUB_WORKSPACE% -A ${{matrix.arch}} -DCMAKE_BUILD_TYPE=${{matrix.type}} -DCMAKE_INSTALL_PREFIX=install ^
+          -DCMAKE_PREFIX_PATH="${{runner.workspace}}/build/install;${{runner.workspace}}/qt/qt-${{env.QT_VER}}-dynamic-msvc2019-x86_64" -DCMAKE_CXX_STANDARD=${{matrix.cpp}} ^
+          -DCC_TOOLS_QT_BUILD_PLUGIN_DEMO_PROTOCOL=ON -DCC_TOOLS_QT_MAJOR_QT_VERSION=${{matrix.qt_ver}}
+      env:
+        QT_VER: ${{matrix.qt_ver == '5' && '5.15.3' || '6.2.2'}}
+
+    - name: Build Target 
+      working-directory: ${{runner.workspace}}/build
+      shell: cmd
+      run: cmake --build . --config ${{matrix.type}} --target install
+      env:
+        VERBOSE: 1 
+
+  build_msvc_2025:
+    runs-on: windows-2025
+    strategy:
+      fail-fast: false
+      matrix:
+        type: [Debug, Release]
+        arch: [x64]
+        cpp: [17, 20, 23]
         qt_ver: [5, 6]
 
     steps:

app/cc_view/src/widget/MessageUpdateDialog.cpp

@@ -244,8 +244,7 @@ MessageUpdateDialog::MessageUpdateDialog(
             m_ui.m_repeatCheckBox->setCheckState(Qt::Checked);
         }
 
-        auto repeatCount = static_cast<int>(
-            property::message::ToolsMsgRepeatCount().getFrom(*m_msg), 1U);
+        auto repeatCount = static_cast<int>(property::message::ToolsMsgRepeatCount().getFrom(*m_msg));
         if (repeatCount != 0) {
             m_prevRepeatCount = repeatCount;
         }

lib/include/cc_tools_qt/version.h

@@ -28,7 +28,7 @@
 #define CC_TOOLS_QT_MINOR_VERSION 0U
 
 /// @brief Patch level of the library
-#define CC_TOOLS_QT_PATCH_VERSION 3U
+#define CC_TOOLS_QT_PATCH_VERSION 4U
 
 /// @brief Macro to create numeric version as single unsigned number
 #define CC_TOOLS_QT_MAKE_VERSION(major_, minor_, patch_) \
@@ -77,7 +77,7 @@ constexpr unsigned version()
     return CC_TOOLS_QT_VERSION;
 }
 
-static_assert(COMMS_MAKE_VERSION(5, 4, 3) <= comms::version(),
+static_assert(COMMS_MAKE_VERSION(5, 4, 4) <= comms::version(),
     "The version of COMMS library is too old");
 
 } // namespace cc_tools_qt

lib/src/ToolsProtocol.cpp

@@ -244,6 +244,16 @@ ToolsProtocol::UpdateStatus ToolsProtocol::updateMessage(ToolsMessage& msg)
 
 ToolsMessagePtr ToolsProtocol::cloneMessage(const ToolsMessage& msg)
 {
+    auto copyCommonProperties = 
+        [](const ToolsMessage& src, ToolsMessage& dst) {
+            property::message::ToolsMsgDelay().copyFromTo(src, dst);
+            property::message::ToolsMsgDelayUnits().copyFromTo(src, dst);
+            property::message::ToolsMsgRepeatDuration().copyFromTo(src, dst);
+            property::message::ToolsMsgRepeatDurationUnits().copyFromTo(src, dst);
+            property::message::ToolsMsgRepeatCount().copyFromTo(src, dst);
+            property::message::ToolsMsgComment().copyFromTo(src, dst);
+        };
+
     if (msg.idAsString().isEmpty()) {
         ToolsMessagePtr clonedMsg;
 
@@ -262,6 +272,7 @@ ToolsMessagePtr ToolsProtocol::cloneMessage(const ToolsMessage& msg)
             return clonedMsg;
         }
 
+        copyCommonProperties(msg, *clonedMsg);
         auto extraInfoMap = getExtraInfoFromMessageProperties(msg);
         if (!extraInfoMap.isEmpty()) {
             setExtraInfoToMessageProperties(extraInfoMap, *clonedMsg);
@@ -273,6 +284,7 @@ ToolsMessagePtr ToolsProtocol::cloneMessage(const ToolsMessage& msg)
 
     auto clonedMsg = msg.clone();
     if (clonedMsg) {
+        copyCommonProperties(msg, *clonedMsg);
         setNameToMessageProperties(*clonedMsg);
         updateMessage(*clonedMsg);
         property::message::ToolsMsgExtraInfo().copyFromTo(msg, *clonedMsg);