diff --git a/Modules/energy/package/contents/ui/main.qml b/Modules/energy/package/contents/ui/main.qml --- a/Modules/energy/package/contents/ui/main.qml +++ b/Modules/energy/package/contents/ui/main.qml @@ -19,6 +19,7 @@ import QtQuick 2.2 import QtQuick.Controls 1.3 +import QtQuick.Controls 2.0 as QQC2 import QtQuick.Layouts 1.1 import org.kde.kquickcontrolsaddons 2.0 @@ -285,7 +286,7 @@ visible: history.count > 1 } - Label { + QQC2.Label { Layout.fillWidth: true Layout.minimumHeight: column.width / 3 Layout.maximumHeight: column.width / 3 @@ -365,7 +366,7 @@ RowLayout { Layout.fillWidth: true - Label { + QQC2.Label { Layout.fillWidth: true elide: Text.ElideRight text: model.prettyName || model.name @@ -439,7 +440,7 @@ spacing: units.smallSpacing * 2 visible: valueLabel.text !== "" - Label { + QQC2.Label { Layout.minimumWidth: detailsColumn.legendWidth + units.gridUnit horizontalAlignment: Text.AlignRight text: i18n("%1:", modelData.label) @@ -452,7 +453,7 @@ } } - Label { + QQC2.Label { id: valueLabel Layout.fillWidth: true text: { diff --git a/Modules/fileindexermonitor/package/contents/ui/main.qml b/Modules/fileindexermonitor/package/contents/ui/main.qml --- a/Modules/fileindexermonitor/package/contents/ui/main.qml +++ b/Modules/fileindexermonitor/package/contents/ui/main.qml @@ -22,6 +22,7 @@ import QtQuick 2.4 import QtQuick.Controls 1.3 +import QtQuick.Controls 2.0 as QQC2 import QtQuick.Layouts 1.1 import org.kde.baloo.experimental 0.1 as Baloo @@ -42,12 +43,12 @@ spacing: 20 visible: monitor.balooRunning - Label { + QQC2.Label { id: indexerState text: i18n("Indexer State: %1", monitor.stateString) } - Label { + QQC2.Label { id: filePath // Required so that text elides instead of expanding the entire layout @@ -86,7 +87,7 @@ } } - Label { + QQC2.Label { visible: monitor.state == Constants.State.ContentIndexing id: remainingTime text: i18n("Remaining Time: %1", monitor.remainingTime) @@ -100,7 +101,7 @@ spacing: 20 - Label { + QQC2.Label { Layout.fillWidth: true horizontalAlignment: Text.AlignHCenter text: i18n("File Indexer not running")