feat(GODT-2772): QML import cleanup.

This commit is contained in:
Xavier Michelon
2023-08-23 13:10:51 +02:00
parent 69f3029430
commit 75ed3ca660
11 changed files with 13 additions and 30 deletions

View File

@ -14,8 +14,6 @@ import QtQml
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
import QtQuick.Controls.impl
import Proton
Item {
id: root

View File

@ -14,8 +14,6 @@ import QtQml
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
import QtQuick.Controls.impl
import Proton
Rectangle {
id: root

View File

@ -14,8 +14,6 @@ import QtQml
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
import QtQuick.Controls.impl
import Proton
import ".."
Rectangle {

View File

@ -14,8 +14,6 @@ import QtQml
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
import QtQuick.Controls.impl
import Proton
Item {
id: root

View File

@ -14,8 +14,6 @@ import QtQml
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
import QtQuick.Controls.impl
import Proton
Rectangle {
id: root
@ -33,7 +31,7 @@ Rectangle {
return colorScheme.interaction_default_active;
}
if (mouseArea.containsMouse) {
return colorScheme.interaction_default_hover
return colorScheme.interaction_default_hover;
}
return colorScheme.background_norm;
}

View File

@ -14,8 +14,6 @@ import QtQml
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
import QtQuick.Controls.impl
import Proton
Button {
id: root
@ -28,10 +26,10 @@ Button {
anchors.rightMargin: 32
colorScheme: wizard.colorScheme
horizontalPadding: 0
icon.source: "/qml/icons/ic-question-circle.svg"
icon.height: 24
icon.width: 24
icon.color: wizard.colorScheme.text_weak
icon.height: 24
icon.source: "/qml/icons/ic-question-circle.svg"
icon.width: 24
verticalPadding: 0
onClicked: {

View File

@ -14,9 +14,6 @@ import QtQml
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
import QtQuick.Controls.impl
import "." as Proton
import ".."
Item {
id: root

View File

@ -14,8 +14,6 @@ import QtQml
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
import QtQuick.Controls.impl
import Proton
FocusScope {
id: root
@ -41,6 +39,11 @@ FocusScope {
loginLayout.reset(clearUsername);
totpLayout.reset();
mailboxPasswordLayout.reset();
if (username.length === 0) {
usernameTextField.forceActiveFocus();
} else {
passwordTextField.forceActiveFocus();
}
}
StackLayout {

View File

@ -14,11 +14,10 @@ import QtQml
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
import QtQuick.Controls.impl
import "." as Proton
Item {
id: root
property var wizard
ColumnLayout {

View File

@ -14,9 +14,6 @@ import QtQml
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
import QtQuick.Controls.impl
import "." as Proton
import ".."
Item {
id: root
@ -102,8 +99,8 @@ Item {
root.address = "";
leftContent.showLogin();
rightContent.currentIndex = SetupWizard.ContentStack.Login;
login.reset(true);
login.username = username;
login.reset(false);
}
function showOnboarding() {
rootStackLayout.currentIndex = SetupWizard.RootStack.TwoPanesView;
@ -152,6 +149,7 @@ Item {
clip: true
width: 364
wizard: root
Connections {
function onAppleMailAutoconfigCertificateInstallPageShown() {
leftContent.showAppleMailAutoconfigCertificateInstall();

View File

@ -14,8 +14,6 @@ import QtQml
import QtQuick
import QtQuick.Layouts
import QtQuick.Controls
import QtQuick.Controls.impl
import "." as Proton
Item {
id: root
@ -57,9 +55,9 @@ Item {
Layout.alignment: Qt.AlignLeft | Qt.AlignTop
Layout.fillHeight: true
Layout.fillWidth: true
color: root.colorScheme.text_weak
colorScheme: root.colorScheme
text: root.description
color: root.colorScheme.text_weak
type: Label.LabelType.Body
verticalAlignment: Text.AlignTop
}