mirror of
https://github.com/ProtonMail/proton-bridge.git
synced 2025-12-17 15:46:44 +00:00
feat(GODT-2772): QML import cleanup.
This commit is contained in:
@ -14,8 +14,6 @@ import QtQml
|
|||||||
import QtQuick
|
import QtQuick
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import QtQuick.Controls
|
import QtQuick.Controls
|
||||||
import QtQuick.Controls.impl
|
|
||||||
import Proton
|
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
id: root
|
id: root
|
||||||
|
|||||||
@ -14,8 +14,6 @@ import QtQml
|
|||||||
import QtQuick
|
import QtQuick
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import QtQuick.Controls
|
import QtQuick.Controls
|
||||||
import QtQuick.Controls.impl
|
|
||||||
import Proton
|
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
id: root
|
id: root
|
||||||
|
|||||||
@ -14,8 +14,6 @@ import QtQml
|
|||||||
import QtQuick
|
import QtQuick
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import QtQuick.Controls
|
import QtQuick.Controls
|
||||||
import QtQuick.Controls.impl
|
|
||||||
import Proton
|
|
||||||
import ".."
|
import ".."
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
|
|||||||
@ -14,8 +14,6 @@ import QtQml
|
|||||||
import QtQuick
|
import QtQuick
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import QtQuick.Controls
|
import QtQuick.Controls
|
||||||
import QtQuick.Controls.impl
|
|
||||||
import Proton
|
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
id: root
|
id: root
|
||||||
|
|||||||
@ -14,8 +14,6 @@ import QtQml
|
|||||||
import QtQuick
|
import QtQuick
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import QtQuick.Controls
|
import QtQuick.Controls
|
||||||
import QtQuick.Controls.impl
|
|
||||||
import Proton
|
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
id: root
|
id: root
|
||||||
@ -33,7 +31,7 @@ Rectangle {
|
|||||||
return colorScheme.interaction_default_active;
|
return colorScheme.interaction_default_active;
|
||||||
}
|
}
|
||||||
if (mouseArea.containsMouse) {
|
if (mouseArea.containsMouse) {
|
||||||
return colorScheme.interaction_default_hover
|
return colorScheme.interaction_default_hover;
|
||||||
}
|
}
|
||||||
return colorScheme.background_norm;
|
return colorScheme.background_norm;
|
||||||
}
|
}
|
||||||
|
|||||||
@ -14,8 +14,6 @@ import QtQml
|
|||||||
import QtQuick
|
import QtQuick
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import QtQuick.Controls
|
import QtQuick.Controls
|
||||||
import QtQuick.Controls.impl
|
|
||||||
import Proton
|
|
||||||
|
|
||||||
Button {
|
Button {
|
||||||
id: root
|
id: root
|
||||||
@ -28,10 +26,10 @@ Button {
|
|||||||
anchors.rightMargin: 32
|
anchors.rightMargin: 32
|
||||||
colorScheme: wizard.colorScheme
|
colorScheme: wizard.colorScheme
|
||||||
horizontalPadding: 0
|
horizontalPadding: 0
|
||||||
icon.source: "/qml/icons/ic-question-circle.svg"
|
|
||||||
icon.height: 24
|
|
||||||
icon.width: 24
|
|
||||||
icon.color: wizard.colorScheme.text_weak
|
icon.color: wizard.colorScheme.text_weak
|
||||||
|
icon.height: 24
|
||||||
|
icon.source: "/qml/icons/ic-question-circle.svg"
|
||||||
|
icon.width: 24
|
||||||
verticalPadding: 0
|
verticalPadding: 0
|
||||||
|
|
||||||
onClicked: {
|
onClicked: {
|
||||||
|
|||||||
@ -14,9 +14,6 @@ import QtQml
|
|||||||
import QtQuick
|
import QtQuick
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import QtQuick.Controls
|
import QtQuick.Controls
|
||||||
import QtQuick.Controls.impl
|
|
||||||
import "." as Proton
|
|
||||||
import ".."
|
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
id: root
|
id: root
|
||||||
|
|||||||
@ -14,8 +14,6 @@ import QtQml
|
|||||||
import QtQuick
|
import QtQuick
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import QtQuick.Controls
|
import QtQuick.Controls
|
||||||
import QtQuick.Controls.impl
|
|
||||||
import Proton
|
|
||||||
|
|
||||||
FocusScope {
|
FocusScope {
|
||||||
id: root
|
id: root
|
||||||
@ -41,6 +39,11 @@ FocusScope {
|
|||||||
loginLayout.reset(clearUsername);
|
loginLayout.reset(clearUsername);
|
||||||
totpLayout.reset();
|
totpLayout.reset();
|
||||||
mailboxPasswordLayout.reset();
|
mailboxPasswordLayout.reset();
|
||||||
|
if (username.length === 0) {
|
||||||
|
usernameTextField.forceActiveFocus();
|
||||||
|
} else {
|
||||||
|
passwordTextField.forceActiveFocus();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
StackLayout {
|
StackLayout {
|
||||||
|
|||||||
@ -14,11 +14,10 @@ import QtQml
|
|||||||
import QtQuick
|
import QtQuick
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import QtQuick.Controls
|
import QtQuick.Controls
|
||||||
import QtQuick.Controls.impl
|
|
||||||
import "." as Proton
|
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
id: root
|
id: root
|
||||||
|
|
||||||
property var wizard
|
property var wizard
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
|
|||||||
@ -14,9 +14,6 @@ import QtQml
|
|||||||
import QtQuick
|
import QtQuick
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import QtQuick.Controls
|
import QtQuick.Controls
|
||||||
import QtQuick.Controls.impl
|
|
||||||
import "." as Proton
|
|
||||||
import ".."
|
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
id: root
|
id: root
|
||||||
@ -102,8 +99,8 @@ Item {
|
|||||||
root.address = "";
|
root.address = "";
|
||||||
leftContent.showLogin();
|
leftContent.showLogin();
|
||||||
rightContent.currentIndex = SetupWizard.ContentStack.Login;
|
rightContent.currentIndex = SetupWizard.ContentStack.Login;
|
||||||
login.reset(true);
|
|
||||||
login.username = username;
|
login.username = username;
|
||||||
|
login.reset(false);
|
||||||
}
|
}
|
||||||
function showOnboarding() {
|
function showOnboarding() {
|
||||||
rootStackLayout.currentIndex = SetupWizard.RootStack.TwoPanesView;
|
rootStackLayout.currentIndex = SetupWizard.RootStack.TwoPanesView;
|
||||||
@ -152,6 +149,7 @@ Item {
|
|||||||
clip: true
|
clip: true
|
||||||
width: 364
|
width: 364
|
||||||
wizard: root
|
wizard: root
|
||||||
|
|
||||||
Connections {
|
Connections {
|
||||||
function onAppleMailAutoconfigCertificateInstallPageShown() {
|
function onAppleMailAutoconfigCertificateInstallPageShown() {
|
||||||
leftContent.showAppleMailAutoconfigCertificateInstall();
|
leftContent.showAppleMailAutoconfigCertificateInstall();
|
||||||
|
|||||||
@ -14,8 +14,6 @@ import QtQml
|
|||||||
import QtQuick
|
import QtQuick
|
||||||
import QtQuick.Layouts
|
import QtQuick.Layouts
|
||||||
import QtQuick.Controls
|
import QtQuick.Controls
|
||||||
import QtQuick.Controls.impl
|
|
||||||
import "." as Proton
|
|
||||||
|
|
||||||
Item {
|
Item {
|
||||||
id: root
|
id: root
|
||||||
@ -57,9 +55,9 @@ Item {
|
|||||||
Layout.alignment: Qt.AlignLeft | Qt.AlignTop
|
Layout.alignment: Qt.AlignLeft | Qt.AlignTop
|
||||||
Layout.fillHeight: true
|
Layout.fillHeight: true
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
color: root.colorScheme.text_weak
|
||||||
colorScheme: root.colorScheme
|
colorScheme: root.colorScheme
|
||||||
text: root.description
|
text: root.description
|
||||||
color: root.colorScheme.text_weak
|
|
||||||
type: Label.LabelType.Body
|
type: Label.LabelType.Body
|
||||||
verticalAlignment: Text.AlignTop
|
verticalAlignment: Text.AlignTop
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user