From 926da003aa8dd5382fe714d020b1ce55ae550e8e Mon Sep 17 00:00:00 2001 From: Michael Bohlender Date: Wed, 19 Apr 2017 14:25:43 +0200 Subject: use kube controls in account --- .../gmail/package/contents/ui/GmailSettings.qml | 24 ++++++++-------- .../package/contents/ui/ImapAccountSettings.qml | 32 ++++++++++------------ .../contents/ui/KolabnowAccountSettings.qml | 24 ++++++++-------- .../package/contents/ui/MaildirAccountSettings.qml | 13 ++++----- 4 files changed, 42 insertions(+), 51 deletions(-) diff --git a/accounts/gmail/package/contents/ui/GmailSettings.qml b/accounts/gmail/package/contents/ui/GmailSettings.qml index ea6ac9e3..39e1b307 100644 --- a/accounts/gmail/package/contents/ui/GmailSettings.qml +++ b/accounts/gmail/package/contents/ui/GmailSettings.qml @@ -20,9 +20,7 @@ import QtQuick 2.4 import QtQuick.Controls 1.4 as Controls import QtQuick.Layouts 1.1 - -import org.kde.kirigami 1.0 as Kirigami - +import org.kube.framework 1.0 as Kube import org.kube.accounts.gmail 1.0 as GmailAccount Item { @@ -55,14 +53,14 @@ Item { fill: parent } columns: 2 - columnSpacing: Kirigami.Units.largeSpacing - rowSpacing: Kirigami.Units.largeSpacing + columnSpacing: Kube.Units.largeSpacing + rowSpacing: Kube.Units.largeSpacing - Controls.Label { + Kube.Label { text: "Title of Account" Layout.alignment: Qt.AlignRight } - Controls.TextField { + Kube.TextField { Layout.fillWidth: true placeholderText: "E.g. \"Work\", \"Home\" that will be displayed in Kube as name" text: gmailSettings.accountName @@ -71,11 +69,11 @@ Item { } } - Controls.Label { + Kube.Label { text: "Name" Layout.alignment: Qt.AlignRight } - Controls.TextField { + Kube.TextField { Layout.fillWidth: true placeholderText: "Your name" text: gmailSettings.userName @@ -84,11 +82,11 @@ Item { } } - Controls.Label { + Kube.Label { text: "Email address" Layout.alignment: Qt.AlignRight } - Controls.TextField { + Kube.TextField { Layout.fillWidth: true text: gmailSettings.emailAddress @@ -98,14 +96,14 @@ Item { placeholderText: "Your email address" } - Controls.Label { + Kube.Label { text: "Password" Layout.alignment: Qt.AlignRight } RowLayout { Layout.fillWidth: true - Controls.TextField { + Kube.TextField { id: pwField Layout.fillWidth: true diff --git a/accounts/imap/package/contents/ui/ImapAccountSettings.qml b/accounts/imap/package/contents/ui/ImapAccountSettings.qml index b448ac3c..a69e5af6 100644 --- a/accounts/imap/package/contents/ui/ImapAccountSettings.qml +++ b/accounts/imap/package/contents/ui/ImapAccountSettings.qml @@ -20,9 +20,7 @@ import QtQuick 2.4 import QtQuick.Controls 1.4 as Controls import QtQuick.Layouts 1.1 - -import org.kde.kirigami 1.0 as Kirigami - +import org.kube.framework 1.0 as Kube import org.kube.accounts.imap 1.0 as ImapAccount Item { @@ -55,14 +53,14 @@ Item { fill: parent } columns: 2 - columnSpacing: Kirigami.Units.largeSpacing - rowSpacing: Kirigami.Units.largeSpacing + columnSpacing: Kube.Units.largeSpacing + rowSpacing: Kube.Units.largeSpacing - Controls.Label { + Kube.Label { text: "Title of Account" Layout.alignment: Qt.AlignRight } - Controls.TextField { + Kube.TextField { Layout.fillWidth: true placeholderText: "E.g. \"Work\", \"Home\" that will be displayed in Kube as name" text: imapSettings.accountName @@ -71,11 +69,11 @@ Item { } } - Controls.Label { + Kube.Label { text: "Name" Layout.alignment: Qt.AlignRight } - Controls.TextField { + Kube.TextField { Layout.fillWidth: true placeholderText: "Your name" text: imapSettings.userName @@ -84,11 +82,11 @@ Item { } } - Controls.Label { + Kube.Label { text: "Email address" Layout.alignment: Qt.AlignRight } - Controls.TextField { + Kube.TextField { Layout.fillWidth: true text: imapSettings.emailAddress @@ -98,14 +96,14 @@ Item { placeholderText: "Your email address" } - Controls.Label { + Kube.Label { text: "Password" Layout.alignment: Qt.AlignRight } RowLayout { Layout.fillWidth: true - Controls.TextField { + Kube.TextField { id: pwField Layout.fillWidth: true @@ -131,11 +129,11 @@ Item { } } - Controls.Label { + Kube.Label { text: "IMAP server address" Layout.alignment: Qt.AlignRight } - Controls.TextField { + Kube.TextField { id: imapServer Layout.fillWidth: true @@ -155,11 +153,11 @@ Item { } } - Controls.Label { + Kube.Label { text: "Smtp address" Layout.alignment: Qt.AlignRight } - Controls.TextField { + Kube.TextField { id: smtpServer Layout.fillWidth: true diff --git a/accounts/kolabnow/package/contents/ui/KolabnowAccountSettings.qml b/accounts/kolabnow/package/contents/ui/KolabnowAccountSettings.qml index 2cb4086f..f07fdb31 100644 --- a/accounts/kolabnow/package/contents/ui/KolabnowAccountSettings.qml +++ b/accounts/kolabnow/package/contents/ui/KolabnowAccountSettings.qml @@ -20,9 +20,7 @@ import QtQuick 2.4 import QtQuick.Controls 1.4 as Controls import QtQuick.Layouts 1.1 - -import org.kde.kirigami 1.0 as Kirigami - +import org.kube.framework 1.0 as Kube import org.kube.accounts.kolabnow 1.0 as KolabnowAccount Item { @@ -55,14 +53,14 @@ Item { fill: parent } columns: 2 - columnSpacing: Kirigami.Units.largeSpacing - rowSpacing: Kirigami.Units.largeSpacing + columnSpacing: Kube.Units.largeSpacing + rowSpacing: Kube.Units.largeSpacing - Controls.Label { + Kube.Label { text: "Title of Account" Layout.alignment: Qt.AlignRight } - Controls.TextField { + Kube.TextField { Layout.fillWidth: true placeholderText: "E.g. \"Work\", \"Home\" that will be displayed in Kube as name" text: kolabnowSettings.accountName @@ -71,11 +69,11 @@ Item { } } - Controls.Label { + Kube.Label { text: "Name" Layout.alignment: Qt.AlignRight } - Controls.TextField { + Kube.TextField { Layout.fillWidth: true placeholderText: "Your name" text: kolabnowSettings.userName @@ -84,11 +82,11 @@ Item { } } - Controls.Label { + Kube.Label { text: "Email address" Layout.alignment: Qt.AlignRight } - Controls.TextField { + Kube.TextField { Layout.fillWidth: true text: kolabnowSettings.emailAddress @@ -98,14 +96,14 @@ Item { placeholderText: "Your email address" } - Controls.Label { + Kube.Label { text: "Password" Layout.alignment: Qt.AlignRight } RowLayout { Layout.fillWidth: true - Controls.TextField { + Kube.TextField { id: pwField Layout.fillWidth: true diff --git a/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml b/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml index f191c82c..78244b41 100644 --- a/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml +++ b/accounts/maildir/package/contents/ui/MaildirAccountSettings.qml @@ -19,12 +19,9 @@ import QtQuick 2.4 import QtQuick.Controls 1.4 as Controls -import QtQuick.Controls 2.0 as Controls2 import QtQuick.Layouts 1.1 import QtQuick.Dialogs 1.0 as Dialogs - -import org.kde.kirigami 1.0 as Kirigami - +import org.kube.framework 1.0 as Kube import org.kube.accounts.maildir 1.0 as MaildirAccount Item { @@ -59,11 +56,11 @@ Item { columnSpacing: Kube.Units.largeSpacing rowSpacing: Kube.Units.largeSpacing - Controls.Label { + Kube.Label { text: "Title of Account" Layout.alignment: Qt.AlignRight } - Controls.TextField { + Kube.TextField { Layout.fillWidth: true placeholderText: "E.g. \"Work\", \"Home\" that will be displayed in Kube as name" text: maildirSettings.accountName @@ -72,14 +69,14 @@ Item { } } - Controls2.Label { + Kube.Label { text: "Path" Layout.alignment: Qt.AlignRight } RowLayout { Layout.fillWidth: true - Controls.TextField { + Kube.TextField { id: path Layout.fillWidth: true enabled: false -- cgit v1.2.3