Skip to content

Commit e0960db

Browse files
karoltheguykaroltheguy
committed
Activity Indicator done
1 parent 0c306c8 commit e0960db

File tree

6 files changed

+355
-45
lines changed

6 files changed

+355
-45
lines changed

‎.cproject

+245
Large diffs are not rendered by default.

‎.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ x86/
1111
#################
1212

1313
*.pydevproject
14-
.project
14+
1515
.metadata
1616
bin/
1717
tmp/
@@ -31,7 +31,7 @@ local.properties
3131
*.launch
3232

3333
# CDT-specific
34-
.cproject
34+
3535

3636
# PDT-specific
3737
.buildpath

‎.project

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<projectDescription>
3+
<name>DoIt</name>
4+
<comment></comment>
5+
<projects>
6+
</projects>
7+
<buildSpec>
8+
<buildCommand>
9+
<name>com.rim.tad.tools.qml.core.qmlFileBuilder</name>
10+
<arguments>
11+
</arguments>
12+
</buildCommand>
13+
<buildCommand>
14+
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
15+
<arguments>
16+
</arguments>
17+
</buildCommand>
18+
<buildCommand>
19+
<name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
20+
<arguments>
21+
</arguments>
22+
</buildCommand>
23+
<buildCommand>
24+
<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
25+
<triggers>full,incremental,</triggers>
26+
<arguments>
27+
</arguments>
28+
</buildCommand>
29+
<buildCommand>
30+
<name>com.qnx.tools.bbt.xml.core.bbtXMLValidationBuilder</name>
31+
<arguments>
32+
</arguments>
33+
</buildCommand>
34+
</buildSpec>
35+
<natures>
36+
<nature>org.eclipse.wst.jsdt.core.jsNature</nature>
37+
<nature>org.eclipse.cdt.core.cnature</nature>
38+
<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
39+
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
40+
<nature>com.qnx.tools.ide.bbt.core.bbtnature</nature>
41+
<nature>org.eclipse.cdt.core.ccnature</nature>
42+
<nature>com.rim.tad.tools.qml.core.qmlNature</nature>
43+
</natures>
44+
</projectDescription>

‎assets/Start.qml

+57-35
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Page {
2828
}
2929

