Index: sources/gui/qml/pages/settings/SettingsBase.qml =================================================================== diff -u -ra5760947d3ed0d2748ba023a1c25e3c6aa0b1de1 -r934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f --- sources/gui/qml/pages/settings/SettingsBase.qml (.../SettingsBase.qml) (revision a5760947d3ed0d2748ba023a1c25e3c6aa0b1de1) +++ sources/gui/qml/pages/settings/SettingsBase.qml (.../SettingsBase.qml) (revision 934354462a353ff5e7fc2ddfe6f3a8f0121a8f3f) @@ -27,17 +27,14 @@ ScreenItem { id: _root objectName: "_SettingsBase" + property Item contentItem : null + property alias contentArea : _contentArea + property int labelWidth : 200 property int entryWidth : 100 property var firstFocusInput : undefined - readonly - property int topMarginTitle : 100 - property int topMarginContent : 200 - property int bottomMarginContent : Variables.settingsContentBottomMargin - property int sidesMarginContent : Variables.settingsContentSidesMargin - property int itemIndex : 0 property alias title : _titleText.text @@ -70,6 +67,7 @@ } onClicked: { _root.backClicked() + _headerBar.titleText = settingsTitle pop() } } @@ -87,15 +85,26 @@ Text { id: _titleText anchors { top : _root.top - topMargin : topMarginTitle + topMargin : Variables.defaultMargin * 5 horizontalCenter: parent.horizontalCenter } horizontalAlignment : Text.AlignHCenter - text : itemsText[itemIndex] - color : Colors.textMain - font.pixelSize : Fonts.fontPixelTitle + color : Colors.textMain + font.pixelSize : Fonts.fontPixelTitle } + ContentArea { id : _contentArea + anchors { + fill : _root + topMargin : Variables.defaultMargin * 6 + leftMargin : Variables.defaultMargin * 2 + rightMargin : Variables.defaultMargin * 2 + bottomMargin: Variables.settingsContentBottomMargin + } + + contentItem: _root.contentItem + } + // this meant to be used specifically as current state notification mostly for the message respose back reasons. NotificationBarSmall { id: _information visible : text