git.iko.soy/unity8
on xenial help sign in
drop now unused stuff
063b76cLukáš Tinkl
plugins/Utils/timezoneFormatter.cpp+1−1
compare with xenial
unifiedsplit
@@ -39,7 +39,7 @@ QString TimezoneFormatter::currentTimeInTimezoneWithAbbrev(const QVariant &tzId)
39 QTimeZone tz(tzId.toByteArray());
39 QTimeZone tz(tzId.toByteArray());
40 if (tz.isValid()) {
40 if (tz.isValid()) {
41 const QDateTime now = QDateTime::currentDateTime().toTimeZone(tz);
41 const QDateTime now = QDateTime::currentDateTime().toTimeZone(tz);
42− return QStringLiteral("%1 %2").arg(now.time().toString("h:mm")).arg(tz.abbreviation(now));
42+ return QStringLiteral("%1 %2").arg(now.time().toString(QStringLiteral("h:mm"))).arg(tz.abbreviation(now));
43 }
43 }
44 return QString();
44 return QString();
45}
45}
qml/Wizard/Pages/uaccount-signin.qmldeleted−91
@@ -1,91 +0,0 @@
1−/*
2− * Copyright (C) 2015 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−import QtQuick 2.4
18−import Ubuntu.Components 1.3
19−import ".." as LocalComponents
20−
21−LocalComponents.Page {
22− objectName: "ubuntuAccountSignInPage"
23−
24− title: i18n.tr("Sign In")
25− customTitle: true
26− backButtonText: i18n.tr("Cancel")
27− forwardButtonSourceComponent: forwardButton
28−
29− Component.onCompleted: {
30− emailInput.forceActiveFocus()
31− }
32−
33− Item {
34− id: column
35− anchors.fill: content
36−
37− Label {
38− id: emailLabel
39− anchors.left: parent.left
40− anchors.right: parent.right
41− wrapMode: Text.Wrap
42− text: i18n.tr("Email:")
43− color: textColor
44− font.weight: Font.Light
45− }
46−
47− LocalComponents.WizardTextField {
48− id: emailInput
49− anchors.left: parent.left
50− anchors.right: parent.right
51− anchors.top: emailLabel.bottom
52− anchors.topMargin: units.gu(1)
53− inputMethodHints: Qt.ImhEmailCharactersOnly
54− validator: RegExpValidator {
55− regExp: /^(([^<>()[\]\.,;:\s@\"]+(\.[^<>()[\]\.,;:\s@\"]+)*)|(\".+\"))@(([^<>()[\]\.,;:\s@\"]+\.)+[^<>()[\]\.,;:\s@\"]{2,})$/i
56− }
57− KeyNavigation.tab: passInput
58− }
59−
60− Label {
61− id: passLabel
62− anchors.left: parent.left
63− anchors.right: parent.right
64− anchors.top: emailInput.bottom
65− anchors.topMargin: units.gu(3)
66− wrapMode: Text.Wrap
67− text: i18n.tr("Password:")
68− color: textColor
69− font.weight: Font.Light
70− }
71−
72− LocalComponents.WizardTextField {
73− id: passInput
74− anchors.left: parent.left
75− anchors.right: parent.right
76− anchors.top: passLabel.bottom
77− anchors.topMargin: units.gu(1)
78− echoMode: TextInput.Password
79− KeyNavigation.tab: emailInput
80− }
81− }
82−
83− Component {
84− id: forwardButton
85− LocalComponents.StackButton {
86− enabled: emailInput.acceptableInput && passInput.text !== ""
87− text: i18n.tr("Sign In")
88− onClicked: pageStack.next() // TODO sign in against U1
89− }
90− }
91−}
qml/Wizard/Pages/uaccount.qmldeleted−120
@@ -1,120 +0,0 @@
1−/*
2− * Copyright (C) 2015 Canonical, Ltd.
3− *
4− * This program is free software; you can redistribute it and/or modify
5− * it under the terms of the GNU General Public License as published by
6− * the Free Software Foundation; version 3.
7− *
8− * This program is distributed in the hope that it will be useful,
9− * but WITHOUT ANY WARRANTY; without even the implied warranty of
10− * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11− * GNU General Public License for more details.
12− *
13− * You should have received a copy of the GNU General Public License
14− * along with this program. If not, see <http://www.gnu.org/licenses/>.
15− */
16−
17−import QtQuick 2.4
18−import Ubuntu.Components 1.3
19−import ".." as LocalComponents
20−
21−LocalComponents.Page {
22− objectName: "ubuntuAccountPage"
23−
24− title: i18n.tr("Ubuntu Account")
25− forwardButtonSourceComponent: forwardButton
26−
27− Item {
28− id: column
29− anchors.fill: content
30− anchors.topMargin: units.gu(4)
31−
32− Label {
33− id: infoLabel
34− anchors.left: parent.left
35− anchors.right: parent.right
36− wrapMode: Text.Wrap
37− text: i18n.tr("Secure my device using my Ubuntu account")
38− color: textColor
39− font.weight: Font.Light
40− fontSize: "small"
41− }
42−
43− Button {
44− id: signinButton
45− anchors {
46− top: infoLabel.bottom
47− left: parent.left
48− right: parent.horizontalCenter
49− rightMargin: units.gu(1)
50− topMargin: units.gu(4)
51− }
52− text: i18n.tr("Sign In")
53− onClicked: {
54− pageStack.load(Qt.resolvedUrl("uaccount-signin.qml"))
55− }
56− }
57−
58− Button {
59− id: signupButton
60− anchors {
61− top: infoLabel.bottom
62− left: parent.horizontalCenter
63− right: parent.right
64− leftMargin: units.gu(1)
65− topMargin: units.gu(4)
66− }
67− text: i18n.tr("Create Account")
68− onClicked: {
69− pageStack.load(Qt.resolvedUrl("uaccount-signup.qml"))
70− }
71− }
72−
73− LocalComponents.CheckableSetting {
74− anchors {
75− left: parent.left
76− right: parent.right
77− bottom: privacyLabel.top
78− bottomMargin: units.gu(2)
79− }
80−
81− id: reportCheck
82− objectName: "reportCheck"
83− showDivider: false
84− text: i18n.tr("Improve system performance by sending us crashes and error reports.")
85− checked: true
86− }
87−
88− Label {
89− id: privacyLabel
90− anchors {
91− left: parent.left
92− right: parent.right
93− bottom: parent.bottom
94− leftMargin: reportCheck.labelOffset
95− bottomMargin: units.gu(4)
96− }
97− wrapMode: Text.Wrap
98− text: i18n.tr("Privacy policy")
99− color: UbuntuColors.orange
100− font.weight: Font.Light
101− fontSize: "small"
102− MouseArea {
103− anchors.fill: parent
104− cursorShape: Qt.PointingHandCursor
105− onClicked: {
106− // TODO
107− print("Display privacy policy")
108− }
109− }
110− }
111− }
112−
113− Component {
114− id: forwardButton
115− LocalComponents.StackButton {
116− text: i18n.tr("Skip")
117− onClicked: pageStack.next()
118− }
119− }
120−}