Merge lp:~ahayzen/volleyball2d/use-app-platform into lp:volleyball2d

Proposed by Andrew Hayzen on 2016-12-11
Status: Merged
Approved by: Andrew Hayzen on 2016-12-11
Approved revision: 43
Merged at revision: 43
Proposed branch: lp:~ahayzen/volleyball2d/use-app-platform
Merge into: lp:volleyball2d
Diff against target: 96 lines (+36/-19)
3 files modified
snapcraft.yaml (+20/-19)
volleyball2d/main.cpp (+2/-0)
volleyball2d/pages/MenuPage.qml (+14/-0)
To merge this branch: bzr merge lp:~ahayzen/volleyball2d/use-app-platform
Reviewer Review Type Date Requested Status
Andrew Hayzen Approve on 2016-12-11
Review via email: mp+312985@code.launchpad.net

Commit message

* Change to use ubuntu-app-platform
* Add quit button

Description of the change

* Change to use ubuntu-app-platform
* Add quit button

To post a comment you must log in.
Andrew Hayzen (ahayzen) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'snap'
2=== added directory 'snap/ubuntu-app-platform'
3=== modified file 'snapcraft.yaml'
4--- snapcraft.yaml 2016-08-19 00:27:44 +0000
5+++ snapcraft.yaml 2016-12-11 16:42:33 +0000
6@@ -7,32 +7,33 @@
7
8 apps:
9 volleyball2d:
10- command: qt5-launch volleyball2d
11+ command: desktop-launch volleyball2d --desktop_file_hint=unity8
12 plugs:
13- - x11
14+ - opengl
15+ - platform
16+ - unity7
17+ - unity8
18+
19+plugs:
20+ platform:
21+ interface: content
22+ content: ubuntu-app-platform1
23+ target: ubuntu-app-platform
24+ default-provider: ubuntu-app-platform
25
26 parts:
27- application:
28+ volleyball2d:
29 build-packages:
30- - qt5-default
31- - qtbase5-dev
32- - qtdeclarative5-dev
33+ - intltool
34 options:
35- - CONFIG += snap
36+ - CONFIG += snap
37 plugin: qmake
38 qt-version: qt5
39 source: .
40 stage-packages:
41- - libqt5core5a
42- - libqt5gui5
43- - libqt5network5
44- - libqt5qml5
45- - libqt5quick5
46 - qtdeclarative5-bacon2d1.0
47- - qml-module-qt-labs-settings
48- - qml-module-qtquick-controls
49- - qml-module-qtquick-dialogs
50- - qml-module-qtquick2
51- - qml-module-qtsensors
52- - qml-module-ubuntu-components
53- after: [qt5conf]
54+ after: [desktop-ubuntu-app-platform]
55+
56+ environment:
57+ source: snap/
58+ plugin: dump
59
60=== modified file 'volleyball2d/main.cpp'
61--- volleyball2d/main.cpp 2016-08-18 22:10:15 +0000
62+++ volleyball2d/main.cpp 2016-12-11 16:42:33 +0000
63@@ -73,6 +73,8 @@
64 view.setHeight(WINDOW_HEIGHT * gu);
65 view.setWidth(WINDOW_WIDTH * gu);
66
67+ QObject::connect(view.engine(), SIGNAL(quit()), qApp, SLOT(quit()));
68+
69 // Connect to signal MainView::fullscreen(bool) to change QQuickView fullscreen state
70 Fullscreen fullscreenToggle;
71 fullscreenToggle.setView(&view);
72
73=== modified file 'volleyball2d/pages/MenuPage.qml'
74--- volleyball2d/pages/MenuPage.qml 2016-08-01 00:08:58 +0000
75+++ volleyball2d/pages/MenuPage.qml 2016-12-11 16:42:33 +0000
76@@ -182,6 +182,20 @@
77 }
78 }
79
80+ Button {
81+ anchors {
82+ left: parent.left
83+ leftMargin: units.gu(2)
84+ top: parent.top
85+ topMargin: units.gu(2)
86+ }
87+ iconName: "close"
88+ height: units.gu(5)
89+ width: height
90+
91+ onTriggered: Qt.quit()
92+ }
93+
94 Row {
95 anchors {
96 bottom: parent.bottom

Subscribers

People subscribed via source and target branches

to all changes: