Skip to content
This repository was archived by the owner on Jan 28, 2022. It is now read-only.

Commit 98157d0

Browse files
committed
fix: show loading icon on initial setup
1 parent 0c40fd1 commit 98157d0

File tree

2 files changed

+57
-8
lines changed

2 files changed

+57
-8
lines changed

basic_ui/InitialSetup.qml

+17-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ Item {
4141
id: smallText
4242
color: Style.color.text
4343
opacity: 0.5
44-
text: qsTr("Navigate your internet browser to: http://") + wifi.wifiStatus.ipAddress + translateHandler.emptyString
44+
text: wifi.wifiStatus.ipAddress == "" ? qsTr("Loading") + translateHandler.emptyString : qsTr("Navigate your internet browser to: http://") + wifi.wifiStatus.ipAddress + translateHandler.emptyString
4545
wrapMode: Text.WordWrap
4646
horizontalAlignment: Text.AlignHCenter
4747
width: parent.width - 80
@@ -50,4 +50,20 @@ Item {
5050
lineHeight: 1
5151
}
5252

53+
Image {
54+
visible: wifi.wifiStatus.ipAddress = ""
55+
asynchronous: true
56+
width: 26; height: 26
57+
anchors { top: smallText.bottom; topMargin: 40; horizontalCenter: parent.horizontalCenter }
58+
fillMode: Image.PreserveAspectFit
59+
source: "qrc:/images/statusbar/statusbar-loader.png"
60+
61+
RotationAnimator on rotation {
62+
id: loadingIconAnim
63+
running: wifi.wifiStatus.ipAddress = ""
64+
loops: Animation.Infinite
65+
from: 0; to: 360
66+
duration: 2000
67+
}
68+
}
5369
}

translations/en_US.ts

+40-7
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ To learn more about the project, visit
124124
<context>
125125
<name>BluetoothThread</name>
126126
<message>
127-
<location filename="../sources/bluetootharea.cpp" line="122"/>
127+
<location filename="../sources/bluetootharea.cpp" line="126"/>
128128
<source>Bluetooth device was not found.</source>
129129
<translation type="unfinished"></translation>
130130
</message>
@@ -505,6 +505,11 @@ to set up YIO remote</source>
505505
<source>Navigate your internet browser to: http://</source>
506506
<translation type="unfinished"></translation>
507507
</message>
508+
<message>
509+
<location filename="../basic_ui/InitialSetup.qml" line="44"/>
510+
<source>Loading</source>
511+
<translation type="unfinished"></translation>
512+
</message>
508513
</context>
509514
<context>
510515
<name>Integrations</name>
@@ -776,31 +781,59 @@ Navigate your internet browser to: http://</source>
776781
<context>
777782
<name>SetupStep3</name>
778783
<message>
779-
<location filename="../setup/SetupStep3.qml" line="61"/>
784+
<location filename="../setup/SetupStep3.qml" line="63"/>
780785
<source>Wi-Fi setup</source>
781786
<translation type="unfinished"></translation>
782787
</message>
783788
<message>
784-
<location filename="../setup/SetupStep3.qml" line="72"/>
789+
<location filename="../setup/SetupStep3.qml" line="74"/>
785790
<source>Select a Wi-Fi network.</source>
786791
<translation type="unfinished"></translation>
787792
</message>
793+
<message>
794+
<location filename="../setup/SetupStep3.qml" line="164"/>
795+
<source>Join other</source>
796+
<translation type="unfinished"></translation>
797+
</message>
788798
</context>
789799
<context>
790800
<name>SetupStep4</name>
791801
<message>
792-
<location filename="../setup/SetupStep4.qml" line="96"/>
802+
<location filename="../setup/SetupStep4.qml" line="97"/>
793803
<source>Enter password for
794804
&quot;%1&quot;</source>
795805
<translation type="unfinished"></translation>
796806
</message>
797807
<message>
798-
<location filename="../setup/SetupStep4.qml" line="114"/>
808+
<location filename="../setup/SetupStep4.qml" line="115"/>
809+
<source>Password</source>
810+
<translation type="unfinished"></translation>
811+
</message>
812+
<message>
813+
<location filename="../setup/SetupStep4.qml" line="174"/>
814+
<source>Join</source>
815+
<translation type="unfinished"></translation>
816+
</message>
817+
</context>
818+
<context>
819+
<name>SetupStep4Other</name>
820+
<message>
821+
<location filename="../setup/SetupStep4Other.qml" line="104"/>
822+
<source>Enter your WiFi network credentials</source>
823+
<translation type="unfinished"></translation>
824+
</message>
825+
<message>
826+
<location filename="../setup/SetupStep4Other.qml" line="122"/>
827+
<source>SSID</source>
828+
<translation type="unfinished"></translation>
829+
</message>
830+
<message>
831+
<location filename="../setup/SetupStep4Other.qml" line="157"/>
799832
<source>Password</source>
800833
<translation type="unfinished"></translation>
801834
</message>
802835
<message>
803-
<location filename="../setup/SetupStep4.qml" line="173"/>
836+
<location filename="../setup/SetupStep4Other.qml" line="206"/>
804837
<source>Join</source>
805838
<translation type="unfinished"></translation>
806839
</message>
@@ -873,7 +906,7 @@ a power source and wait until it starts blinking.
873906
<context>
874907
<name>SetupStep8</name>
875908
<message>
876-
<location filename="../setup/SetupStep8.qml" line="122"/>
909+
<location filename="../setup/SetupStep8.qml" line="139"/>
877910
<source>Setting up your YIO Dock</source>
878911
<translation type="unfinished"></translation>
879912
</message>

0 commit comments

Comments
 (0)