← Back to team overview

ubuntu-touch-coreapps-reviewers team mailing list archive

[Merge] lp:~nik90/ubuntu-clock-app/fix-empty-state-warnings into lp:ubuntu-clock-app

 

Nekhelesh Ramananthan has proposed merging lp:~nik90/ubuntu-clock-app/fix-empty-state-warnings into lp:ubuntu-clock-app.

Commit message:
Fixed empty state component warning.

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

For more details, see:
https://code.launchpad.net/~nik90/ubuntu-clock-app/fix-empty-state-warnings/+merge/260173

Fixed empty state component warning "file:///opt/click.ubuntu.com/com.ubuntu.clock/3.3./share/qml/components/EmptyState.qml:36: TypeError: Cannot read property of null" which was caused due to parent being null when the loader is unloaded.

This was fixed by removing width: parent.width since the component automatically fills the width and height of the loader and as such doesn't require an explicit declaration of size within the component itself.

Note: I also added the debian changelog entry for a previous MP that was missing it.
-- 
Your team Ubuntu Clock Developers is requested to review the proposed merge of lp:~nik90/ubuntu-clock-app/fix-empty-state-warnings into lp:ubuntu-clock-app.
=== modified file 'app/components/EmptyState.qml'
--- app/components/EmptyState.qml	2015-03-05 15:53:53 +0000
+++ app/components/EmptyState.qml	2015-05-26 14:44:13 +0000
@@ -33,7 +33,6 @@
     property alias subTitle: emptySublabel.text
 
     height: childrenRect.height
-    width: parent.width
 
     Icon {
         id: emptyIcon

=== modified file 'debian/changelog'
--- debian/changelog	2015-05-15 16:44:13 +0000
+++ debian/changelog	2015-05-26 14:44:13 +0000
@@ -21,6 +21,10 @@
   * Fixed "Location service error" label being shown when user denies clock app
     location access (LP: #1393827)
   * Increased date font size (LP: #1432736)
+  * Fixed empty state component width warnings
+  
+  [Penk Chen]
+  * Fixed DigitalMode time being empty in chineese locale (LP: #1458808)
 
   [Brendan Donegan]
   * Fixed AP failure by waiting for the bottom edge tip visible property to be true

=== modified file 'po/com.ubuntu.clock.pot'
--- po/com.ubuntu.clock.pot	2015-05-15 16:38:24 +0000
+++ po/com.ubuntu.clock.pot	2015-05-26 14:44:13 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-05-15 16:30+0000\n"
+"POT-Creation-Date: 2015-05-26 14:38+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@xxxxxx>\n"


References