From 5459720523e965719286c95cd0e10845e2b7f980 Mon Sep 17 00:00:00 2001
From: Xavier Michelon <xavier.michelon@proton.ch>
Date: Wed, 18 Jan 2023 11:04:13 +0100
Subject: [PATCH] Others: chores fix a QML warning when no account is present,
 and a few typos in QML.

---
 internal/frontend/bridge-gui/bridge-gui/qml/AccountDelegate.qml | 2 +-
 .../bridge-gui/bridge-gui/qml/BridgeTest/UserControl.qml        | 2 +-
 internal/frontend/bridge-gui/bridge-gui/qml/Bridge_test.qml     | 2 +-
 internal/frontend/bridge-gui/bridge-gui/qml/HelpView.qml        | 2 +-
 internal/frontend/bridge-gui/bridge-gui/qml/Proton/Style.qml    | 2 +-
 internal/frontend/bridge-gui/bridge-gui/qml/tests/TextAreas.qml | 2 +-
 .../frontend/bridge-gui/bridge-gui/qml/tests/TextFields.qml     | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/AccountDelegate.qml b/internal/frontend/bridge-gui/bridge-gui/qml/AccountDelegate.qml
index 081f06f8..9a5648e4 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/AccountDelegate.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/AccountDelegate.qml
@@ -180,7 +180,7 @@ Item {
                         property string dots: ""
                         interval: 250;
                         repeat: true;
-                        running: root.user && (root.user.state === EUserState.Locked)
+                        running: (root.user != null) && (root.user.state === EUserState.Locked)
                         onTriggered: {
                             dots = dots + "."
                             if (dots.length > 3)
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/BridgeTest/UserControl.qml b/internal/frontend/bridge-gui/bridge-gui/qml/BridgeTest/UserControl.qml
index 62655f54..349087ae 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/BridgeTest/UserControl.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/BridgeTest/UserControl.qml
@@ -299,7 +299,7 @@ ColumnLayout {
         Button { colorScheme: root.colorScheme; text: "Toggle Finished"; onClicked: {user.toggleSplitModeFinished()}}
     }
 
-    TextArea { // TODO: this is causing binding loop on imlicitWidth
+    TextArea { // TODO: this is causing binding loop on implicitWidth
         colorScheme: root.colorScheme
         text: user && user.addresses ? user.addresses.join("\n") : "user@protonmail.com"
         Layout.fillWidth: true
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/Bridge_test.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Bridge_test.qml
index 5ebe58da..8ca4e750 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/Bridge_test.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/Bridge_test.qml
@@ -178,7 +178,7 @@ Window {
             signal toggleSplitModeFinished()
 
             function configureAppleMail(address){
-                userSignal("confugure apple mail "+address)
+                userSignal("configure apple mail "+address)
             }
 
             function logout(){
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/HelpView.qml b/internal/frontend/bridge-gui/bridge-gui/qml/HelpView.qml
index 21b48555..432c48af 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/HelpView.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/HelpView.qml
@@ -93,7 +93,7 @@ SettingsView {
         Layout.fillWidth: true
     }
 
-    // fill height so the footer label will be allways attached to the bottom
+    // fill height so the footer label will be always attached to the bottom
     Item {
         Layout.fillHeight: true
         Layout.fillWidth: true
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/Proton/Style.qml b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/Style.qml
index 6a4e7972..fe759194 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/Proton/Style.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/Proton/Style.qml
@@ -341,7 +341,7 @@ QtObject {
             case "windows":
             return "Segoe UI"
             case "osx":
-            return ".AppleSystemUIFont" // should be SF Pro for the foreseeable future. Using "SF Pro Display" direcly here is not allowed by the font's license.
+            return ".AppleSystemUIFont" // should be SF Pro for the foreseeable future. Using "SF Pro Display" directly here is not allowed by the font's license.
             case "linux":
             return "Ubuntu"
             default:
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/tests/TextAreas.qml b/internal/frontend/bridge-gui/bridge-gui/qml/tests/TextAreas.qml
index 22655df7..e6146d9a 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/tests/TextAreas.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/tests/TextAreas.qml
@@ -97,7 +97,7 @@ ColumnLayout {
         placeholderText: "Type 42 here"
         label: "42 Validator"
         hint: "Accepts only \"42\""
-        assistiveText: "Type sometihng here, preferably 42"
+        assistiveText: "Type something here, preferably 42"
 
         wrapMode: TextInput.Wrap
 
diff --git a/internal/frontend/bridge-gui/bridge-gui/qml/tests/TextFields.qml b/internal/frontend/bridge-gui/bridge-gui/qml/tests/TextFields.qml
index b7fcad1b..d3618660 100644
--- a/internal/frontend/bridge-gui/bridge-gui/qml/tests/TextFields.qml
+++ b/internal/frontend/bridge-gui/bridge-gui/qml/tests/TextFields.qml
@@ -149,7 +149,7 @@ RowLayout {
             placeholderText: "Type 42 here"
             label: "42 Validator"
             hint: "Accepts only \"42\""
-            assistiveText: "Type sometihng here, preferably 42"
+            assistiveText: "Type something here, preferably 42"
 
             validator: function(str) {
                 if (str === "42") {