[Ubuntu-touch-coreapps-reviewers] [Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into lp:ubuntu-clock-app

2016-02-02 Thread Bartosz Kosiorek
The proposal to merge 
lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into 
lp:ubuntu-clock-app has been updated.

Status: Needs review => Approved

For more details, see:
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix/+merge/281414
-- 
Your team Ubuntu Clock Developers is subscribed to branch lp:ubuntu-clock-app.

-- 
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help   : https://help.launchpad.net/ListHelp


[Ubuntu-touch-coreapps-reviewers] [Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into lp:ubuntu-clock-app

2016-02-02 Thread Nicholas Skaggs
The proposal to merge 
lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into 
lp:ubuntu-clock-app has been updated.

Status: Needs review => Approved

For more details, see:
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix/+merge/281414
-- 
Your team Ubuntu Clock Developers is subscribed to branch lp:ubuntu-clock-app.

-- 
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help   : https://help.launchpad.net/ListHelp


Re: [Ubuntu-touch-coreapps-reviewers] [Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into lp:ubuntu-clock-app

2016-02-02 Thread Jenkins Bot
Review: Needs Fixing continuous-integration

FAILED: Autolanding.
Merging failed. More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-autolanding/853/
Executed test runs:
None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/1572/console

-- 
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix/+merge/281414
Your team Ubuntu Clock Developers is subscribed to branch lp:ubuntu-clock-app.

-- 
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help   : https://help.launchpad.net/ListHelp


[Ubuntu-touch-coreapps-reviewers] [Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into lp:ubuntu-clock-app

2016-02-02 Thread Jenkins Bot
The proposal to merge 
lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into 
lp:ubuntu-clock-app has been updated.

Status: Approved => Needs review

For more details, see:
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix/+merge/281414
-- 
Your team Ubuntu Clock Developers is subscribed to branch lp:ubuntu-clock-app.

-- 
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help   : https://help.launchpad.net/ListHelp


Re: [Ubuntu-touch-coreapps-reviewers] [Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into lp:ubuntu-clock-app

2016-02-02 Thread Jenkins Bot
Review: Approve continuous-integration


-- 
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix/+merge/281414
Your team Ubuntu Clock Developers is subscribed to branch lp:ubuntu-clock-app.

-- 
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help   : https://help.launchpad.net/ListHelp


Re: [Ubuntu-touch-coreapps-reviewers] [Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into lp:ubuntu-clock-app

2016-02-02 Thread Jenkins Bot
Review: Needs Fixing continuous-integration

FAILED: Continuous integration, rev:437
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/991/
Executed test runs:
None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/538/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/991/rebuild

-- 
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix/+merge/281414
Your team Ubuntu Clock Developers is subscribed to branch lp:ubuntu-clock-app.

-- 
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help   : https://help.launchpad.net/ListHelp


Re: [Ubuntu-touch-coreapps-reviewers] [Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into lp:ubuntu-clock-app

2016-02-02 Thread Jenkins Bot
Review: Approve continuous-integration


-- 
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix/+merge/281414
Your team Ubuntu Clock Developers is subscribed to branch lp:ubuntu-clock-app.

-- 
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help   : https://help.launchpad.net/ListHelp


[Ubuntu-touch-coreapps-reviewers] [Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into lp:ubuntu-clock-app

2016-02-02 Thread noreply
The proposal to merge 
lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into 
lp:ubuntu-clock-app has been updated.

Status: Approved => Merged

For more details, see:
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix/+merge/281414
-- 
Your team Ubuntu Clock Developers is subscribed to branch lp:ubuntu-clock-app.

-- 
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help   : https://help.launchpad.net/ListHelp


Re: [Ubuntu-touch-coreapps-reviewers] [Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into lp:ubuntu-clock-app

2016-01-14 Thread Jenkins Bot
Review: Needs Fixing continuous-integration

FAILED: Continuous integration, rev:435
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/102/
Executed test runs:
None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/374/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/102/rebuild

-- 
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix/+merge/281414
Your team Ubuntu Clock Developers is subscribed to branch lp:ubuntu-clock-app.

-- 
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help   : https://help.launchpad.net/ListHelp


Re: [Ubuntu-touch-coreapps-reviewers] [Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into lp:ubuntu-clock-app

2016-01-14 Thread Jenkins Bot
Review: Needs Fixing continuous-integration

FAILED: Continuous integration, rev:436
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/114/
Executed test runs:
None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/388/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/114/rebuild

-- 
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix/+merge/281414
Your team Ubuntu Clock Developers is subscribed to branch lp:ubuntu-clock-app.

-- 
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help   : https://help.launchpad.net/ListHelp


[Ubuntu-touch-coreapps-reviewers] [Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into lp:ubuntu-clock-app

2016-01-14 Thread Bartosz Kosiorek
The proposal to merge 
lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into 
lp:ubuntu-clock-app has been updated.

Description changed to:

Fix race condition, which cause wrong alarm caption (LP: #153)

For more details, see:
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix/+merge/281414
-- 
Your team Ubuntu Clock Developers is subscribed to branch lp:ubuntu-clock-app.

-- 
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help   : https://help.launchpad.net/ListHelp


Re: [Ubuntu-touch-coreapps-reviewers] [Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into lp:ubuntu-clock-app

2016-01-13 Thread Jenkins Bot
Review: Needs Fixing continuous-integration

FAILED: Continuous integration, rev:434
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/99/
Executed test runs:
None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/371/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/run-ap-tests-ci/99/rebuild

-- 
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix/+merge/281414
Your team Ubuntu Clock Developers is subscribed to branch lp:ubuntu-clock-app.

-- 
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help   : https://help.launchpad.net/ListHelp


Re: [Ubuntu-touch-coreapps-reviewers] [Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into lp:ubuntu-clock-app

2016-01-05 Thread Jenkins Bot
Review: Approve continuous-integration

PASSED: Continuous integration, rev:433
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/31/
Executed test runs:
None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/300/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/31/rebuild

-- 
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix/+merge/281414
Your team Ubuntu Clock Developers is subscribed to branch lp:ubuntu-clock-app.

-- 
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help   : https://help.launchpad.net/ListHelp


[Ubuntu-touch-coreapps-reviewers] [Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into lp:ubuntu-clock-app

2015-12-30 Thread Bartosz Kosiorek
The proposal to merge 
lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into 
lp:ubuntu-clock-app has been updated.

Commit Message changed to:

Fix rat race condition, which cause wrong alarm caption (LP: #153)

For more details, see:
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix/+merge/281414
-- 
Your team Ubuntu Clock Developers is subscribed to branch lp:ubuntu-clock-app.

-- 
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help   : https://help.launchpad.net/ListHelp


[Ubuntu-touch-coreapps-reviewers] [Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into lp:ubuntu-clock-app

2015-12-30 Thread Bartosz Kosiorek
The proposal to merge 
lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into 
lp:ubuntu-clock-app has been updated.

Commit Message changed to:

* Fix rat race condition, which cause wrong alarm caption (LP: #153)

For more details, see:
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix/+merge/281414
-- 
Your team Ubuntu Clock Developers is subscribed to branch lp:ubuntu-clock-app.

-- 
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help   : https://help.launchpad.net/ListHelp


Re: [Ubuntu-touch-coreapps-reviewers] [Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into lp:ubuntu-clock-app

2015-12-30 Thread Bartosz Kosiorek
1. I added inline comments. Generally we shouldn't process alarm when 
(model.status !== Alarm.Ready)
In most cases changing model.status to Alarm.Ready is fast. But in rare cases, 
Alarm will be parsed faster when it is not ready. It is causing "Alarm 
disabled" issue.
2. Thanks done
3. I have added description to bug report

Diff comments:

> === modified file 'app/alarm/AlarmDelegate.qml'
> --- app/alarm/AlarmDelegate.qml   2015-12-11 02:13:16 +
> +++ app/alarm/AlarmDelegate.qml   2015-12-30 13:05:55 +
> @@ -56,7 +56,7 @@
>  
>  color: UbuntuColors.midAubergine
>  fontSize: "x-large"
> -text: Qt.formatTime(date)
> +text: Qt.formatTime(model.date)

Adding model. for constistency reason in the whole file.

>  }
>  
>  RowLayout {
> @@ -85,11 +85,10 @@
>  
>  fontSize: "small"
>  Layout.fillWidth: true
> -visible: !(type === Alarm.OneTime && !model.enabled)
> +visible: ((type === Alarm.Repeating) || model.enabled) && 
> (model.status === Alarm.Ready)

We don't want to display anything if alarm is not ready, and the values in it 
is old.

>  elide: Text.ElideRight
>  text: type === Alarm.Repeating ? 
> alarmUtils.format_day_string(daysOfWeek, type)
> -   : model.enabled ? 
> alarmUtils.get_time_to_alarm(model.date, localTime)
> -   : "Alarm 
> Disabled"
> +   : 
> alarmUtils.get_time_to_alarm(model.date, localTime)

We don't want to display any not localized string. If alarm will be disabled, 
then localized string from get_time_to_alarm will be used.

>  
>  function animateTextChange() {
>  textChangeAnimation.start()
> @@ -124,6 +123,7 @@
>  Switch {
>  id: alarmStatus
>  objectName: "listAlarmStatus" + index
> +checked: model.enabled && (model.status === Alarm.Ready)

We would like to have reliable update Switch position.
With this single line we are covering cases when Alarm.OneTime was enabled, and 
caption is updated.

>  
>  anchors {
>  right: parent.right


-- 
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix/+merge/281414
Your team Ubuntu Clock Developers is subscribed to branch lp:ubuntu-clock-app.

-- 
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help   : https://help.launchpad.net/ListHelp


[Ubuntu-touch-coreapps-reviewers] [Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into lp:ubuntu-clock-app

2015-12-30 Thread Bartosz Kosiorek
The proposal to merge 
lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into 
lp:ubuntu-clock-app has been updated.

Description changed to:

Fix rat race condition, which cause wrong alarm caption (LP: #153)

For more details, see:
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix/+merge/281414
-- 
Your team Ubuntu Clock Developers is subscribed to branch lp:ubuntu-clock-app.

-- 
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help   : https://help.launchpad.net/ListHelp


Re: [Ubuntu-touch-coreapps-reviewers] [Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into lp:ubuntu-clock-app

2015-12-30 Thread Jenkins Bot
Review: Approve continuous-integration

PASSED: Continuous integration, rev:432
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/30/
Executed test runs:
None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/285/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/30/rebuild

-- 
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix/+merge/281414
Your team Ubuntu Clock Developers is subscribed to branch lp:ubuntu-clock-app.

-- 
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help   : https://help.launchpad.net/ListHelp


Re: [Ubuntu-touch-coreapps-reviewers] [Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into lp:ubuntu-clock-app

2015-12-29 Thread Jenkins Bot
Review: Approve continuous-integration

PASSED: Continuous integration, rev:430
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/28/
Executed test runs:
None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/283/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/28/rebuild

-- 
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix/+merge/281414
Your team Ubuntu Clock Developers is requested to review the proposed merge of 
lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into 
lp:ubuntu-clock-app.

-- 
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help   : https://help.launchpad.net/ListHelp


Re: [Ubuntu-touch-coreapps-reviewers] [Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into lp:ubuntu-clock-app

2015-12-29 Thread Jenkins Bot
Review: Approve continuous-integration

PASSED: Continuous integration, rev:429
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/27/
Executed test runs:
None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/282/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/27/rebuild

-- 
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix/+merge/281414
Your team Ubuntu Clock Developers is requested to review the proposed merge of 
lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into 
lp:ubuntu-clock-app.

-- 
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help   : https://help.launchpad.net/ListHelp


[Ubuntu-touch-coreapps-reviewers] [Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into lp:ubuntu-clock-app

2015-12-29 Thread Bartosz Kosiorek
Bartosz Kosiorek has proposed merging 
lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into 
lp:ubuntu-clock-app.

Commit message:
 * Fix rat condition of wrong alarm caption (LP: #153) 

Requested reviews:
  Jenkins Bot (ubuntu-core-apps-jenkins-bot): continuous-integration
  Ubuntu Clock Developers (ubuntu-clock-dev)

For more details, see:
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix/+merge/281414

 * Fix rat condition of wrong alarm caption (LP: #153) 
-- 
Your team Ubuntu Clock Developers is requested to review the proposed merge of 
lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into 
lp:ubuntu-clock-app.
=== modified file 'app/alarm/AlarmDelegate.qml'
--- app/alarm/AlarmDelegate.qml	2015-12-11 02:13:16 +
+++ app/alarm/AlarmDelegate.qml	2015-12-30 01:08:50 +
@@ -85,11 +85,10 @@
 
 fontSize: "small"
 Layout.fillWidth: true
-visible: !(type === Alarm.OneTime && !model.enabled)
+visible: model.enabled && (model.status === Alarm.Ready)
 elide: Text.ElideRight
 text: type === Alarm.Repeating ? alarmUtils.format_day_string(daysOfWeek, type)
-   : model.enabled ? alarmUtils.get_time_to_alarm(model.date, localTime)
-   : "Alarm Disabled"
+   : alarmUtils.get_time_to_alarm(model.date, localTime)
 
 function animateTextChange() {
 textChangeAnimation.start()
@@ -124,6 +123,7 @@
 Switch {
 id: alarmStatus
 objectName: "listAlarmStatus" + index
+checked: model.enabled && (model.status === Alarm.Ready)
 
 anchors {
 right: parent.right
@@ -153,28 +153,5 @@
 alarmData.save()
 }
 }
-
-Connections {
-target: model
-onStatusChanged: {
-/*
- Update switch value only when the alarm save() operation
- is complete to avoid switching it back.
-*/
-if (model.status === Alarm.Ready) {
-alarmStatus.checked = model.enabled;
-
-if (!alarmStatus.checked && type === Alarm.Repeating) {
-alarmSubtitle.text = alarmUtils.format_day_string(daysOfWeek, type)
-}
-}
-}
-}
-
-/*
- Assign switch value only once at startup. After this, the switch will
- be updated after the alarm save() operations only.
-*/
-Component.onCompleted: alarmStatus.checked = model.enabled
 }
 }

=== modified file 'debian/changelog'
--- debian/changelog	2015-12-16 21:46:11 +
+++ debian/changelog	2015-12-30 01:08:50 +
@@ -1,11 +1,12 @@
-ubuntu-clock-app (3.7) UNRELEASED; urgency=medium
+ubuntu-clock-app (3.7ubuntu1) UNRELEASED; urgency=medium
 
   [ Bartosz Kosiorek ]
   * Fix alarm difference time description, during DST change (LP: #1510694)
   * Move to use the new SDK components v1.3 (LP: #1508363)
   * Fix continously move the alarm volume slider to the desired value (LP: #1492584)  
+  * Fix rat condition of wrong alarm caption (LP: #153) 
 
- -- Bartosz Kosiorek   Wed, 16 Dec 2015 22:44:49 +0100
+ -- Bartosz Kosiorek   Wed, 30 Dec 2015 01:43:24 +0100
 
 ubuntu-clock-app (3.6)  vivid; urgency=medium
 

-- 
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help   : https://help.launchpad.net/ListHelp


Re: [Ubuntu-touch-coreapps-reviewers] [Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into lp:ubuntu-clock-app

2015-12-29 Thread Victor Thompson
Review: Needs Fixing

* What is a "rat condition"? Could you clarify please and fix the applicable 
commit/change logs as applicable?
* Please remove the extra asterisk in the changelog.
* Could you add specific steps to reproduce to the bug report?
-- 
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix/+merge/281414
Your team Ubuntu Clock Developers is subscribed to branch lp:ubuntu-clock-app.

-- 
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help   : https://help.launchpad.net/ListHelp


Re: [Ubuntu-touch-coreapps-reviewers] [Merge] lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix into lp:ubuntu-clock-app

2015-12-29 Thread Jenkins Bot
Review: Approve continuous-integration

PASSED: Continuous integration, rev:431
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/29/
Executed test runs:
None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/284/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/clock-app-ci/29/rebuild

-- 
https://code.launchpad.net/~gang65/ubuntu-clock-app/ubuntu-clock-app-alarm-label-fix/+merge/281414
Your team Ubuntu Clock Developers is subscribed to branch lp:ubuntu-clock-app.

-- 
Mailing list: https://launchpad.net/~ubuntu-touch-coreapps-reviewers
Post to : ubuntu-touch-coreapps-reviewers@lists.launchpad.net
Unsubscribe : https://launchpad.net/~ubuntu-touch-coreapps-reviewers
More help   : https://help.launchpad.net/ListHelp