Skip to content
This repository has been archived by the owner on Jul 22, 2021. It is now read-only.

Starting from clean slate for the UI #23

Merged
merged 39 commits into from
Jan 4, 2018
+6,755 −3,830
Merged

Starting from clean slate for the UI #23

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
acf367a
Starting from clean slate
DylanVanAssche Dec 22, 2017
5765f25
FirstPage Connection selector
DylanVanAssche Dec 22, 2017
35b8e4c
Enforce gitignore for .pro.user files
DylanVanAssche Dec 22, 2017
7f3805c
FirstPage almost finished
DylanVanAssche Dec 23, 2017
14a15cc
Added GPLv3 license header to all files
DylanVanAssche Dec 23, 2017
8e4709a
Reformatted project file
DylanVanAssche Dec 23, 2017
7880bff
SettingsPage
DylanVanAssche Dec 23, 2017
5da190f
StationSelectorPage
DylanVanAssche Dec 25, 2017
cc44d52
Searching partly works, keyboard loses focus somewhere
DylanVanAssche Dec 25, 2017
c9f7576
Fixed small UI bugs
DylanVanAssche Dec 25, 2017
63c09e4
Bumped version already
DylanVanAssche Dec 25, 2017
465f459
Fixed StationSelectorPage focus loss
DylanVanAssche Dec 26, 2017
e90259a
Small UI bug
DylanVanAssche Dec 26, 2017
3d15f45
improved searching and reduced station map zoom
DylanVanAssche Dec 26, 2017
5f9eb69
Fixed liveboard arrival parsing
DylanVanAssche Dec 26, 2017
b243795
Initial LiveboardPage
DylanVanAssche Dec 26, 2017
a31ccba
Improved LiveBoardPage
DylanVanAssche Dec 26, 2017
e27e5b1
Fixed small bugs + improved LiveboardDelegate
DylanVanAssche Dec 27, 2017
2229b03
Fixed small parsing bugs
DylanVanAssche Dec 27, 2017
68a5636
Moved API instant to harbour-berail file to avoid multiple API instances
DylanVanAssche Dec 27, 2017
4d381a4
Unified GlassButton + initial TripPage
DylanVanAssche Dec 27, 2017
c7ba259
RPM build file delete
DylanVanAssche Dec 27, 2017
e580bbf
TripPage first steps
DylanVanAssche Dec 28, 2017
7c38fba
TripPage improvements
DylanVanAssche Dec 28, 2017
976d23d
First steps to display Vias in TripPage
DylanVanAssche Dec 29, 2017
dfbbef4
Show occupancy level and vias in TripPage
DylanVanAssche Dec 31, 2017
076fc5a
Use SVG images for occupancy
DylanVanAssche Dec 31, 2017
1548a8c
Reformatted GlassButton and GlassStationButton
DylanVanAssche Dec 31, 2017
728f506
Recent connections added
DylanVanAssche Jan 1, 2018
8791908
Touchhint Liveboard + fixed Disturbances text trunication
DylanVanAssche Jan 1, 2018
505887f
Fixed sorting for stations
DylanVanAssche Jan 2, 2018
3d2f9b2
Several bugfixes, improved error handling, init network recovery
DylanVanAssche Jan 3, 2018
990fe6c
Bugfixes, splitted Stop into subclasses
DylanVanAssche Jan 3, 2018
7cf987d
Added network recovery using DBus
DylanVanAssche Jan 3, 2018
be59bd7
Alert the user when via is missed
DylanVanAssche Jan 3, 2018
3d6fe2b
Added beta version of the 'walking' parameter
DylanVanAssche Jan 3, 2018
d2f3b18
Vehicle from Liveboard
DylanVanAssche Jan 4, 2018
02f56c9
Fixed several imports in RELEASE mode
DylanVanAssche Jan 4, 2018
a7d4845
Removed .pro.user file
DylanVanAssche Jan 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use SVG images for occupancy
  • Loading branch information
@DylanVanAssche
DylanVanAssche committed Dec 31, 2017
commit 076fc5abe4b6d5b763f5cea09732f495668aea98
10 changes: 5 additions & 5 deletions qml/js/util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,21 +44,21 @@ function convertTransportType(type) {
}
}

// QML JS doesn't know Enum types as value, they can be only a return value
// QML JS doesn't know IRail Enum types as value, they can be only a return value
// IRail.High = 3
// IRail.Medium = 2
// IRail.Low = 1
// IRail.Unknown = 0
function convertOccupancyType(type) {
switch(type) {
case 3:
return "qrc:///icons/icon-occupancy-high.png"
return "qrc:///icons/icon-occupancy-high.svg"
case 2:
return "qrc:///icons/icon-occupancy-medium.png"
return "qrc:///icons/icon-occupancy-medium.svg"
case 1:
return "qrc:///icons/icon-occupancy-low.png"
return "qrc:///icons/icon-occupancy-low.svg"
case 0:
default:
return "qrc:///icons/icon-occupancy-unknown.png"
return "qrc:///icons/icon-occupancy-unknown.svg"
}
}
Binary file removed qml/resources/icons/icon-occupancy-high.png
View file
Open in desktop
Binary file not shown.
14 changes: 14 additions & 0 deletions qml/resources/icons/icon-occupancy-high.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed qml/resources/icons/icon-occupancy-low.png
View file
Open in desktop
Binary file not shown.
14 changes: 14 additions & 0 deletions qml/resources/icons/icon-occupancy-low.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed qml/resources/icons/icon-occupancy-medium.png
View file
Open in desktop
Binary file not shown.
14 changes: 14 additions & 0 deletions qml/resources/icons/icon-occupancy-medium.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed qml/resources/icons/icon-occupancy-unknown.png
View file
Open in desktop
Binary file not shown.
15 changes: 15 additions & 0 deletions qml/resources/icons/icon-occupancy-unknown.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 4 additions & 4 deletions qml/resources/resources.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
<file>icons/icon-change.png</file>
<file>icons/icon-alert.png</file>
<file>icons/icon-twitter.png</file>
<file>icons/icon-occupancy-high.png</file>
<file>icons/icon-occupancy-low.png</file>
<file>icons/icon-occupancy-medium.png</file>
<file>icons/icon-occupancy-unknown.png</file>
<file>icons/icon-occupancy-high.svg</file>
<file>icons/icon-occupancy-low.svg</file>
<file>icons/icon-occupancy-medium.svg</file>
<file>icons/icon-occupancy-unknown.svg</file>
</qresource>
</RCC>