Index: sources/gui/qml/compounds/TouchGrid.qml =================================================================== diff -u -r506a9e3db1a20bda1685e38c5e9041005c9a4a4f -r65558208e4968de9a5470ff5fda1ee2a9d00c793 --- sources/gui/qml/compounds/TouchGrid.qml (.../TouchGrid.qml) (revision 506a9e3db1a20bda1685e38c5e9041005c9a4a4f) +++ sources/gui/qml/compounds/TouchGrid.qml (.../TouchGrid.qml) (revision 65558208e4968de9a5470ff5fda1ee2a9d00c793) @@ -26,11 +26,15 @@ Item { id: _root objectName: "_TouchGrid" - property var itemsText : [] - property var itemsEnabled : [] - property int itemWidth : 350 - property int itemHeight : 50 + property var itemsText : [] + property var itemsEnabled : [] + property int itemWidth : 350 + property int itemHeight : 50 + property alias layoutOrder : _grid.flow + property bool hasImage : true + property bool hasLine : true + readonly property int rowCount : 5 // rowCount should be readonly because it depends on the available space on the screen readonly property int colCount : itemsText.length > rowCount ? Math.ceil(itemsText.length / rowCount) : 1 readonly property int titleTopMargin: 110 @@ -59,17 +63,17 @@ onClicked : _root.itemClicked(index) Image { - visible: _touchItem.enabled && ! _touchItem.isPressed && _root.itemsText[index] - anchors.right: _touchItem.right - anchors.verticalCenter: _touchItem.verticalCenter - width : Variables.arrowWidth - height: Variables.arrowHeight - source: "qrc:/images/iArrowRight" + visible : _root.hasImage && _touchItem.enabled && ! _touchItem.isPressed && _root.itemsText[index] + anchors.right : _touchItem.right + anchors.verticalCenter : _touchItem.verticalCenter + width : Variables.arrowWidth + height : Variables.arrowHeight + source : "qrc:/images/iArrowRight" } Line { - visible: ! _touchItem.isPressed && _root.itemsText[index] - color: _touchItem.enabled ? Colors.borderButtonHalfDarker : Colors.borderDisableButton + visible : hasLine && ! _touchItem.isPressed && _root.itemsText[index] + color : _touchItem.enabled ? Colors.borderButtonHalfDarker : Colors.borderDisableButton anchors.left : _touchItem.left anchors.right : _touchItem.right anchors.bottom : _touchItem.bottom