lp://staging/~josharenson/qtber/settings

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/~josharenson/qtber/ABONDONED at revision 86

Josh Arenson: Pending requested 2015-06-24

Diff: 689 lines (+390/-26)

20 files modified

src/app/qml/CMakeLists.txt (+1/-1)
src/app/qml/assets/about_icon.svg (+66/-0)
src/app/qml/assets/api.js (+5/-0)
src/app/qml/assets/logout_icon.svg (+170/-0)
src/app/qml/assets/settings_icon.svg (+4/-0)
src/app/qml/components/CurrentLocationSymbol.qml (+1/-1)
src/app/qml/components/DestinationLocationSymbol.qml (+1/-1)
src/app/qml/components/OfflineModal.qml (+1/-1)
src/app/qml/components/PriceEstimateDialog.qml (+2/-2)
src/app/qml/components/ProductTypes.qml (+8/-2)
src/app/qml/components/StyledButton.qml (+1/-1)
src/app/qml/components/StyledPage.qml (+2/-4)
src/app/qml/components/ZoomControl.qml (+1/-1)
src/app/qml/qtber.qml (+13/-3)
src/app/qml/views/HomeView.qml (+1/-1)
src/app/qml/views/LoginView.qml (+4/-4)
src/app/qml/views/MapView.qml (+10/-3)
src/app/qml/views/RegistrationView.qml (+1/-1)
src/app/qml/views/SettingsView.qml (+52/-0)
src/app/qml/views/settings/AboutView.qml (+46/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

93. By Josh Arenson on 2015-06-24

Add basic "About" page

92. By Josh Arenson on 2015-06-24

Remove hack to get to settings menu

91. By Josh Arenson on 2015-06-24

Remove anchor from LoginView

90. By Josh Arenson on 2015-06-24

Fix versions and add Settings page title

89. By Josh Arenson on 2015-06-24

Upgrade to Ubuntu.Components 1.2

88. By Josh Arenson on 2015-06-24

Implement logout from settings menu

87. By Josh Arenson on 2015-06-23

Add basic SettingsView

86. By Josh Arenson on 2015-06-23

Add settings icon to ProductTypes menu

85. By Josh Arenson on 2015-06-22

Josh Arenson 2015-06-22 Re-enable position source by default

84. By Josh Arenson on 2015-06-22

Josh Arenson 2015-06-22 Fix capitalization of enum name
Josh Arenson 2015-06-22 Upgrade all files to QtQuick 2.3 and fix licenses