ubuntu-touch-coreapps-reviewers team mailing list archive

[Bartosz Kosiorek <gang65@xxxxxxxxxxxxxx>]

Bartosz Kosiorek has proposed merging lp:~gang65/ubuntu-clock-app/ubuntu-clock-empty-state-move into lp:ubuntu-clock-app.

Commit message:
Move empty state clue higher (LP: #1430465)

Requested reviews:
  Ubuntu Clock Developers (ubuntu-clock-dev)

For more details, see:
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-empty-state-move/+merge/265062

Move empty state clue higher (LP: #1430465)
-- 
Your team Ubuntu Clock Developers is requested to review the proposed merge of lp:~gang65/ubuntu-clock-app/ubuntu-clock-empty-state-move into lp:ubuntu-clock-app.

=== modified file 'app/alarm/AlarmPage.qml'
--- app/alarm/AlarmPage.qml	2015-05-27 16:03:23 +0000
+++ app/alarm/AlarmPage.qml	2015-07-16 21:04:41 +0000
@@ -149,6 +149,8 @@
     Loader {
         id: emptyStateLoader
         anchors {
+            top: parent.top
+            topMargin: units.gu(5)
             left: parent.left
             right: parent.right
             margins: units.gu(2)

=== modified file 'app/components/EmptyState.qml'
--- app/components/EmptyState.qml	2015-05-27 16:05:25 +0000
+++ app/components/EmptyState.qml	2015-07-16 21:04:41 +0000
@@ -49,7 +49,7 @@
         width: parent.width
         wrapMode: Text.WordWrap
         anchors.top: emptyIcon.bottom
-        anchors.topMargin: units.gu(5)
+        anchors.topMargin: units.gu(4)
         horizontalAlignment: Text.AlignHCenter
     }
 

=== modified file 'backend/CMakeLists.txt'
--- backend/CMakeLists.txt	2015-03-31 14:29:09 +0000
+++ backend/CMakeLists.txt	2015-07-16 21:04:41 +0000
@@ -73,22 +73,22 @@
 
 # Copy qmldir file to build dir for running in QtCreator
 add_custom_target(timezone-qmldir ALL
-    COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/modules/Timezone/qmldir ${CMAKE_CURRENT_BINARY_DIR}/Timezone
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/modules/Timezone/qmldir ${CMAKE_CURRENT_BINARY_DIR}/Timezone
     DEPENDS ${QMLFILES}
 )
 
 add_custom_target(datetime-qmldir ALL
-    COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/modules/DateTime/qmldir ${CMAKE_CURRENT_BINARY_DIR}/DateTime
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/modules/DateTime/qmldir ${CMAKE_CURRENT_BINARY_DIR}/DateTime
     DEPENDS ${QMLFILES}
 )
 
 add_custom_target(alarmsettings-qmldir ALL
-    COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/modules/Alarm/Settings/qmldir ${CMAKE_CURRENT_BINARY_DIR}/Alarm/Settings
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/modules/Alarm/Settings/qmldir ${CMAKE_CURRENT_BINARY_DIR}/Alarm/Settings
     DEPENDS ${QMLFILES}
 )
 
 add_custom_target(geolocation-qmldir ALL
-    COMMAND cp ${CMAKE_CURRENT_SOURCE_DIR}/modules/GeoLocation/qmldir ${CMAKE_CURRENT_BINARY_DIR}/GeoLocation
+    COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/modules/GeoLocation/qmldir ${CMAKE_CURRENT_BINARY_DIR}/GeoLocation
     DEPENDS ${QMLFILES}
 )
 

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-15 22:31:52 +0000
+++ debian/changelog	2015-07-16 21:04:41 +0000
@@ -1,7 +1,8 @@
 ubuntu-clock-app (3.4ubuntu2) UNRELEASED; urgency=medium
 
-  [Nekhelesh Ramananthan]
+  [ Nekhelesh Ramananthan ]
   * Fixed bottom edge title showing incorrect status on app startup (LP: #1381432)
+  * Migrate to Ubuntu 15.04 SDK Framework and QtQuick 2.4.
 
   [ Nicholas Skaggs ]
   * Update testing layout.
@@ -9,8 +10,9 @@
   [ Victor Thompson ]
   * Use city for location if available (LP: #1465496)
 
-  [ Bartosz Kosiorek]
+  [ Bartosz Kosiorek ]
   * Add more time choices for snooze time (LP: #1450767)
+  * Move empty state clue higher (LP: #1430465)
 
  -- Bartosz Kosiorek <gang65@xxxxxxxxxxxxxx>  Sun, 05 Jul 2015 15:10:12 +0200
 

=== modified file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	2015-02-27 12:15:58 +0000
+++ po/CMakeLists.txt	2015-07-16 21:04:41 +0000
@@ -18,7 +18,7 @@
         --package-name='${PROJECT}'
         --copyright-holder='Canonical Ltd.'
         ${I18N_SRC_FILES}
-    COMMAND ${CMAKE_COMMAND} -E copy ${POT_FILE} ${CMAKE_CURRENT_SOURCE_DIR})
+)
 
 foreach(PO_FILE ${PO_FILES})
     get_filename_component(LANG ${PO_FILE} NAME_WE)