diff --git a/applets/dict/package/contents/config/config.qml b/applets/dict/package/contents/config/config.qml --- a/applets/dict/package/contents/config/config.qml +++ b/applets/dict/package/contents/config/config.qml @@ -5,7 +5,7 @@ ConfigModel { ConfigCategory { name: i18nc("@title", "Dictionaries") - icon: "image" + icon: "accessories-dictionary" source: "ConfigDictionaries.qml" } } diff --git a/applets/dict/package/contents/ui/ConfigDictionaries.qml b/applets/dict/package/contents/ui/ConfigDictionaries.qml --- a/applets/dict/package/contents/ui/ConfigDictionaries.qml +++ b/applets/dict/package/contents/ui/ConfigDictionaries.qml @@ -16,15 +16,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 2.010-1301, USA. */ -import QtQuick 2.1 -import QtQuick.Controls 1.1 -import QtQuick.Layouts 1.1 - +import QtQuick 2.7 +import QtQuick.Controls 2.5 +import QtQuick.Layouts 1.2 +import org.kde.kirigami 2.5 as Kirigami import org.kde.plasma.private.dict 1.0 ColumnLayout { id: root - property string cfg_dictionary: "" DictionariesModel { @@ -35,43 +34,43 @@ id: syspal } - Label { + Kirigami.Heading { Layout.fillWidth: true + level: 2 text: i18nc("@label:listbox", "Available dictionaries:") } ScrollView { + id: scrollView Layout.fillWidth: true Layout.fillHeight: true - - frameVisible: true + contentWidth: listView.implicitWidth + contentHeight: listView.implicitHeight + Component.onCompleted: background.visible = true; ListView { - width: parent.width + id: listView model: dictionariesModel delegate: Item { - width: parent.width + width: root.width height: pathText.height Rectangle { id: highlight anchors.fill: parent + anchors.rightMargin: units.largeSpacing visible: model.id == root.cfg_dictionary color: syspal.highlight } - RowLayout { - id: textLayout - anchors.fill: parent - - /*Text { text: model.id }*/ - Text { - id: pathText - Layout.fillWidth: true - text: model.description - color: model.id == root.cfg_dictionary ? syspal.highlightedText : syspal.text - } + /*Text { text: model.id }*/ + Text { + id: pathText + Layout.fillWidth: true + text: model.description + color: model.id == root.cfg_dictionary ? syspal.highlightedText : syspal.text } + MouseArea { anchors.fill: parent onClicked: root.cfg_dictionary = model.id diff --git a/wallpapers/potd/contents/ui/config.qml b/wallpapers/potd/contents/ui/config.qml --- a/wallpapers/potd/contents/ui/config.qml +++ b/wallpapers/potd/contents/ui/config.qml @@ -67,7 +67,7 @@ width: formAlignment - units.largeSpacing horizontalAlignment: Text.AlignRight anchors.verticalCenter: providerComboBox.verticalCenter - text: i18ndc("plasma_wallpaper_org.kde.potd", "@label:listbox", "Providers:") + text: i18ndc("plasma_wallpaper_org.kde.potd", "@label:listbox", "Provider:") } // TODO: port to QQC2 version once we've fixed https://bugs.kde.org/show_bug.cgi?id=403153 QtControls1.ComboBox {