add back uniformCellSizes, fix wasm for real

use Kidev's forks Signed-off-by: swurl <[email protected]>
Q-FRC · Jan 2, 2025 · 7d1e9df · 7d1e9df
1 parent 9e22176
commit 7d1e9df
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 22 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -24,20 +24,22 @@ jobs:
 
           - os: ubuntu-20.04
             qt_host: linux
+            qt_target: desktop
             qt_version: '6.8.1'
             qt_arch: gcc_64
 
           - os: ubuntu-20.04
             qt_host: linux
             qt_target: android
-            qt_arch: android_arm64_v8a
             qt_version: '6.8.1'
+            qt_arch: android_arm64_v8a
 
           - os: ubuntu-20.04
-            qt_host: linux
-            qt_version: '6.6.3'
+            qt_host: all_os
+            qt_target: wasm
+            qt_version: '6.8.1'
             qt_arch: wasm_singlethread
-            emsdk_version: 3.1.37
+            emsdk_version: 3.1.56
 
           - os: windows-2022
             qt_host: windows
@@ -82,29 +84,25 @@ jobs:
         distribution: 'temurin' # See 'Supported distributions' for available options
         java-version: '21'
 
-    - name: Install Qt ${{ matrix.qt_version }}
-      uses: jurplel/install-qt-action@v4
+    - name: Install Qt ${{ matrix.qt_version }} (Windows, macOS)
+      if: runner.os != 'Linux'
+      uses: Kidev/[email protected]
       with:
         cache: on
         version: ${{ matrix.qt_version }}
 
-    - name: Install Qt ${{ matrix.qt_version }} (WASM)
-      if: matrix.qt_arch == 'wasm_singlethread'
-      uses: jurplel/install-qt-action@v4
+    - name: Install Qt ${{ matrix.qt_version }} (Linux)
+      if: runner.os == 'Linux'
+      uses: Kidev/install-qt-action@v4.2.0
       with:
         cache: on
         host: ${{ matrix.qt_host }}
-        version: ${{ matrix.qt_version }}
-        arch: ${{ matrix.qt_arch }}
-
-    - name: Install Qt ${{ matrix.qt_version }} (Android)
-      if: matrix.qt_target == 'android'
-      uses: jurplel/install-qt-action@v4
-      with:
-        cache: on
-        version: ${{ matrix.qt_version }}
         target: ${{ matrix.qt_target }}
+        version: ${{ matrix.qt_version }}
         arch: ${{ matrix.qt_arch }}
+        set-env: true
+        aqtsource: 'git+https://github.com/Kidev/aqtinstall.git@wasm'
+        extra: '--autodesktop'
 
     - name: Install Build Dependencies (macOS)
       if: runner.os == 'macOS'
@@ -133,7 +131,7 @@ jobs:
         git submodule update --init
         declare QTPATH="${{ github.workspace }}/../Qt/${{ matrix.qt_version }}"
 
-        cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DCMAKE_TOOLCHAIN_FILE=$QTPATH/${{ matrix.qt_arch }}/lib/cmake/Qt6/qt.toolchain.cmake -DQT_HOST_PATH=$QTPATH/gcc_64 -DQT_HOST_PATH_CMAKE_DIR=$QTPATH/${{ matrix.qt_arch }}/lib/cmake -DCMAKE_PREFIX_PATH=$QTPATH/${{ matrix.qt_arch }}/lib/cmake -DTBA_AUTH_KEY=${{ secrets.TBA_AUTH_KEY }}
+        cmake -S . -B ${{ env.BUILD_DIR }} -DCMAKE_BUILD_TYPE=${{ inputs.build_type }} -DCMAKE_TOOLCHAIN_FILE=$QTPATH/${{ matrix.qt_arch }}/lib/cmake/Qt6/qt.toolchain.cmake -DQT_HOST_PATH=$QTPATH/${{ matrix.qt_arch }} -DQT_HOST_PATH_CMAKE_DIR=$QTPATH/${{ matrix.qt_arch }}/lib/cmake -DCMAKE_PREFIX_PATH=$QTPATH/${{ matrix.qt_arch }}/lib/cmake -DTBA_AUTH_KEY=${{ secrets.TBA_AUTH_KEY }}
 
     - name: Configure (Windows, macOS)
       if: runner.os != 'Linux'
@@ -181,13 +179,13 @@ jobs:
         cmake --install ${{ env.BUILD_DIR }} --prefix ${{ env.INSTALL_APPIMAGE_DIR }}/usr
 
         export OUTPUT="QFRCScouter-${{ runner.os }}-${{ env.VERSION }}-${{ inputs.build_type }}-x86_64.AppImage"
-        export QML_SOURCES_PATHS="${{ runner.workspace }}/Qt/${{ matrix.qt_version }}/gcc_64/qml:${{ github.workspace }}"
+        export QML_SOURCES_PATHS="${{ runner.workspace }}/Qt/${{ matrix.qt_version }}/${{ matrix.qt_arch }}/qml:${{ github.workspace }}"
 
         chmod +x linuxdeploy-*.AppImage
 
         mkdir -p ${{ env.INSTALL_APPIMAGE_DIR }}/usr/plugins/iconengines
 
-        cp -r ${{ runner.workspace }}/Qt/${{ matrix.qt_version }}/gcc_64/plugins/ ${{ env.INSTALL_APPIMAGE_DIR }}/usr/
+        cp -r ${{ runner.workspace }}/Qt/${{ matrix.qt_version }}/${{ matrix.qt_arch }}/plugins/ ${{ env.INSTALL_APPIMAGE_DIR }}/usr/
 
         cp /usr/lib/x86_64-linux-gnu/libcrypto.so.1.1 ${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib/
         cp /usr/lib/x86_64-linux-gnu/libssl.so.1.1 ${{ env.INSTALL_APPIMAGE_DIR }}/usr/lib/

diff --git a/items/LabeledSpinBox.qml b/items/LabeledSpinBox.qml
@@ -33,6 +33,8 @@ SpinBox {
         horizontalAlignment: Qt.AlignHCenter
         verticalAlignment: Qt.AlignVCenter
 
+        readOnly: !spin.editable
+
         width: parent.width / 3
 
         inputMethodHints: Qt.ImhFormattedNumbersOnly

diff --git a/items/MatchSpinBox.qml b/items/MatchSpinBox.qml
@@ -26,7 +26,7 @@ SpinBox {
     from: min
     to: max
 
-    editable: true
+    editable: false
 
     value: 0
     onValueModified: {
@@ -42,6 +42,7 @@ SpinBox {
         verticalAlignment: Qt.AlignVCenter
 
         width: parent.width / 3
+        readOnly: !spin.editable
 
         inputMethodHints: Qt.ImhFormattedNumbersOnly
 

diff --git a/items/ScaleItem.qml b/items/ScaleItem.qml
@@ -38,6 +38,7 @@ ColumnLayout {
 
     RowLayout {
         Layout.fillWidth: true
+        uniformCellSizes: true
         spacing: 2
 
         Repeater {

diff --git a/pages/PhasePage.qml b/pages/PhasePage.qml
@@ -37,6 +37,8 @@ Rectangle {
             right: parent.right
         }
 
+        uniformCellWidths: true
+
         columns: 2
 
         Repeater {

diff --git a/pages/ScalesPage.qml b/pages/ScalesPage.qml
@@ -21,6 +21,8 @@ Rectangle {
     property list<var> values
 
     ColumnLayout {
+        uniformCellSizes: true
+
         anchors {
             top: banner.bottom
             bottom: parent.bottom