Merge lp:~dpm/ubuntu-calendar-app/fixes-1282500 into lp:ubuntu-calendar-app

Proposed by David Planella
Status: Merged
Merged at revision: 204
Proposed branch: lp:~dpm/ubuntu-calendar-app/fixes-1282500
Merge into: lp:ubuntu-calendar-app
Diff against target: 40 lines (+4/-3)
1 file modified
CMakeLists.txt (+4/-3)
To merge this branch: bzr merge lp:~dpm/ubuntu-calendar-app/fixes-1282500
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Needs Fixing
Dimitri John Ledkov (community) Approve
Nekhelesh Ramananthan Approve
Andrew Hayzen (community) Approve
Review via email: mp+207400@code.launchpad.net

Commit message

Fixes bug 1282500 whereby when building click packages the icon file is missing.

Description of the change

Fixes bug 1282500 whereby when building click packages the icon file is missing.

To test it's working:

1. Check out this branch and cd into it
2. click-buddy --dir .
3. Examine the click package to ensure it contains the icon
4. Install the click package to ensure it works

To install the click package: http://pastebin.ubuntu.com/6964813/

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

Hmm, the click package installs fine and the icon is present. However I see no difference between the old and the new icon. Looking at your code diff, I don't see any changes to the calendar64.png file. Please push the new icon.

review: Needs Fixing
Revision history for this message
David Planella (dpm) wrote :

This merge proposal does not update the icon, as there is another one that takes care of that (currently failing some tests by jenkinks). But I'll update the icon here anyway, so that we don't have to do it twice.

Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

calendar icon is missing in the dash similar to issue the clock app had before.

review: Needs Fixing
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

The new icon appears in the dash, after following the steps provided :)

review: Approve
Revision history for this message
Nekhelesh Ramananthan (nik90) wrote :

lgtm

review: Approve
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

file:///usr/lib/arm-linux-gnueabihf/qt5/qml/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml:33:9: QML QQuickImage: Cannot open: file:///usr/share/click/preinstalled/com.ubuntu.calendar/0.4.201/new-event.svg
file:///usr/lib/arm-linux-gnueabihf/qt5/qml/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml:33:9: QML QQuickImage: Cannot open: file:///usr/share/click/preinstalled/com.ubuntu.calendar/0.4.201/calendar-today.svg
file:///usr/lib/arm-linux-gnueabihf/qt5/qml/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml:33:9: QML QQuickImage: Cannot open: file:///usr/share/click/preinstalled/com.ubuntu.calendar/0.4.201/new-event.svg
file:///usr/lib/arm-linux-gnueabihf/qt5/qml/Ubuntu/Components/Themes/Ambiance/ToolbarButtonStyle.qml:33:9: QML QQuickImage: Cannot open: file:///usr/share/click/preinstalled/com.ubuntu.calendar/0.4.201/calendar-today.svg

Top level svg's are not included when building click with click-buddy / cmake.

review: Needs Fixing
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

I'll make a separate merge proposal for missing .svgs. This merge proposal correctly fixes the icon.

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Needs Fixing (continuous-integration)
Revision history for this message
David Planella (dpm) wrote :

The changes in this branch got merged as part of https://code.launchpad.net/~xnox/ubuntu-calendar-app/ship-svg-assets

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-01-27 14:50:56 +0000
3+++ CMakeLists.txt 2014-02-20 11:27:47 +0000
4@@ -11,7 +11,7 @@
5 set(DESKTOP_FILE "${PROJECT_NAME}_${APP_NAME}.desktop")
6 set(URLS_FILE "${PROJECT_NAME}_${APP_NAME}.url-dispatcher")
7 set(MAIN_QML calendar.qml)
8-set(ICON calendar64.png)
9+set(ICON_FILE calendar-app@30.png)
10 set(AUTOPILOT_DIR calendar_app)
11 set(APP_HARDCODE calendar-app)
12
13@@ -23,13 +23,14 @@
14 set(CMAKE_INSTALL_PREFIX /)
15 set(CMAKE_INSTALL_BINDIR /)
16 set(DATA_DIR /)
17+ set (ICON ${ICON_FILE})
18 set(EXEC "qmlscene %u ${MAIN_QML}")
19 set(DESKTOP_DIR ${DATA_DIR})
20 set(URLS_DIR ${DATA_DIR})
21 else(CLICK_MODE)
22 set(DATA_DIR ${CMAKE_INSTALL_DATADIR}/${APP_HARDCODE})
23 set(EXEC ${APP_HARDCODE})
24- set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON})
25+ set(ICON ${CMAKE_INSTALL_PREFIX}/${DATA_DIR}/${ICON_FILE})
26 configure_file(${APP_HARDCODE}.in
27 ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE})
28 install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/${APP_HARDCODE}
29@@ -47,7 +48,7 @@
30 file(GLOB SRC_FILES
31 RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
32 *.qml *.js *.png *.js)
33-install(FILES ${SRC_FILES} DESTINATION ${DATA_DIR})
34+install(FILES ${SRC_FILES} ${ICON_FILE} DESTINATION ${DATA_DIR})
35
36 configure_file(${DESKTOP_FILE}.in ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE})
37 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${DESKTOP_FILE} DESTINATION ${DESKTOP_DIR})
38
39=== renamed file 'calendar64.png' => 'calendar-app@30.png'
40Binary files calendar64.png 2013-04-11 20:40:47 +0000 and calendar-app@30.png 2014-02-20 11:27:47 +0000 differ

Subscribers

People subscribed via source and target branches

to status/vote changes: