diff --git a/examples/applets/bugreport/contents/ui/main.qml b/examples/applets/bugreport/contents/ui/main.qml --- a/examples/applets/bugreport/contents/ui/main.qml +++ b/examples/applets/bugreport/contents/ui/main.qml @@ -48,7 +48,8 @@ margins: units.largeSpacing } - PlasmaExtras.Title { + PlasmaExtras.Heading { + level: 1 text: i18n("Reporting Bugs") } PlasmaExtras.Heading { diff --git a/examples/applets/testcomponents/contents/ui/DialogContent.qml b/examples/applets/testcomponents/contents/ui/DialogContent.qml --- a/examples/applets/testcomponents/contents/ui/DialogContent.qml +++ b/examples/applets/testcomponents/contents/ui/DialogContent.qml @@ -40,8 +40,9 @@ Column { anchors.fill: parent spacing: 12 - PlasmaExtras.Title { + PlasmaExtras.Heading { id: tx + level: 1 text: "Test Dialog" } PlasmaComponents.TextArea { diff --git a/examples/applets/testcomponents/contents/ui/DialogsPage.qml b/examples/applets/testcomponents/contents/ui/DialogsPage.qml --- a/examples/applets/testcomponents/contents/ui/DialogsPage.qml +++ b/examples/applets/testcomponents/contents/ui/DialogsPage.qml @@ -35,8 +35,9 @@ Column { spacing: _s/2 anchors.fill: parent - PlasmaExtras.Title { + PlasmaExtras.Heading { width: parent.width + level: 1 text: "Dialogs" } Row { diff --git a/examples/applets/testcomponents/contents/ui/DragPage.qml b/examples/applets/testcomponents/contents/ui/DragPage.qml --- a/examples/applets/testcomponents/contents/ui/DragPage.qml +++ b/examples/applets/testcomponents/contents/ui/DragPage.qml @@ -39,11 +39,11 @@ margins: _s } - PlasmaExtras.Title { + PlasmaExtras.Heading { id: dlabel anchors { left: parent.left; right: parent.right; top: parent.top; } - + level: 1 text: "Drag & Drop" } diff --git a/examples/applets/testcomponents/contents/ui/IconsPage.qml b/examples/applets/testcomponents/contents/ui/IconsPage.qml --- a/examples/applets/testcomponents/contents/ui/IconsPage.qml +++ b/examples/applets/testcomponents/contents/ui/IconsPage.qml @@ -35,9 +35,10 @@ anchors.fill: parent spacing: _s - PlasmaExtras.Title { + PlasmaExtras.Heading { width: parent.width elide: Text.ElideRight + level: 1 text: "Icons" } PlasmaComponents.Label { diff --git a/examples/applets/testcomponents/contents/ui/MousePage.qml b/examples/applets/testcomponents/contents/ui/MousePage.qml --- a/examples/applets/testcomponents/contents/ui/MousePage.qml +++ b/examples/applets/testcomponents/contents/ui/MousePage.qml @@ -31,8 +31,9 @@ fill: parent margins: _s } - PlasmaExtras.Title { + PlasmaExtras.Heading { id: mellabel + level: 1 text: "MouseEventListener" anchors { left: parent.left; right: parent.right; top: parent.top } } diff --git a/examples/applets/testcomponents/contents/ui/ThemePage.qml b/examples/applets/testcomponents/contents/ui/ThemePage.qml --- a/examples/applets/testcomponents/contents/ui/ThemePage.qml +++ b/examples/applets/testcomponents/contents/ui/ThemePage.qml @@ -41,9 +41,10 @@ //anchors.fill: parent //spacing: _s / 4 - PlasmaExtras.Title { + PlasmaExtras.Heading { width: parent.width elide: Text.ElideRight + level: 1 text: "Theme" } diff --git a/examples/applets/testtheme/contents/ui/FontTest.qml b/examples/applets/testtheme/contents/ui/FontTest.qml --- a/examples/applets/testtheme/contents/ui/FontTest.qml +++ b/examples/applets/testtheme/contents/ui/FontTest.qml @@ -115,7 +115,7 @@ } } - PlasmaExtras.Title { + PlasmaExtras.Heading { font.weight: lightCheck.checked ? Font.Light : Font.Normal font.family: fontCheck.text diff --git a/examples/applets/testtheme/contents/ui/ScalePage.qml b/examples/applets/testtheme/contents/ui/ScalePage.qml --- a/examples/applets/testtheme/contents/ui/ScalePage.qml +++ b/examples/applets/testtheme/contents/ui/ScalePage.qml @@ -43,9 +43,10 @@ right: parent.right } - PlasmaExtras.Title { + PlasmaExtras.Heading { width: parent.width elide: Text.ElideRight + level: 1 text: "Scaling Test" font.pointSize: cheatLabel.font.pointSize * 2 } diff --git a/examples/applets/testtheme/contents/ui/UnitsPage.qml b/examples/applets/testtheme/contents/ui/UnitsPage.qml --- a/examples/applets/testtheme/contents/ui/UnitsPage.qml +++ b/examples/applets/testtheme/contents/ui/UnitsPage.qml @@ -40,9 +40,10 @@ //anchors.fill: parent //spacing: units.smallSpacing/2 - PlasmaExtras.Title { + PlasmaExtras.Heading { width: parent.width elide: Text.ElideRight + level: 1 text: "Theme & DPI Test" } diff --git a/examples/applets/widgetgallery/contents/ui/Typography.qml b/examples/applets/widgetgallery/contents/ui/Typography.qml --- a/examples/applets/widgetgallery/contents/ui/Typography.qml +++ b/examples/applets/widgetgallery/contents/ui/Typography.qml @@ -32,7 +32,8 @@ iconSource: "go-previous" onClicked: pageStack.pop() } - PlasmaExtras.Title { + PlasmaExtras.Heading { + level: 1 text: "Typography" } } @@ -55,7 +56,8 @@ } spacing: 12 - PlasmaExtras.Title { + PlasmaExtras.Heading { + level: 1 text: "A Title" } diff --git a/examples/developerguide/basic/contents/ui/main.qml b/examples/developerguide/basic/contents/ui/main.qml --- a/examples/developerguide/basic/contents/ui/main.qml +++ b/examples/developerguide/basic/contents/ui/main.qml @@ -42,7 +42,8 @@ spacing: units.gridUnit // A title on top - PlasmaExtras.Title { + PlasmaExtras.Heading { + level: 1 // from 1 to 5; level 1 is the size used for titles text: i18n("Hello Plasma World!") } diff --git a/src/declarativeimports/plasmaextracomponents/qml/Heading.qml b/src/declarativeimports/plasmaextracomponents/qml/Heading.qml --- a/src/declarativeimports/plasmaextracomponents/qml/Heading.qml +++ b/src/declarativeimports/plasmaextracomponents/qml/Heading.qml @@ -33,7 +33,7 @@ * import org.kde.plasma.extras 2.0 as PlasmaExtras * [...] * Column { - * PlasmaExtras.Title { text: "Fruit sweetness on the rise" } + * PlasmaExtras.Heading { text: "Fruit sweetness on the rise"; level: 1 } * PlasmaExtras.Heading { text: "Apples in the sunlight"; level: 2 } * PlasmaExtras.Paragraph { text: "Long text about fruit and apples [...]" } * [...] diff --git a/src/declarativeimports/plasmaextracomponents/qml/Paragraph.qml b/src/declarativeimports/plasmaextracomponents/qml/Paragraph.qml --- a/src/declarativeimports/plasmaextracomponents/qml/Paragraph.qml +++ b/src/declarativeimports/plasmaextracomponents/qml/Paragraph.qml @@ -32,7 +32,7 @@ * import org.kde.plasma.extras 2.0 as PlasmaExtras * [...] * Column { - * PlasmaExtras.Title { text: "Fruit sweetness on the rise" } + * PlasmaExtras.Heading { text: "Fruit sweetness on the rise"; level: 1 } * PlasmaExtras.Heading { text: "Apples in the sunlight"; level: 2 } * PlasmaExtras.Paragraph { text: "Long text about fruit and apples [...]" } * [...] diff --git a/templates/plasma-wallpaper-with-qml-extension/package/contents/ui/main.qml b/templates/plasma-wallpaper-with-qml-extension/package/contents/ui/main.qml --- a/templates/plasma-wallpaper-with-qml-extension/package/contents/ui/main.qml +++ b/templates/plasma-wallpaper-with-qml-extension/package/contents/ui/main.qml @@ -38,8 +38,9 @@ ColumnLayout { anchors.centerIn: parent - PlasmaExtras.Title { + PlasmaExtras.Heading { Layout.alignment: Qt.AlignCenter + level: 1 text: wallpaper.configuration.DisplayText || i18n("") } diff --git a/templates/plasma-wallpaper/package/contents/ui/main.qml b/templates/plasma-wallpaper/package/contents/ui/main.qml --- a/templates/plasma-wallpaper/package/contents/ui/main.qml +++ b/templates/plasma-wallpaper/package/contents/ui/main.qml @@ -30,8 +30,9 @@ color: Theme.backgroundColor } - PlasmaExtras.Title { + PlasmaExtras.Heading { anchors.centerIn: parent + level: 1 text: wallpaper.configuration.DisplayText || i18n("") }