Commit 29f3ee38 authored by Volker Krause's avatar Volker Krause
Browse files

Port lookandfeelexplorer to QQC2

There is one QQC1 use remaining, the combobox in the global drawer, which
with QQC2 stacks its popup under the drawer apparently.
parent d5fae7b4
Pipeline #205008 passed with stage
in 1 minute and 2 seconds
......@@ -6,7 +6,7 @@
import QtQuick 2.3
import QtQuick.Layouts 1.1
import QtQuick.Controls 1.2
import QtQuick.Controls 2.15
import org.kde.kirigami 2.3 as Kirigami
TextField {
......
......@@ -6,8 +6,7 @@
import QtQuick 2.3
import QtQuick.Layouts 1.1
import QtQuick.Controls 2.4 as QQC2
import QtQuick.Controls 1.3
import QtQuick.Controls 2.15 as QQC2
import QtQuick.Dialogs 1.2
import org.kde.kirigami 2.3 as Kirigami
......@@ -42,9 +41,9 @@ QQC2.Dialog {
id: layout
anchors {
fill: parent
margins: units.smallSpacing
margins: Kirigami.Units.smallSpacing
}
Label {
QQC2.Label {
id: errorMessage
text: ""
wrapMode: Text.WordWrap
......@@ -92,7 +91,7 @@ QQC2.Dialog {
id: "websiteField"
Kirigami.FormData.label: i18n("Website:")
}
ComboBox {
QQC2.ComboBox {
id: licenseField
Layout.fillWidth: true
Kirigami.FormData.label: i18n("License:")
......
......@@ -6,7 +6,7 @@
import QtQuick 2.0
import QtQuick.Controls 1.3
import QtQuick.Controls 2.0 as QQC2
import QtQuick.Controls 2.15 as QQC2
import QtQuick.Layouts 1.1
import org.kde.draganddrop 2.0 as DragAndDrop
......@@ -93,7 +93,6 @@ Kirigami.AbstractApplicationWindow {
text: i18n("Plugin name:") + lnfLogic.theme
}
FormField {
id: formField
label: i18n("Name:")
key: "name"
}
......@@ -124,14 +123,12 @@ Kirigami.AbstractApplicationWindow {
QQC2.Button {
text: i18n("Layout from current Plasma setup")
onClicked: lnfLogic.performLayoutDump = true
Layout.columnSpan: 2
implicitWidth: formField.width
Layout.fillWidth: true
}
QQC2.Button {
text: i18n("Defaults from current setup")
onClicked: lnfLogic.performDefaultsDump = true
Layout.columnSpan: 2
implicitWidth: formField.width
Layout.fillWidth: true
}
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment