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

Commit

Permalink
BeRail V2.0 (#38)
Browse files Browse the repository at this point in the history
* Added .gitignore file

* Updated README

* Added PR template

* Added Issue template

* Added stations-ER.xml

* Update stations-ER.xml

* Update stations-ER.xml

* Primary Keys

* Init classes.xml

* Update classes.xml

* Update classes.xml

* Update classes.xml

* RC classes

* Fixed alignment

* Added title

* MVC

* CacheControl + UserAgent + fixes

* Title alignment

* Fixed typo

* Fixed Vehicle class size

* Colors

* Exported classes diagram as PNG

* Layout + renamed Localisation to Language

* Exported stations-ER as PNG

* Update classes.xml

* QGeoLocation replaced by QGeoCoordinate

* Added Connection class

* Updated Connection class

* Updated Connection class

* Fixed QGeoCoordinate

* Updated classes.png

* Added GPLv3 LICENSE

* Updated API class

* Renamed Disturbances property to m_alerts

* Added timestamp property to Liveboard, Route and Vehicle classes

* Updated Disturbances class

* Fixed typo

* Updated relations

* Updated classes.png

* Stops class avoid collision with Qt Signals platformChanged

* Vehicle, Stations, Disturbances API models

* Removed add-copyright.py

* Started Liveboard API endpoint implementation

* WIP: C++ backend

* WIP: C++ API connections + fixed signal emitting in QObject setters

* Added VIA object

* Connections API added

* Moved enums to QObject for QML exposure

* Enable API class emitting signals

* Cleanup RPM files

* Fixed Vehicle object QML properties

* Enabled Disturbances AlertsListModel using QAbstractListModel

* QAbstractListModel for all QList items in BeRail

* Exposed all C++ datamodels to QML

* Delete harbour-berail.pro.user

* Starting from clean slate for the UI (#23)

1. **Explanation**: 
    - Refreshed UI using the Model-View-Delegate approach from Qt.

2. **Fixed issues**: 
    - Fixed #22 
    - Fixed #24 
    - Fixed #12 
    - Fixed #13  

3. **Testing environment**: 
    - Sailfish OS version: 2.1.0.11
    - Sailfish OS hardware: Oneplus X

* Small fixes + NL translation (#29)

* Small fixes + NL translation

* Fixed OS library file opening

* Updated README and screenshots (#34)

* Updated README

Improved 'How to contribute'

* Class diagram update (#37)

* Delete classes.xml

Draw.io isn't used anymore for class diagrams

* DE translations update + README translation status added

* Fixed #33
  • Loading branch information
DylanVanAssche authored Jan 7, 2018
1 parent 10fb637 commit d1466fa
Show file tree
Hide file tree
Showing 523 changed files with 14,153 additions and 84,316 deletions.
42 changes: 42 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# C++ objects and libs

*.slo
*.lo
*.o
*.a
*.la
*.lai
*.so
*.dll
*.dylib

# Qt-es

/.qmake.cache
/.qmake.stash
*.pro.user
*.pro.user.*
*.qbs.user
*.qbs.user.*
*.moc
moc_*.cpp
moc_*.h
qrc_*.cpp
ui_*.h
Makefile*
*build-*

# QtCreator

*.autosave

# QtCtreator Qml
*.qmlproject.user
*.qmlproject.user.*

# QtCtreator CMake
CMakeLists.txt.user*

#Enforce .pro.user ignore
harbour-berail.pro.user

674 changes: 674 additions & 0 deletions LICENSE

Large diffs are not rendered by default.

46 changes: 34 additions & 12 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,31 +11,53 @@
BeRail is a Sailfish OS application to plan your journeys on the Belgian railway.
It uses the iRail API as source of information and is part of the [iRail project](https://github.com/irail).

BeRail will be available soon in the official Jolla Store and on Openrepos.net
BeRail is available in the official Jolla Store and on [Openrepos.net](https://openrepos.net/content/minitreintje/berail).

## Features
- Routeplanner
- List of all trains that departure from a certain station in NMBS old style
- Trip planner
- List of all trains that departure from a certain station in NMBS/SNCB old style
- Switch easy between departure and arrival station with just one click
- Integrated disturbances monitor for delays and interruptions
- Simple beautiful Silica UI
- Follow the trip of a train in real time
- Remember your favourite stations
- Quick access to your recent connections
- iRail occupancies shown with every connection, train, ...
- Simple beautiful Silica UI based on QML
- C++ backend based on [Qt5](https://www.qt.io)

# Contributions
BeRail is an open source project licensed under the GPLv3 license and is open for contributions.

## How to contribute
1. Fork and clone this repo
2. Open your [Sailfish SDK](https://sailfishos.org/wiki/Application_SDK_Installation) and load the `harbour-berail.pro` file
3. Add both targets in the SDK project setup (`armv7hl` and `i486`)
3. Implement your changes
4. Test and build if everything works
5. Make a Pull request following the PR template

## Architecture overview
A class diagram for the C++ back end and the QML UI is available in this repo under the folder '[docs](https://github.com/iRail/harbour-berail/tree/develop/docs)'.

## Roadmap
- Intermediate stops information for every train in your route
- Notifications when your train arrives, platform is changed, ...
- Dynamic updates of your route, liveboard, ...
- ...
Take a look at the BeRail Github issues, milestones and projects.

## Translations
You can translate BeRail using the Transifex translations service.
In case the language isn't available you can always request it and I will add it.
You can translate BeRail using the Transifex translation service.
In case the language isn't available, you can always request it and I will add it as soon as possible.

https://www.transifex.com/dylanvanassche/harbour-berail/

The translations are automatically updated on Transifex when a Pull Request has been merged in this repo.

<img src="https://chart.googleapis.com/chart?chxt=y%2Cr&chd=e%3A....bgAA&chco=B7E1FF%2C73E6D2%2CF4F6FB&chbh=9&chs=350x66&cht=bhs&chxl=0%3A%7CFrench%7CGerman%7CEnglish+%28United+Kingdom%29%7CDutch%7C1%3A%7C0%25%7C43%25%7C100%25%7C100%25%7C" alt="Translations status">

## Powered by
- [Requests](https://github.com/kennethreitz/requests)
- [Qt5](https://www.qt.io)
- [Transifex](https://www.transifex.com)
- [Sailfish OS](https://www.sailfishos.org)
- [iRail API](https://api.irail.be)
- [BeRail icon by Timo Könnecke](https://twitter.com/eLtMosen)

## Screenshots
<img src="https://raw.githubusercontent.com/iRail/harbour-berail/master/store/screenshots.jpg" alt="Screenshots" style="width: 100%;"/>
<img src="store/screenshots.jpg" alt="Screenshots" style="width: 100%;"/>
12 changes: 12 additions & 0 deletions docs/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
1. **What happens**:
- What's actually happening

2. **What was expected**:
- What's expected to happen

3. **How to reproduce**:
1. Steps

4. **Environment**:
- Sailfish OS version:
- Sailfish OS hardware:
9 changes: 9 additions & 0 deletions docs/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
1. **Explanation**:
- Explain here

2. **Fixed issues**:
- Fixed #

3. **Testing environment**:
- Sailfish OS version:
- Sailfish OS hardware:
Binary file added docs/classes.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3,465 changes: 3,465 additions & 0 deletions docs/classes.xmi

Large diffs are not rendered by default.

Binary file added docs/stations-ER.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions docs/stations-ER.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
<mxfile userAgent="Mozilla/5.0 (X11; Linux x86_64; rv:57.0) Gecko/20100101 Firefox/57.0" version="7.5.6" editor="www.draw.io" type="github"><diagram id="edf30836-62f5-b2b8-2c77-da8139dbde47" name="Page-1">3Vpbl6I4EP41Pk4fSMLtsS86u+c4ffa0D7P7GCUN7CBhILS6v36CJEKMduNZMfT4YlIVcvmq8lWRMIGP6+3XAufxNxqSdAKscDuBTxMAbAQt/ldLdo3Es+1GEBVJKBq1gkXyHxFC8VxUJSEplYaM0pQluSpc0SwjK6bIcFHQjdrslabqqDmOiCZYrHCqS78nIYuF1HaDVvEHSaJYDO0Dr1Es8epHVNAqE+NNAJzNXP5r1Gss+xILLWMc0k1HBKcT+FhQyprSevtI0hpbCVvz3OyM9jDvgmSszwO1bj8PtpNrJyGHQlRpwWIa0Qyn01b6sF8fqXuweS1m61QUyTZhf/OydQccUf1HqjJW7BqdI6u1zuKVkuGC3ddm44KMZkTKZkmaijYkC49acElH/y9hbCccCVeMclE7+TmluZiHDpDArKRVsRIQQOFyuIiIaOU0ohqczmMC1K+ErglfEG9QkBSz5E31IyzcMTq0a03CC8IqZywEh7HQ72Yg15iB0DAG8n43C9m+KROJybzhtBKdLhgfgWaa5UpW0B8HzueTe9jECSOLHO8XtuHhTrUXTpMo4+UVB4MU76HzRgpGtu8ufCu3vGCbnQRORItNJxZZQhZ3wtBB+H/AcjSwJsBN+QgPFS9EdeHPJyninR2k+jZIUx6wSQ8Qy7yJ4q/Jtt4UD7oZrgCr7aiwQqTD6p9A1b8CqK4G6jNek7EjBpA5xGxwwg8v5tkus2r0d4o0Jf/aHfKVXPwR/6pc26ldwpgfsmNvEuhNo2KMv2jCp3cwPnJV4wPfUbtoJi+e6uaYRx05ILjzXWC5fuA6ju0BpVsUWHcQIZ5BO3UjTx2jiR/aGNxoeNdpltcNyvNrceQLiVyLoILWF5seW888AN7PWX3NWe/fogWjeTn2PQ6huT0uCfm6qdOFW/e2aZFYsfJqAXru/KvnRY47BP7WJ8MfBabwh3quNcdZVNWnE1pmGuO8LpJtnWuFtFruNfZYeAT5KsVyXtd4ZLikFQYako/cT2UvI+Zf7wg317kd/0qqfy/Xn9MsSlgVks+Y8vueQXDtHuByPvms2AYOT+t8zmEgQLbtySNOE0gPkkZceIjZN0x9FO56hTGE9DAGjYUxNEwaceoE7IapwimM5Z42gLE3DMaXuLh5+C1j8PvDw2914bcV8AUVmca/7xHF9eFHWiyd09WIj3B912Q2jPRs+Hk+9nwCHh3P3jKDcG5wyWap7AoUer15dJPgKtvb2CWno7+ITJ/H7rAIGXTYgS4d33FYz7DDyu9AxuGw+svd03TsDutAgw4LNMBmL2MHzAUGAfM0wOQpwSvd3220uLk/KyoVX8r9hrvnDQDKt62yPVdoellKwfTlS5jgqMDrSf2pVFFP4gUn6X6IfY5V8mKIGV7isntUsTzuksuauZ05wVAJ6AMTnzHWCZP2vr88YT73lP2Cy+3Hq+1XW80NUvtpHJz+Ag==</diagram></mxfile>
Loading

0 comments on commit d1466fa

Please sign in to comment.