Index: sources/gui/qml/components/TimeText.qml =================================================================== diff -u -r68757118f0b5dc5d831f8330ff3fec40dc461aa9 -r7caa737179a8c31825ae6445f593ac7ff5f95080 --- sources/gui/qml/components/TimeText.qml (.../TimeText.qml) (revision 68757118f0b5dc5d831f8330ff3fec40dc461aa9) +++ sources/gui/qml/components/TimeText.qml (.../TimeText.qml) (revision 7caa737179a8c31825ae6445f593ac7ff5f95080) @@ -58,52 +58,51 @@ property string time : hourText + separator + minuteText + (_root.secondsVisible ? (separator + secondText) : "") } - Text { id: _timeSeparator - objectName: "_TimeText_timeSeparator" //SquishQt testability + Text { id : _timeSeparator + objectName : "_TimeText_timeSeparator" //SquishQt testability - text: _private.separator + text : _private.separator - font.pixelSize: _root.textPixelSize - font.weight: _root.textWeight - color: _root.textColor + font.pixelSize : _root.textPixelSize + font.weight : _root.textWeight + color : _root.textColor anchors.centerIn: _root } - Text { id: _hourText - objectName: "_TimeText_hour" //SquishQt testability + Text { id : _hourText + objectName : "_TimeText_hour" //SquishQt testability - text: _private.hourText - font.pixelSize: _root.textPixelSize - font.weight: _root.textWeight - color: _root.textColor + text : _private.hourText + font.pixelSize : _root.textPixelSize + font.weight : _root.textWeight + color : _root.textColor horizontalAlignment: Text.AlignRight anchors.right : _timeSeparator.left anchors.baseline: _timeSeparator.baseline } - Text { id: _minuteText - objectName: "_TimeText_minute" //SquishQt testability + Text { id : _minuteText + objectName : "_TimeText_minute" //SquishQt testability - text: _private.minuteText - font.pixelSize: _root.textPixelSize - font.weight: _root.textWeight - color: _root.textColor + text : _private.minuteText + font.pixelSize : _root.textPixelSize + font.weight : _root.textWeight + color : _root.textColor horizontalAlignment: Text.AlignLeft - anchors.left: _timeSeparator.right + anchors.left : _timeSeparator.right anchors.baseline: _timeSeparator.baseline } - Text { id: _secondText - objectName: "_TimeText_second" //SquishQt testability + Text { id : _secondText + objectName : "_TimeText_second" //SquishQt testability - visible: _root.secondsVisible - - text: _private.secondText - font.pixelSize: _root.secsPixelSize - color: _root.textColor - horizontalAlignment: Text.AlignLeft - anchors.left: _minuteText.right - anchors.leftMargin: _root.secondsLeftMargin - anchors.baseline: _timeSeparator.baseline + visible : _root.secondsVisible + text : _private.secondText + font.pixelSize : _root.secsPixelSize + color : _root.textColor + horizontalAlignment : Text.AlignLeft + anchors.left : _minuteText.right + anchors.leftMargin : _root.secondsLeftMargin + anchors.baseline : _timeSeparator.baseline } }