Update QML components

emericg · Oct 9, 2023 · 1b44351 · 1b44351
1 parent 2c4ec88
commit 1b44351
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 16 deletions.
diff --git a/.github/workflows/builds_mobile_cmake.yml b/.github/workflows/builds_mobile_cmake.yml
@@ -70,8 +70,8 @@ jobs:
       # Setup env
       - name: Setup env
         run: |
-             echo "QT_HOST_PATH=/home/runner/work/${{env.REPO_NAME}}/Qt/${{env.QT_VERSION}}/gcc_64" >> $GITHUB_ENV
-             echo "QT_TARGET_PATH=/home/runner/work/${{env.REPO_NAME}}/Qt/${{env.QT_VERSION}}/android_arm64_v8a" >> $GITHUB_ENV
+             echo "QT_HOST_PATH=/home/runner/work/${{env.APP_NAME}}/Qt/${{env.QT_VERSION}}/gcc_64" >> $GITHUB_ENV
+             echo "QT_TARGET_PATH=/home/runner/work/${{env.APP_NAME}}/Qt/${{env.QT_VERSION}}/android_arm64_v8a" >> $GITHUB_ENV
              cmake --version
 
       # Build application
@@ -121,8 +121,8 @@ jobs:
       # Setup env
       - name: Setup env
         run: |
-             echo "QT_HOST_PATH=/home/runner/work/${{env.REPO_NAME}}/Qt/${{env.QT_VERSION}}/macos" >> $GITHUB_ENV
-             echo "QT_TARGET_PATH=/home/runner/work/${{env.REPO_NAME}}/Qt/${{env.QT_VERSION}}/ios" >> $GITHUB_ENV
+             echo "QT_HOST_PATH=/home/runner/work/${{env.APP_NAME}}/Qt/${{env.QT_VERSION}}/macos" >> $GITHUB_ENV
+             echo "QT_TARGET_PATH=/home/runner/work/${{env.APP_NAME}}/Qt/${{env.QT_VERSION}}/ios" >> $GITHUB_ENV
              cmake --version
 
       # Build application

diff --git a/qml/PageSelectors.qml b/qml/PageSelectors.qml
@@ -20,13 +20,7 @@ Flickable {
         bottomPadding: Theme.componentMarginXL
         spacing: Theme.componentMarginXL
 
-        ListTitle { ////////////////////////////////////////////////////////////
-            anchors.leftMargin: singleColumn ? 0 : Theme.componentMargin
-            anchors.rightMargin: singleColumn ? 0 : Theme.componentMargin
-
-            text: qsTr("Selectors")
-            icon: ""
-        }
+        ////
 
         ListModel {
             id: lmSelectorMenuTxt
@@ -49,6 +43,16 @@ Flickable {
 
         ////
 
+        ListTitle { ////////////////////////////////////////////////////////////
+            anchors.leftMargin: singleColumn ? 0 : Theme.componentMargin
+            anchors.rightMargin: singleColumn ? 0 : Theme.componentMargin
+
+            text: qsTr("Selectors")
+            icon: ""
+        }
+
+        ////
+
         SelectorMenuThemed {
             anchors.horizontalCenter: parent.horizontalCenter
             height: 32
@@ -93,6 +97,16 @@ Flickable {
 
         ////
 
+        ListTitle { ////////////////////////////////////////////////////////////
+            anchors.leftMargin: singleColumn ? 0 : Theme.componentMargin
+            anchors.rightMargin: singleColumn ? 0 : Theme.componentMargin
+
+            text: qsTr("Selectors")
+            icon: ""
+        }
+
+        ////
+
         SelectorMenu {
             anchors.horizontalCenter: parent.horizontalCenter
             height: 32

diff --git a/qml/components_generic/ActionMenuItem.qml b/qml/components_generic/ActionMenuItem.qml
@@ -27,7 +27,6 @@ T.Button {
 
     // settings
     property int index
-    //property string text
     property url source
     property int sourceSize: 20
     property int layoutDirection: Qt.RightToLeft

diff --git a/qml/components_generic/RoundButtonText.qml b/qml/components_generic/RoundButtonText.qml
@@ -13,7 +13,6 @@ T.Button {
 
     focusPolicy: Qt.NoFocus
 
-    //property string text
     property int textSize: Math.round(width * 0.333)
 
     // settings

diff --git a/qml/components_generic/SelectorMenuItem.qml b/qml/components_generic/SelectorMenuItem.qml
@@ -19,7 +19,6 @@ T.Button {
 
     // settings
     property int index
-    //property string text
     property url source
     property int sourceSize: 32
 

diff --git a/qml/components_themed/SelectorMenuThemedItem.qml b/qml/components_themed/SelectorMenuThemedItem.qml
@@ -19,7 +19,6 @@ T.Button {
 
     // settings
     property int index
-    //property string text
     property url source
     property int sourceSize: 32
 
@@ -68,7 +67,7 @@ T.Button {
 
             text: control.text
             textFormat: Text.PlainText
-            font.pixelSize: Theme.componentFontSize
+            font: control.font
             verticalAlignment: Text.AlignVCenter
 
             color: control.highlighted ? control.colorContentHighlight : control.colorContent