Index: sources/gui/qml/components/TouchArea.qml =================================================================== diff -u -rae97f70129df818530bcb70c934c42fa28eb6034 -ra159e12630645a9a35fb0a5585cc7b639cfe6aa6 --- sources/gui/qml/components/TouchArea.qml (.../TouchArea.qml) (revision ae97f70129df818530bcb70c934c42fa28eb6034) +++ sources/gui/qml/components/TouchArea.qml (.../TouchArea.qml) (revision a159e12630645a9a35fb0a5585cc7b639cfe6aa6) @@ -27,51 +27,38 @@ * next to the right edge of the component. */ Rectangle { id : _root - enum Orientation { - Horizontal, - Vertical - } - property string title : "" property int titleLetterSpacing : 3 property bool isTouchable : true - property int orientation : TouchArea.Orientation.Horizontal - property list components - property int titleVSpacing : 20 - property int componentsHSpacing : 80 - property int componentsVSpacing : 0 - property int arrowSpacing : 40 + property string notificationText : "" + property string notificationImageSource : "" + signal clicked() color: "transparent" - width : _column.width + arrowSpacing - height: _column.height clip : false - Column { id: _column - width : Math.max(_titleText.width , _grid.width) - height : _titleText.height + _grid.height - spacing : titleVSpacing - Text { id: _titleText - text: _root.title - font.pixelSize: Fonts.fontPixelTouchAreaTitle - font.letterSpacing: titleLetterSpacing - color: Colors.touchTextAreaTitle + Text { id: _titleText + anchors { + top: parent.top + left: parent.left } - Grid { id: _grid - columns : orientation === TouchArea.Orientation.Horizontal ? components.length : 1 - rows : orientation === TouchArea.Orientation.Vertical ? components.length : 1 - spacing : orientation === TouchArea.Orientation.Horizontal ? componentsHSpacing : componentsVSpacing - children: components + text: _root.title + font { + pixelSize: Fonts.fontPixelTouchAreaTitle + letterSpacing: titleLetterSpacing } + color: Colors.touchTextAreaTitle } Image { id: _arrowImage visible: isTouchable - anchors.right: parent.right - anchors.top: parent.top + anchors { + top: parent.top + right: parent.right + } width : Variables.arrowWidth height: Variables.arrowHeight source: "qrc:/images/iArrow" @@ -85,6 +72,23 @@ } } } + Component.onCompleted: { } + + NotificationBar { id: _notification + height : 25 + imageAutoSize: true + color: "transparent" + anchors { + bottom: parent.bottom + left: parent.left + right: parent.right + } + imageSource : notificationImageSource + text : notificationText + textColor : "gray" + textfontSize: 16 + rowAnchors.centerIn: null + } }