Fix merge: restore msvc2022 build and fix Qt6 QML

- main.yml: restore window-msvc2022-build to HEAD version (windows-latest,
  standard checkout, qt6 branch in secrets, no vcpkg caching), re-add
  window-msvc2022-aiserver-build job that was dropped during merge
- main.qml: convert new echelon bridge dialog (added by master) from Qt5
  onYesClicked/onNoClicked to Qt6 onAccepted + clickedButton pattern

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: cagnulein

.github/workflows/main.yml

@@ -1641,26 +1641,39 @@ jobs:
             "
 
   window-msvc2022-build:
-    runs-on: windows-2022
-    if: github.event_name == 'schedule'
+    runs-on: windows-latest
     strategy:
       matrix:
         config:
           - {python: true}
-          - {python: false}    
+          - {python: false}
 
     steps:
-      - name: Checkout PR code
+      - uses: actions/checkout@v2
+      - name: Checkout submodule repo
         uses: actions/checkout@v2
         with:
-          ref: refs/pull/1508/head
-          submodules: recursive 
-    
-      - uses: actions/setup-python@v5
+          repository: bluetiger9/SmtpClient-for-Qt
+          path: "src/smtpclient/"
+
+      - uses: actions/checkout@v2
+      - name: Checkout submodule repo
+        uses: actions/checkout@v2
         with:
-          python-version: '3.7'
-          cache: 'pip'
-          cache-dependency-path: .github/workflows/main.yml
+          repository: google/googletest
+          path: "tst/googletest/"
+          ref: "release-1.12.1"
+
+      - uses: actions/checkout@v2
+      - name: Checkout qHttpServer
+        uses: actions/checkout@v2
+        with:
+          repository: qt-labs/qthttpserver
+          path: "src/qthttpserver"
+
+      - uses: actions/setup-python@v4
+        with:
+          python-version: 3.7
       - name: download python and paddleocr
         run: |
           python -VV
@@ -1681,17 +1694,17 @@ jobs:
         with:
           version: '6.8.2'
           host: 'windows'
-          modules: 'qtnetworkauth qtcharts qtconnectivity qtspeech qtpositioning qtwebsockets qtlocation qtmultimedia qtwebengine qtwebview qthttpserver qtwebchannel'
+          modules: 'qtnetworkauth qtcharts qtconnectivity qtspeech qtpositioning qtwebsockets qtlocation qtmultimedia qtwebengine qtwebview qtwebchannel qthttpserver'
           target: "desktop"
           arch: win64_msvc2022_64
           dir: "${{github.workspace}}/qt/"
           install-deps: "true"
           cache: 'true'
-          cache-key-prefix: 'install-qt-action-windows'          
+          cache-key-prefix: 'install-qt-action-windows'
 
       - name: Install MSVC compiler
         uses: ilammy/msvc-dev-cmd@v1
-        with: 
+        with:
           # 14.1 is for vs2017, 14.2 is vs2019, following the upstream vcpkg build from Qv2ray-deps repo
           #toolset: 14.2
           arch: x64
@@ -1702,45 +1715,32 @@ jobs:
 
       # - name: Build qthttpserver
       #   run: |
-      #       cd src\qthttpserver 
+      #       cd src\qthttpserver
       #       qmake
       #       nmake
       #       nmake install
-      #       cd ../..          
+      #       cd ../..
 
       - name: Secrets
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/qt6'
         run: |
           cd src
           echo "#define STRAVA_SECRET_KEY ${{ secrets.strava_secret_key }}" > secret.h
           echo "#define PELOTON_SECRET_KEY ${{ secrets.peloton_secret_key }}" >> secret.h
           echo "#define SMTP_USERNAME ${{ secrets.smtp_username }}" >> secret.h
           echo "#define SMTP_PASSWORD ${{ secrets.smtp_password }}" >> secret.h
           echo "#define SMTP_SERVER ${{ secrets.smtp_server }}" >> secret.h
-          echo "#define INTERVALSICU_CLIENT_ID ${{ secrets.intervalsicu_client_id }}" >> secret.h
-          echo "#define INTERVALSICU_CLIENT_SECRET ${{ secrets.intervalsicu_client_secret }}" >> secret.h
           echo "${{ secrets.cesiumkey }}" >> inner_templates/googlemaps/cesium-key.js
           cd ..
-
-      - name: Cache vcpkg
-        id: cache-vcpkg-msvc2022
-        uses: actions/cache@v4
-        with:
-          path: ${{ runner.workspace }}\vcpkg\installed
-          key: vcpkg-msvc2022-x64-windows-protobuf-abseil-v1
-
       - name: Clone vcpkg
-        if: steps.cache-vcpkg-msvc2022.outputs.cache-hit != 'true'
         run: git clone https://github.com/microsoft/vcpkg.git
         working-directory: ${{ runner.workspace }}
 
       - name: Bootstrap vcpkg
