Commit 57df86fc authored by Volker Krause's avatar Volker Krause Committed by David Edmundson
Browse files

Port theme explorer away from QQC1

At least the direct uses that is, there's still PC2 use in there. But one
thing at a time.
parent 6d5f7571
Pipeline #231124 passed with stage
in 59 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 QtQuick.Dialogs 1.2
import org.kde.plasma.core 2.0 as PlasmaCore
......
......@@ -7,7 +7,7 @@
import QtQuick 2.3
import QtGraphicalEffects 1.0
import QtQuick.Layouts 1.1
import QtQuick.Controls 1.2
import QtQuick.Controls 2.15
import QtQuick.Dialogs 1.2
import org.kde.plasma.core 2.0 as PlasmaCore
import "fakecontrols" as FakeControls
......@@ -182,8 +182,8 @@ Dialog {
Layout.fillHeight: true
Layout.minimumHeight: units.gridUnit * 15
Item {
width: scroll.viewport.width
height: childrenRect.height
width: parent.width
implicitHeight: childrenRect.height
GridLayout {
//Layout.alignment: Qt.AlignHCenter
anchors.centerIn: parent
......@@ -315,7 +315,7 @@ Dialog {
}
}
}
RowLayout {
DialogButtonBox {
anchors {
right: parent.right
rightMargin: units.smallSpacing
......@@ -323,11 +323,12 @@ Dialog {
Button {
text: i18n("OK")
onClicked: dialog.accept()
isDefault: true
DialogButtonBox.buttonRole: DialogButtonBox.AcceptRole
}
Button {
text: i18n("Cancel")
onClicked: dialog.reject()
DialogButtonBox.buttonRole: DialogButtonBox.DestructiveRole
}
}
}
......
......@@ -6,7 +6,7 @@
import QtQuick 2.3
import QtQuick.Layouts 1.1
import QtQuick.Controls 1.2
import QtQuick.Controls 2.15
Label {
......
......@@ -6,7 +6,7 @@
import QtQuick 2.3
import QtQuick.Layouts 1.1
import QtQuick.Controls 1.2
import QtQuick.Controls 2.15
import QtQuick.Dialogs 1.2
import org.kde.plasma.core 2.0 as PlasmaCore
......@@ -130,15 +130,16 @@ Dialog {
Item {
Layout.fillHeight: true
}
RowLayout {
DialogButtonBox {
Layout.alignment: Qt.AlignRight
Button {
DialogButtonBox.buttonRole: DialogButtonBox.AcceptRole
text: i18n("OK")
onClicked: dialog.accept()
isDefault: true
enabled: canEdit && nameField.text && authorField.text && emailField.text && websiteField.text
}
Button {
DialogButtonBox.buttonRole: DialogButtonBox.DestructiveRole
text: i18n("Cancel")
onClicked: dialog.reject()
}
......
......@@ -6,7 +6,6 @@
import QtQuick 2.0
import QtQuick.Layouts 1.1
import QtQuick.Controls 1.3
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
......
......@@ -6,7 +6,6 @@
import QtQuick 2.0
import QtQuick.Layouts 1.1
import QtQuick.Controls 1.3
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
......
......@@ -6,7 +6,6 @@
import QtQuick 2.0
import QtQuick.Layouts 1.1
import QtQuick.Controls 1.3
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
......
......@@ -6,7 +6,6 @@
import QtQuick 2.0
import QtQuick.Layouts 1.1
import QtQuick.Controls 1.3
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
......
......@@ -6,7 +6,6 @@
import QtQuick 2.0
import QtQuick.Layouts 1.1
import QtQuick.Controls 1.3
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
......
......@@ -6,7 +6,6 @@
import QtQuick 2.0
import QtQuick.Layouts 1.1
import QtQuick.Controls 1.3
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
......
......@@ -6,7 +6,6 @@
import QtQuick 2.0
import QtQuick.Layouts 1.1
import QtQuick.Controls 1.3
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
......
......@@ -6,7 +6,6 @@
import QtQuick 2.0
import QtQuick.Layouts 1.1
import QtQuick.Controls 1.3
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
......
......@@ -6,7 +6,6 @@
import QtQuick 2.0
import QtQuick.Layouts 1.1
import QtQuick.Controls 1.3
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
......
......@@ -6,7 +6,6 @@
import QtQuick 2.0
import QtQuick.Layouts 1.1
import QtQuick.Controls 1.3
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
......
......@@ -6,7 +6,6 @@
import QtQuick 2.0
import QtQuick.Layouts 1.1
import QtQuick.Controls 1.3
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
......
......@@ -6,7 +6,6 @@
import QtQuick 2.0
import QtQuick.Layouts 1.1
import QtQuick.Controls 1.3
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
......
......@@ -6,7 +6,6 @@
import QtQuick 2.0
import QtQuick.Layouts 1.1
import QtQuick.Controls 1.3
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
......
......@@ -6,7 +6,6 @@
import QtQuick 2.0
import QtQuick.Layouts 1.1
import QtQuick.Controls 1.3
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
......
......@@ -6,7 +6,6 @@
import QtQuick 2.0
import QtQuick.Layouts 1.1
import QtQuick.Controls 1.3
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
......
......@@ -6,7 +6,6 @@
import QtQuick 2.0
import QtQuick.Layouts 1.1
import QtQuick.Controls 1.3
import org.kde.plasma.core 2.0 as PlasmaCore
import org.kde.plasma.components 2.0 as PlasmaComponents
......
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