Merge lp:~sgpthomas/granite/timepicker into lp:~elementary-pantheon/granite/granite

[Sam Thomas]

TimePicker:
* Minutes below 10 have a 0 in front
* Don't show AM/PM switch for 24hr time

Changed the formatting of the minute hand so that minutes below 10 have a 0 appended to the front. For example, '6' becomes '06'. This change makes the timepicker more consistent with how time is usually presented.

Also fixed a bug regarding switching between 12h and 24h time in the timepicker. Previously, if the widget existed, and the time was changed from 12h to 24h, the AM, PM toggle would remain and the hour spinner would remain between 1-12. My changes in this branch fix this problem.

[Adam Bieńkowski (donadigo)]

Thanks for reworking the branch, it looks much better now!
However there is one UI issue here:

Set the modebutton to be on "AM" and then set the hour to be on 12: you can't click "PM" anymore, the time changes but the "PM" button doesn't get higlighted.

I wrote some inline comments, only some minor code-style issues.

Also, not related to the branch itself: when you create a new follow up branch, you shouldn't remove the previous one: the comments and it's history gets completely removed. Just mark the old one as rejected and comment that there is new branch with a link to it.

review: Needs Fixing (code / testing)

[lp:~sgpthomas/granite/timepicker]

966. By Sam Thomas on 2016-07-25

fixed issue with PM not working and fixed some small code style changes

[Adam Bieńkowski (donadigo)]

Looks good to me!

review: Approve (code / testing)

=== modified file 'lib/Widgets/TimePicker.vala'
--- lib/Widgets/TimePicker.vala	2016-02-09 02:09:56 +0000
+++ lib/Widgets/TimePicker.vala	2016-07-25 19:15:30 +0000
@@ -61,9 +61,9 @@
                 changing_time = true;
 
                 if (_time.get_hour () >= 12) {
-                    am_pm_modebutton.selected = 1;
+                    am_pm_modebutton.set_active (1);
                 } else {
-                    am_pm_modebutton.selected = 0;
+                    am_pm_modebutton.set_active (0);
                 }
 
                 update_text (true);
@@ -133,6 +133,18 @@
             minutes_spinbutton.orientation = Gtk.Orientation.VERTICAL;
             minutes_spinbutton.wrap = true;
             minutes_spinbutton.value_changed.connect (() => update_time (false));
+
+            // If the spinbutton value is less than 10, append zero in front of value. '6' becomes '06'
+            minutes_spinbutton.output.connect (() => {
+                var val = minutes_spinbutton.get_value ();
+                if (val < 10) {
+                    minutes_spinbutton.set_text ("0" + val.to_string ());
+                    return true;
+                }
+
+                return false;
+            });
+
             /// TRANSLATORS: separates hours from minutes.
             var separation_label = new Gtk.Label (_(":"));
 
@@ -216,6 +228,8 @@
         }
 
         private void on_icon_press (Gtk.EntryIconPosition position, Gdk.Event event) {
+            // If the mode is changed from 12h to 24h or visa versa, the entry updates on icon press
+            update_text ();
             changing_time = true;
 
             if (Granite.DateTime.is_clock_format_12h () && time.get_hour () > 12)
@@ -234,9 +248,15 @@
                 } else {
                     hours_spinbutton.set_value (time.get_hour ());
                 }
+
+                // Make sure that bounds are set correctly
+                hours_spinbutton.set_range (1, 12);
             } else {
+                am_pm_modebutton.no_show_all = true;
                 am_pm_modebutton.hide ();
                 hours_spinbutton.set_value (time.get_hour ());
+
+                hours_spinbutton.set_range (0, 23);
             }
 
             minutes_spinbutton.set_value (time.get_minute ());