ubuntu-touch-coreapps-reviewers team mailing list archive

[Bartosz Kosiorek <gang65@xxxxxxxxxxxxxx>]

Bartosz Kosiorek has proposed merging lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-slider-fix into lp:ubuntu-clock-app.

Commit message:
Fix continously move the alarm volume slider to the desired value (LP: #1492584)

Requested reviews:
  Ubuntu Clock Developers (ubuntu-clock-dev)
Related bugs:
  Bug #1492584 in Ubuntu Clock App: "Difficult to continously move the alarm volume slider to the desired value"
  https://bugs.launchpad.net/ubuntu-clock-app/+bug/1492584

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

Fix continously move the alarm volume slider to the desired value (LP: #1492584)
-- 
Your team Ubuntu Clock Developers is requested to review the proposed merge of lp:~gang65/ubuntu-clock-app/ubuntu-clock-app-slider-fix into lp:ubuntu-clock-app.

=== modified file 'app/alarm/AlarmSettingsPage.qml'
--- app/alarm/AlarmSettingsPage.qml	2015-10-06 21:22:34 +0000
+++ app/alarm/AlarmSettingsPage.qml	2015-12-10 09:46:04 +0000
@@ -21,6 +21,7 @@
 import WorldClock 1.0
 import Alarm 1.0
 import Ubuntu.Components 1.2
+import Ubuntu.Settings.Menus 0.1 as Menus
 import "../components"
 
 Page {
@@ -100,7 +101,7 @@
                     }
                 }
 
-                Slider {
+                Menus.SliderMenu {
                     anchors {
                         left: parent.left
                         right: parent.right
@@ -110,10 +111,11 @@
 
                     minimumValue: 1
                     maximumValue: 100
+                    live: true
                     value: alarmSettings.volume
 
                     onValueChanged: {
-                        alarmSettings.volume = formatValue(value)
+                        alarmSettings.volume = value
                     }
                 }
             }

=== modified file 'debian/changelog'
--- debian/changelog	2015-10-16 05:58:01 +0000
+++ debian/changelog	2015-12-10 09:46:04 +0000
@@ -12,11 +12,15 @@
   * Fix wrong time after changing timezone, when stopwatch is running (LP: #1491024)
   * Reduce size of images (with tinypng.com) to decrease click image size (LP: #1492057)
   * Fix Czech Republic country name (LP: #1494004) 
+<<<<<<< TREE
   * Fix wrong date and time after changing timezone while clock running (LP: #1480546)
   * Fix stopwatch issue appering during changing timezone during runtime (LP: #1493358)
   * Fix Daylight Saving Time issues (LP: #1437805)
   * Fix time for second location wrong after daylight saving started (LP: #1457523)
   * Disable alarms which have passed due to timezone changes made by the user (LP: #1505522)
+=======
+  * Fix continously move the alarm volume slider to the desired value (LP: #1492584)
+>>>>>>> MERGE-SOURCE
 
  -- Bartosz Kosiorek <gang65@xxxxxxxxxxxxxx>  Wed, 02 Sep 2015 15:16:29 +0200
 
@@ -373,7 +377,7 @@
 
 ubuntu-clock-app (2.2) utopic; urgency=medium
 
-  [Nekhelesh Ramananthan]
+  [ Nekhelesh Ramananthan ]
   * Split labels to allow for a different color time divider.
   * Added support for 12-hour time display.
   * Fixed CMakeList.txt for apparmor file
@@ -384,7 +388,7 @@
 
 ubuntu-clock-app (2.1) utopic; urgency=medium
 
-  [Nekhelesh Ramananthan]
+  [ Nekhelesh Ramananthan ]
   * Added support for creating new alarms
   * Added bottom edge for alarms
   * Added tug down add city animation
@@ -394,7 +398,7 @@
 
 ubuntu-clock-app (2.0) utopic; urgency=medium
 
-  [Nekhelesh Ramananthan]
+  [ Nekhelesh Ramananthan ]
   * First release of the clock app reboot
   * Implemented Digital Mode (LP: #1267146)
   * Fixed scrollable lists on scrollable pages (LP: #1227418)
@@ -412,24 +416,24 @@
 
 ubuntu-clock-app (1.0) saucy; urgency=low
 
-  [Nekhelesh Ramananthan]
+  [ Nekhelesh Ramananthan ]
   * World Clock list needs to inform user when results cannot be retrieved due to network error (LP: #1231106)
   * Load premade presets for new user so user doesn't end up in blank app (LP: #1226131)
   * Return more fine-grained territorial divisions for city search results (LP: #1230153)
   * Improve the visual appearance of the clock, timer, stopwatch and alarm
   * Removed hour support from timer
 
-  [Sergio Schvezov]
+  [ Sergio Schvezov ]
   * Translation for desktop and debian package
   * Fix click package confinement issues
 
-  [Riccardo Padovani]
+  [ Riccardo Padovani ]
   * Alarm notifications do not appear when an alarm is triggered (LP: #1233176)
 
-  [Nicholas Skaggs]
+  [ Nicholas Skaggs ]
   * Several apps have failing tests with 20131003 ui-toolkit (LP: #1234544)
 
-  [Andrea Cerisara]
+  [ Andrea Cerisara ]
   * Autopilot Testcase Needed: Test Add World Clock (LP: #1210196)
   * Autopilot Testcase Needed: Test Delete World Clock (LP: #1210197)