-        if: steps.cache-vcpkg-msvc2022.outputs.cache-hit != 'true'
         run: .\vcpkg\bootstrap-vcpkg.bat
         working-directory: ${{ runner.workspace }}
 
       - name: Create vcpkg.json
-        if: steps.cache-vcpkg-msvc2022.outputs.cache-hit != 'true'
         working-directory: ${{ runner.workspace }}
         run: |
           echo '{
@@ -1755,17 +1755,15 @@ jobs:
           }' > vcpkg.json
 
       - name: Install dependencies
-        if: steps.cache-vcpkg-msvc2022.outputs.cache-hit != 'true'
         run: |
-           .\vcpkg\vcpkg install --triplet x64-windows --x-install-root=${{ runner.workspace }}\vcpkg\installed
+          .\vcpkg\vcpkg install --triplet x64-windows --x-install-root=${{ runner.workspace }}\vcpkg\installed
         working-directory: ${{ runner.workspace }}
 
       - name: Build
             Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\lib\*.* -Destination . -Verbose
             Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\lib\*.* -Destination src/ -Verbose
             Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\include\* -Destination src/ -Recurse -Verbose
         run: |
-            lrelease src/qdomyos-zwift.pri
             qmake
             nmake
             cd src/debug
@@ -1786,16 +1784,15 @@ jobs:
             cp ../../adb/* adb/
             cd ..
             cd appx
-            #../../MSIX-Toolkit/WindowsSDK/10/10.0.20348.0/x64/makeappx.exe pack /d ../output/ /p qz   
+            #../../MSIX-Toolkit/WindowsSDK/10/10.0.20348.0/x64/makeappx.exe pack /d ../output/ /p qz
         if: matrix.config.python
 
-            
+
       - name: Build without python
 #            Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\lib\*.* -Destination . -Verbose
 #            Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\lib\*.* -Destination src/ -Verbose
 #            Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\include\* -Destination src/ -Recurse -Verbose
         run: |
-            lrelease src/qdomyos-zwift.pri
             qmake
             nmake
             cd src/debug
@@ -1806,7 +1803,7 @@ jobs:
             windeployqt --qmldir ../../ qdomyos-zwift.exe
             cp "C:/mingw64/bin/libwinpthread-1.dll" .
             cp "C:/mingw64/bin/libgcc_s_seh-1.dll" .
-            cp "C:/mingw64/bin/libstdc++-6.dll" .              
+            cp "C:/mingw64/bin/libstdc++-6.dll" .
             cp ../../../icons/iOS/iTunesArtwork@2x.png .
             cp ../../AppxManifest.xml .
             cp ../../../windows_openssl/*.* .
@@ -1815,8 +1812,8 @@ jobs:
             cp ../../adb/* adb/
             cd ..
             cd appx
-            #../../MSIX-Toolkit/WindowsSDK/10/10.0.20348.0/x64/makeappx.exe pack /d ../output/ /p qz          
-        if: matrix.config.python == false            
+            #../../MSIX-Toolkit/WindowsSDK/10/10.0.20348.0/x64/makeappx.exe pack /d ../output/ /p qz
+        if: matrix.config.python == false
 
       - name: patching qt for bluetooth
         run: cp qt-patches/windows/5.15.2/binary/msvc2019/*.* ${{ github.workspace }}/src/debug/output/
@@ -1843,6 +1840,143 @@ jobs:
           path: windows-msvc2022-binary-no-python.zip
         if:  ${{ ! matrix.config.python }}
 
+  window-msvc2022-aiserver-build:
+    runs-on: windows-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Checkout submodule repo
+        uses: actions/checkout@v2
+        with:
+          repository: bluetiger9/SmtpClient-for-Qt
+          path: "src/smtpclient/"
+          ref: 3fa4a0fe5797070339422cf18b5e9ed8dcb91f9c
+
+      - uses: actions/checkout@v2
+      - name: Checkout submodule repo
+        uses: actions/checkout@v2
+        with:
+          repository: google/googletest
+          path: "tst/googletest/"
+          ref: "release-1.12.1"
+
+      - uses: actions/checkout@v2
+      - name: Checkout qHttpServer
+        uses: actions/checkout@v2
+        with:
+          repository: qt-labs/qthttpserver
+          path: "src/qthttpserver"
+
+      - name: Install CMake
+        uses: lukka/get-cmake@latest
+
+      - name: Install Qt
+        uses: jurplel/install-qt-action@v3
+        with:
+          version: '5.15.2'
+          host: 'windows'
+          modules: 'qtnetworkauth qtcharts'
+          target: "desktop"
+          arch: win64_msvc2019_64
+          dir: "${{github.workspace}}/qt/"
+          install-deps: "true"
+          cache: 'true'
+          cache-key-prefix: 'install-qt-action-windows'
+
+      - name: Install MSVC compiler
+        uses: ilammy/msvc-dev-cmd@v1
+        with:
+          # 14.1 is for vs2017, 14.2 is vs2019, following the upstream vcpkg build from Qv2ray-deps repo
+          toolset: 14.2
+          arch: x64
+
+      - name: download 3rd party files for qthttpserver
+        run: |
+            cp qHttpServerBin/5.15.2/headers/* src/qthttpserver/src/3rdparty/http-parser/
+      - name: Build qthttpserver
+        run: |
+            cd src\qthttpserver
+            qmake
+            nmake
+            nmake install
+            cd ../..
+      - name: Secrets
+        if: github.ref == 'refs/heads/master' || github.ref == 'refs/heads/qt6'
+        run: |
+          cd src
+          echo "#define STRAVA_SECRET_KEY ${{ secrets.strava_secret_key }}" > secret.h
+          echo "#define PELOTON_SECRET_KEY ${{ secrets.peloton_secret_key }}" >> secret.h
+          echo "#define SMTP_USERNAME ${{ secrets.smtp_username }}" >> secret.h
+          echo "#define SMTP_PASSWORD ${{ secrets.smtp_password }}" >> secret.h
+          echo "#define SMTP_SERVER ${{ secrets.smtp_server }}" >> secret.h
+          echo "${{ secrets.cesiumkey }}" >> inner_templates/googlemaps/cesium-key.js
+          cd ..
+      - name: Clone vcpkg
+        run: git clone https://github.com/microsoft/vcpkg.git
+        working-directory: ${{ runner.workspace }}
+
+      - name: Bootstrap vcpkg
+        run: .\vcpkg\bootstrap-vcpkg.bat
+        working-directory: ${{ runner.workspace }}
+
+      - name: Create vcpkg.json
+        working-directory: ${{ runner.workspace }}
+        run: |
+          echo '{
+            "name": "qdomyos-zwift",
+            "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
+            "dependencies": [
+              "protobuf",
+              "protobuf-c",
+              "abseil"
+            ],
+            "builtin-baseline": "8c2fcacefba009d63672f9d137f192765e632c9f"
+          }' > vcpkg.json
+
+      - name: Install dependencies
+        run: |
+          .\vcpkg\vcpkg install --triplet x64-windows --x-install-root=${{ runner.workspace }}\vcpkg\installed
+        working-directory: ${{ runner.workspace }}
+
+      - name: Build
+        run: |
+            Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\lib\*.* -Destination . -Verbose
+            Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\lib\*.* -Destination src/ -Verbose
+            Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\include\* -Destination src/ -Recurse -Verbose
+            cd src
+            echo "#define AISERVER" >> aiserver.h
+            cd ..
+            qmake
+            nmake
+            cd src/debug
+            mkdir output
+            mkdir appx
+            cp qdomyos-zwift.* output/
+            cd output
+            windeployqt --qmldir ../../ qdomyos-zwift.exe
+            cp ../../../icons/iOS/iTunesArtwork@2x.png .
+            cp ../../AppxManifest.xml .
+            cp ../../windows/zwift-incline-ai-server.py zwift-incline.py
+            cp ../../windows/zwift-incline-climb-portal-ai-server.py zwift-incline-climb-portal.py
+            cp ../../windows/zwift-workout-ai-server.py zwift-workout.py
+            cp ../../windows/*.bat .
+            cp ../../../windows_openssl/*.* .
+            Copy-Item -Path ${{ runner.workspace }}\vcpkg\installed\x64-windows\bin\*.* -Destination . -Verbose
+            mkdir adb
+            cp ../../adb/* adb/
+            cd ..
+            cd appx
+            #../../MSIX-Toolkit/WindowsSDK/10/10.0.20348.0/x64/makeappx.exe pack /d ../output/ /p qz
+      - name: patching qt for bluetooth
+        run: cp qt-patches/windows/5.15.2/binary/msvc2019/*.* ${{ github.workspace }}/src/debug/output/
+
+      - name: Zip artifact for deployment
+        run: Compress-Archive src/debug/output windows-msvc2022-ai-server-binary.zip
+
+      - name: Archive windows binary
+        uses: actions/upload-artifact@v4
+        with:
+          name: windows-msvc2022-ai-server-binary
+          path: windows-msvc2022-ai-server-binary.zip
 
   window-msvc2022-pr-build:
     runs-on: windows-2022

src/main.qml

@@ -730,8 +730,12 @@ ApplicationWindow {
         text: "Echelon Unlock"
         informativeText: "The bike has been unlocked and cadence is flowing.\n\nDo you want to switch to the classic Bluetooth bridge for this session?"
         buttons: (MessageDialog.Yes | MessageDialog.No)
-        onYesClicked: { rootItem.echelon_switch_to_classic_bridge(); }
-        onNoClicked: { rootItem.echelon_dismiss_bridge_switch_prompt(); }
+        onAccepted: {
+            if (clickedButton === MessageDialog.Yes)
+                rootItem.echelon_switch_to_classic_bridge();
+            else
+                rootItem.echelon_dismiss_bridge_switch_prompt();
+        }
         visible: rootItem.echelonBridgeSwitchPromptRequested
     }