Skip to content

Commit a401bfc

Browse files
committed
Fixed ServiceStatusPage and ThisWeekPage
Pulley menu is now disabled on This Weekend and Service Status pages when busy to avoid possible segfault.
1 parent 0af5373 commit a401bfc

File tree

8 files changed

+28
-9
lines changed

8 files changed

+28
-9
lines changed

qml/pages/AboutPage.qml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ Page {
5959
right: parent.right
6060
rightMargin: Theme.paddingLarge
6161
}
62-
text: "Version: 0.4.1"
62+
text: "Version: 0.4.2"
6363
}
6464
Label {
6565
id: descriptionLabel

qml/pages/ChangelogPage.qml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,24 @@ Page {
4747
PageHeader {
4848
title: "Changelog"
4949
}
50+
Label {
51+
anchors {
52+
left: parent.left
53+
leftMargin: Theme.paddingLarge
54+
right: parent.right
55+
rightMargin: Theme.paddingLarge
56+
}
57+
wrapMode: Text.WordWrap
58+
color: Theme.highlightColor
59+
textFormat: Text.RichText
60+
text: "<b>0.4.2 - Bus Stop Messages.</b><br>
61+
*Added Bus stop messages: relevant messages now appear in the header.<br>
62+
*Fixed bug: Widgets in This Weekend and Service Status pages' expand and contract consistently and text is displayed only inside widget.<br>
63+
*Pulley menu is now disabled on This Weekend and Service Status pages when busy to avoid possible segfault.
64+
*Fixed bug: on Bus Stop page BusyIndicator is now correctly shown whilst dowloading.<br>
65+
*Fixed bug: on Journey Progress page placeholder is now not visible during downloading.<br>
66+
*Other minor GUI improvements."
67+
}
5068
Label {
5169
anchors {
5270
left: parent.left

qml/pages/ServiceStatusPage.qml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ Page {
5151
onStateChanged: {
5252
busyIndicator.running = serviceStatusData.isDownloading()
5353
pulley.busy = serviceStatusData.isDownloading()
54+
pulley.enabled = !serviceStatusData.isDownloading()
5455
}
5556
}
5657
}

qml/pages/ThisWeekPage.qml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ Page {
4747
onStateChanged: {
4848
busyIndicator.running = thisWeekendData.isDownloading()
4949
pulley.busy = thisWeekendData.isDownloading()
50+
pulley.enabled = !thisWeekendData.isDownloading()
5051
}
5152
}
5253
}

rpm/harbour-london-sail.spec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Name: harbour-london-sail
1313
%{!?qtc_make:%define qtc_make make}
1414
%{?qtc_builddir:%define _builddir %qtc_builddir}
1515
Summary: London Sail is commuter application for London.
16-
Version: 0.4.1
16+
Version: 0.4.2
1717
Release: 1
1818
Group: Qt/Qt
1919
License: MIT Licence

rpm/harbour-london-sail.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Name: harbour-london-sail
22
Summary: London Sail is commuter application for London.
3-
Version: 0.4.1
3+
Version: 0.4.2
44
Release: 1
55
Group: Qt/Qt
66
URL: http://example.org/

src/logic/servicestatuslogic.cpp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,16 +72,15 @@ void ServiceStatusLogic::parse(const QByteArray& data) {
7272
qDebug() << ">>> Parsed Successfuly <<<";
7373
emit dataChanged();
7474
}
75-
downloading = false;
76-
emit stateChanged();
7775
}
7876

7977
//private slots:
8078

8179
//It will be called as soon as "reply" signals "finished()"
8280
void ServiceStatusLogic::downloaded() {
83-
QByteArray data = reply->readAll();
84-
parse(data);
81+
downloading = false;
82+
emit stateChanged();
83+
parse(reply->readAll());
8584
reply->deleteLater();
8685
}
8786

src/logic/thisweekendlogic.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ void ThisWeekendLogic::parseData(const QByteArray& data) {
6363
qDebug() << "Parsing failed";
6464
}
6565
qDebug() << "Not Downloading";
66-
downloading = false;
67-
emit stateChanged();
6866
}
6967

7068
//private slots:
7169
//This slot is called when data is downloaded
7270
void ThisWeekendLogic::downloaded() {
71+
downloading = false;
72+
emit stateChanged();
7373
parseData(reply->readAll());
7474
reply->deleteLater();
7575
}

0 commit comments

Comments
 (0)