Merge lp:~fboucault/camera-app/splashscreen into lp:camera-app

Proposed by Florian Boucault on 2014-10-10
Status: Needs review
Proposed branch: lp:~fboucault/camera-app/splashscreen
Merge into: lp:camera-app
Diff against target: 25 lines (+3/-1)
2 files modified
CMakeLists.txt (+1/-1)
camera-app.desktop.in.in (+2/-0)
To merge this branch: bzr merge lp:~fboucault/camera-app/splashscreen
Reviewer Review Type Date Requested Status
system-apps-ci-bot continuous-integration Needs Fixing on 2016-06-28
PS Jenkins bot continuous-integration Needs Fixing on 2015-01-28
Ubuntu Phablet Team 2014-10-10 Pending
Review via email: mp+237993@code.launchpad.net

Commit message

Added custom startup splash screen.

To post a comment you must log in.
406. By Florian Boucault on 2015-01-28

Merged from trunk

Unmerged revisions

406. By Florian Boucault on 2015-01-28

Merged from trunk

405. By Florian Boucault on 2014-10-10

Added custom startup splash screen.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2014-12-09 09:28:57 +0000
3+++ CMakeLists.txt 2015-01-28 14:46:35 +0000
4@@ -88,7 +88,7 @@
5
6 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
7
8-file(GLOB QML_JS_FILES *.qml *.js)
9+file(GLOB QML_JS_FILES *.qml *.js *.png)
10
11 install(FILES ${QML_JS_FILES}
12 DESTINATION ${CAMERA_APP_DIR}
13
14=== modified file 'camera-app.desktop.in.in'
15--- camera-app.desktop.in.in 2014-09-03 18:52:03 +0000
16+++ camera-app.desktop.in.in 2015-01-28 14:46:35 +0000
17@@ -10,3 +10,5 @@
18 X-Ubuntu-Touch=true
19 X-Ubuntu-Single-Instance=true
20 X-Ubuntu-Default-Department-ID=accessories
21+X-Ubuntu-Splash-Image=splashscreen.png
22+X-Ubuntu-Splash-Color=#0D0D0D
23
24=== added file 'splashscreen@27.png'
25Binary files splashscreen@27.png 1970-01-01 00:00:00 +0000 and splashscreen@27.png 2015-01-28 14:46:35 +0000 differ

Subscribers

People subscribed via source and target branches