3030
onPasswordReceived: {
31+
inProcess.stop()
3132
seTimer.start()
3233
responseArea.text = "Connecting..."
3334
}
@@ -50,6 +51,7 @@ Page {
5051
}
5152
if (pcount == 3) {
5253
//console.debug("Start retryDialog and pcount=",pcount)
54+
inProcess.stop()
5355
retryDialog.open()
5456
}
5557
}
@@ -69,6 +71,7 @@ Page {
6971
getPasswordwithCounter()
7072
}
7173
onCancelRestart: {
74+
inProcess.stop()
7275
deactAllButPower()
7376
cancelledAlert.show()
7477
}
@@ -93,17 +96,19 @@ Page {
9396
}
9497
visible: false
9598
}
96-
//SX TIMER every 30 seconds
99+
97100
ImageView {
98101
imageSource: "asset:///backgrounds/1.jpg"
99102
horizontalAlignment: HorizontalAlignment.Fill
100103
verticalAlignment: VerticalAlignment.Fill
101104
scalingMethod: ScalingMethod.AspectFill
102105
opacity: 0.4
103106
}
107+
104108
//Container with anything other than background
105109
Container {
106110
//Container with very top layer
111+
107112
Container {
108113
layout: StackLayout {
109114
orientation: LayoutOrientation.LeftToRight
@@ -164,7 +169,7 @@ Page {
164169
}
165170
ImageView {
166171
id: batteryImage
167-
imageSource: "asset:///images/battery-full-icon4.png"
172+
imageSource: "asset:///images/battery-full-icon.png"
168173
scaleX: 0.75
169174
scaleY: 0.75
170175
translationY: -30.0
@@ -250,53 +255,69 @@ Page {
250255
}
251256
}
252257
}//secrowInfoContainer
253-
254-
//Container with the 4 buttons
258+
//Container for ActivityIndicator+4buttons
255259
Container {
256-
id: buttonsContainer
257-
layout: StackLayout {
260+
layout: DockLayout {
258261

259262
}
260-
261263
horizontalAlignment: HorizontalAlignment.Center
262-
topMargin: 0.0
263-
topPadding: 20.0
264-
bottomMargin: 0.0
265-
Container {
266-
layout: StackLayout {
267-
orientation: LayoutOrientation.LeftToRight
268-
269-
}
270-
271-
Button {
272-
text: "stats"
273-
onClicked: {
274-
getThis.StatRequest(doitsettings.getSettings("password"),"se")
275-
}
276-
}
277-
Button {
278-
text: "mocky"
279-
onClicked: {
280-
getThis.whatEveRequest("5320c1c979841eda163125a8")
281-
}
282-
}
283-
}
264+
verticalAlignment: VerticalAlignment.Center
265+
266+
267+
//Container with the 4 buttons
284268
Container {
269+
id: buttonsContainer
285270
layout: StackLayout {
286-
orientation: LayoutOrientation.LeftToRight
287271

288272
}
289273

274+
horizontalAlignment: HorizontalAlignment.Center
290275
topMargin: 0.0
291276
topPadding: 20.0
292-
Button {
293-
text: "Snap Picture"
277+
bottomMargin: 0.0
278+
Container {
279+
layout: StackLayout {
280+
orientation: LayoutOrientation.LeftToRight
281+
282+
}
283+
284+
Button {
285+
text: "stats"
286+
onClicked: {
287+
getThis.StatRequest(doitsettings.getSettings("password"),"se")
288+
}
289+
}
290+
Button {
291+
text: "mocky"
292+
onClicked: {
293+
getThis.whatEveRequest("5320c1c979841eda163125a8")
294+
}
295+
}
294296
}
295-
Button {
296-
text: "Recording"
297+
Container {
298+
layout: StackLayout {
299+
orientation: LayoutOrientation.LeftToRight
300+
301+
}
302+
303+
topMargin: 0.0
304+
topPadding: 20.0
305+
Button {
306+
text: "Snap Picture"
307+
}
308+
Button {
309+
text: "Recording"
310+
}
297311
}
312+
}//End of 4 buttons Container
313+
ActivityIndicator {
314+
id: inProcess
315+
preferredWidth: 130
316+
preferredHeight: 130
317+
horizontalAlignment: HorizontalAlignment.Center
318+
verticalAlignment: VerticalAlignment.Center
298319
}
299-
}//buttonsContainer
320+
}//End of Container for ActivityIndicator+4buttons
300321

301322
//Container with Status textarea
302323
Container {
@@ -331,6 +352,7 @@ Page {
331352
//GetPassword with Counter up to 3 times
332353
function getPasswordwithCounter()
333354
{
355+
inProcess.start()
334356
doitsettings.setSettings("GetPassword", 0)
335357
var pcount = doitsettings.getSettings("GetPassword")
336358
console.debug("pcount:", pcount)

‎src/GetterRequest.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*/
77

88
#include "GetterRequest.h"
9-
#include "RetryCounter.h"
109

1110

1211
#include <bb/data/JsonDataAccess>

‎translations/DoIt.ts

+7-7
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@
1212
<context>
1313
<name>GetterRequest</name>
1414
<message>
15-
<location filename="../src/GetterRequest.cpp" line="127"/>
16-
<location filename="../src/GetterRequest.cpp" line="216"/>
15+
<location filename="../src/GetterRequest.cpp" line="126"/>
16+
<location filename="../src/GetterRequest.cpp" line="215"/>
1717
<source>Error: %1 status: %2</source>
1818
<translation type="unfinished"></translation>
1919
</message>
2020
<message>
21-
<location filename="../src/GetterRequest.cpp" line="135"/>
22-
<location filename="../src/GetterRequest.cpp" line="224"/>
21+
<location filename="../src/GetterRequest.cpp" line="134"/>
22+
<location filename="../src/GetterRequest.cpp" line="223"/>
2323
<source>Unable to retrieve request headers</source>
2424
<translation type="unfinished"></translation>
2525
</message>
2626
<message>
27-
<location filename="../src/GetterRequest.cpp" line="354"/>
27+
<location filename="../src/GetterRequest.cpp" line="353"/>
2828
<source>Error: %1 Status: %2</source>
2929
<translation type="unfinished"></translation>
3030
</message>
@@ -45,12 +45,12 @@
4545
<context>
4646
<name>Start</name>
4747
<message>
48-
<location filename="../assets/Start.qml" line="118"/>
48+
<location filename="../assets/Start.qml" line="123"/>
4949
<source>DoIt GoPro</source>
5050
<translation type="unfinished"></translation>
5151
</message>
5252
<message>
53-
<location filename="../assets/Start.qml" line="308"/>
53+
<location filename="../assets/Start.qml" line="329"/>
5454
<source>Not Connected</source>
5555
<translation type="unfinished"></translation>
5656
</message>

0 commit comments

Comments
 (0)