yesBad/proton-bridge
1
0
Fork 0
forked from Silverfish/proton-bridge
Code Actions Activity

Others: chores fix a QML warning when no account is present, and a few typos in QML.

Browse Source
This commit is contained in:
Xavier Michelon
2023-01-18 11:04:13 +01:00
parent a00e2acb5c
commit 5459720523
7 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
internal/frontend/bridge-gui/bridge-gui/qml/AccountDelegate.qml
View File

@ -180,7 +180,7 @@ Item {
property string dots: "" property string dots: ""
interval: 250; interval: 250;
repeat: true; repeat: true;
running: root.user && (root.user.state === EUserState.Locked) running: (root.user != null) && (root.user.state === EUserState.Locked)
onTriggered: { onTriggered: {
dots = dots + "." dots = dots + "."
if (dots.length > 3) if (dots.length > 3)

2
internal/frontend/bridge-gui/bridge-gui/qml/BridgeTest/UserControl.qml
View File

@ -299,7 +299,7 @@ ColumnLayout {
Button { colorScheme: root.colorScheme; text: "Toggle Finished"; onClicked: {user.toggleSplitModeFinished()}} 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 colorScheme: root.colorScheme
text: user && user.addresses ? user.addresses.join("\n") : "user@protonmail.com" text: user && user.addresses ? user.addresses.join("\n") : "user@protonmail.com"
Layout.fillWidth: true Layout.fillWidth: true

2
internal/frontend/bridge-gui/bridge-gui/qml/Bridge_test.qml
View File

@ -178,7 +178,7 @@ Window {
signal toggleSplitModeFinished() signal toggleSplitModeFinished()
function configureAppleMail(address){ function configureAppleMail(address){
userSignal("confugure apple mail "+address) userSignal("configure apple mail "+address)
} }
function logout(){ function logout(){

2
internal/frontend/bridge-gui/bridge-gui/qml/HelpView.qml
View File

@ -93,7 +93,7 @@ SettingsView {
Layout.fillWidth: true 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 { Item {
Layout.fillHeight: true Layout.fillHeight: true
Layout.fillWidth: true Layout.fillWidth: true

2
internal/frontend/bridge-gui/bridge-gui/qml/Proton/Style.qml
View File

@ -341,7 +341,7 @@ QtObject {
case "windows": case "windows":
return "Segoe UI" return "Segoe UI"
case "osx": 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": case "linux":
return "Ubuntu" return "Ubuntu"
default: default:

2
internal/frontend/bridge-gui/bridge-gui/qml/tests/TextAreas.qml
View File

@ -97,7 +97,7 @@ ColumnLayout {
placeholderText: "Type 42 here" placeholderText: "Type 42 here"
label: "42 Validator" label: "42 Validator"
hint: "Accepts only \"42\"" hint: "Accepts only \"42\""
assistiveText: "Type sometihng here, preferably 42" assistiveText: "Type something here, preferably 42"
wrapMode: TextInput.Wrap wrapMode: TextInput.Wrap

2
internal/frontend/bridge-gui/bridge-gui/qml/tests/TextFields.qml
View File

@ -149,7 +149,7 @@ RowLayout {
placeholderText: "Type 42 here" placeholderText: "Type 42 here"
label: "42 Validator" label: "42 Validator"
hint: "Accepts only \"42\"" hint: "Accepts only \"42\""
assistiveText: "Type sometihng here, preferably 42" assistiveText: "Type something here, preferably 42"
validator: function(str) { validator: function(str) {
if (str === "42") { if (str === "42") {