From 72dd8e1c6222dac9176dd67c974a9c34aee01c41 Mon Sep 17 00:00:00 2001 From: Michael Bohlender Date: Thu, 8 Dec 2016 11:19:31 +0100 Subject: qqc1 -> qqc2 in accountwizard/createmaildir --- components/accounts/AccountWizard.qml | 7 +++---- components/accounts/CreateMaildir.qml | 18 +++++++++--------- 2 files changed, 12 insertions(+), 13 deletions(-) (limited to 'components/accounts') diff --git a/components/accounts/AccountWizard.qml b/components/accounts/AccountWizard.qml index 16928eb9..d1fa9299 100644 --- a/components/accounts/AccountWizard.qml +++ b/components/accounts/AccountWizard.qml @@ -18,7 +18,6 @@ import QtQuick 2.7 import QtQuick.Layouts 1.1 -import QtQuick.Controls 1.4 as Controls import QtQuick.Controls 2.0 as Controls2 import org.kde.kirigami 1.0 as Kirigami @@ -52,7 +51,7 @@ Controls2.Popup { spacing: Kirigami.Units.largeSpacing - Controls.Button { + Controls2.Button { Layout.fillWidth: true @@ -63,7 +62,7 @@ Controls2.Popup { } } - Controls.Button { + Controls2.Button { Layout.fillWidth: true @@ -74,7 +73,7 @@ Controls2.Popup { } } - Controls.Button { + Controls2.Button { Layout.fillWidth: true diff --git a/components/accounts/CreateMaildir.qml b/components/accounts/CreateMaildir.qml index 01f1a83d..e5d10fd4 100644 --- a/components/accounts/CreateMaildir.qml +++ b/components/accounts/CreateMaildir.qml @@ -61,7 +61,7 @@ Item { color: Kirigami.Theme.highlightColor } - Kirigami.Label { + Controls2.Label { id: subHeadline anchors { @@ -91,7 +91,7 @@ Item { columnSpacing: Kirigami.Units.largeSpacing rowSpacing: Kirigami.Units.largeSpacing - Kirigami.Label { + Controls2.Label { text: "Title of account" Layout.alignment: Qt.AlignRight } @@ -106,7 +106,7 @@ Item { } } - Kirigami.Label { + Controls2.Label { text: "Path" Layout.alignment: Qt.AlignRight } @@ -148,7 +148,7 @@ Item { } /* - Kirigami.Label { + Controls2.Label { text: "" } Controls.CheckBox { @@ -157,21 +157,21 @@ Item { } */ - Kirigami.Label { + Controls2.Label { text: "" Layout.fillHeight: true } - Kirigami.Label { + Controls2.Label { text: "" } - Kirigami.Label { + Controls2.Label { text: "" } Item { Layout.fillWidth: true - Controls.Button { + Controls2.Button { text: "Discard" onClicked: { @@ -179,7 +179,7 @@ Item { } } - Controls.Button { + Controls2.Button { id: saveButton anchors.right: parent.right -- cgit v1.2.3