Merge lp:~benwaffle/granite/am-pm-modebutton into lp:~elementary-pantheon/granite/granite

[Ben]

TimePicker: use a ModeButton for AM/PM

TimePicker: use a ModeButton for AM/PM

[Corentin Noël (tintou)]

Please use no_show_all instead of creating a temporary variable and hiding the widget afterwards.

review: Needs Fixing

[Corentin Noël (tintou)]

I can't tell if it's behaving properly as AM/PM doesn't exist here in my country but all I can say is that the code looks fine!

review: Approve (code)

[Danielle Foré (danrabbit)]

Looks like this checks against org.gnome.desktop.interface clock-format. Are we sure this is the best check? It doesn't look like it's being set. Is this a bug in the way locale is set or is this key maybe deprecated?

[RabbitBot (rabbitbot-a)]

There are additional revisions which have not been approved in review. Please seek review and approval of these new revisions.

=== modified file 'lib/Widgets/TimePicker.vala'
--- lib/Widgets/TimePicker.vala	2014-09-04 12:39:00 +0000
+++ lib/Widgets/TimePicker.vala	2016-02-09 02:10:11 +0000
@@ -50,16 +50,7 @@
         public GLib.DateTime time {
             get {
                 if (_time == null) {
-                    _time = new GLib.DateTime.now_local ();
-                    changing_time = true;
-                    if (_time.get_hour () > 12) {
-                        am_pm_switch.active = true;
-                    } else {
-                        am_pm_switch.active = false;
-                    }
-
-                    update_text (true);
-                    changing_time = false;
+                    time = new GLib.DateTime.now_local ();
                 }
 
                 return _time;
@@ -69,10 +60,10 @@
                 _time = value;
                 changing_time = true;
 
-                if (_time.get_hour () > 12) {
-                    am_pm_switch.active = true;
+                if (_time.get_hour () >= 12) {
+                    am_pm_modebutton.selected = 1;
                 } else {
-                    am_pm_switch.active = false;
+                    am_pm_modebutton.selected = 0;
                 }
 
                 update_text (true);
@@ -84,8 +75,7 @@
 
         private Gtk.SpinButton hours_spinbutton;
         private Gtk.SpinButton minutes_spinbutton;
-        private Gtk.Switch am_pm_switch;
-        private Gtk.Grid am_pm_grid;
+        private ModeButton am_pm_modebutton;
         private bool changing_time = false;
 
         private Gtk.Popover popover;
@@ -106,31 +96,29 @@
             pop_grid.column_spacing = 6;
             pop_grid.row_spacing = 6;
 
-            am_pm_grid = new Gtk.Grid ();
-            am_pm_grid.column_spacing = 6;
-            am_pm_grid.no_show_all = true;
-
-            am_pm_switch = new Gtk.Switch ();
-            am_pm_switch.notify["active"].connect (() => {
-                if (changing_time == true) {
+            am_pm_modebutton = new ModeButton ();
+            am_pm_modebutton.orientation = Gtk.Orientation.VERTICAL;
+            am_pm_modebutton.no_show_all = true;
+            /// TRANSLATORS: this will only show up when 12-hours clock is in use
+            am_pm_modebutton.append_text (_("AM"));
+            /// TRANSLATORS: this will only show up when 12-hours clock is in use
+            am_pm_modebutton.append_text (_("PM"));
+            am_pm_modebutton.mode_changed.connect (mode => {
+                if (changing_time) {
                     return;
                 }
 
-                if (am_pm_switch.active == true) {
+                if (am_pm_modebutton.selected == 0) {
+                    time = _time.add_hours (-12);
+                } else if (am_pm_modebutton.selected == 1) {
                     time = _time.add_hours (12);
                 } else {
-                    time = _time.add_hours (-12);
+                    assert_not_reached ();
                 }
 
                 update_text (true);
             });
-            
-            /// TRANSLATORS: this will only show up when 12-hours clock is in use
-            var am_pm_label = new Gtk.Label (_("PM"));
-            am_pm_label.hexpand = true;
-            am_pm_label.justify = Gtk.Justification.RIGHT;
-            am_pm_grid.attach (am_pm_switch, 0, 0, 1, 1);
-            am_pm_grid.attach (am_pm_label, 1, 0, 1, 1);
+            am_pm_modebutton.hexpand = true;
 
             if (Granite.DateTime.is_clock_format_12h ()) {
                 hours_spinbutton = new Gtk.SpinButton.with_range (1, 12, 1);
@@ -151,7 +139,7 @@
             pop_grid.attach (hours_spinbutton, 0, 0, 1, 1);
             pop_grid.attach (separation_label, 1, 0, 1, 1);
             pop_grid.attach (minutes_spinbutton, 2, 0, 1, 1);
-            pop_grid.attach (am_pm_grid, 0, 1, 3, 1);
+            pop_grid.attach (am_pm_modebutton, 3, 0, 1, 1);
             pop_grid.margin = MARGIN;
 
             popover = new Gtk.Popover (this);
@@ -205,13 +193,13 @@
                 var new_hour = hours_spinbutton.get_value_as_int () - time.get_hour ();
 
                 if (Granite.DateTime.is_clock_format_12h ()) {
-                    if (hours_spinbutton.get_value_as_int () == 12 && am_pm_switch.active == false) {
+                    if (hours_spinbutton.get_value_as_int () == 12 && am_pm_modebutton.selected == 0) {
                         _time = _time.add_hours (-_time.get_hour ());
-                    } else if (hours_spinbutton.get_value_as_int () < 12 && am_pm_switch.active == false) {
+                    } else if (hours_spinbutton.get_value_as_int () < 12 && am_pm_modebutton.selected == 0) {
                         _time = _time.add_hours (new_hour);
-                    } else if (hours_spinbutton.get_value_as_int () == 12 && am_pm_switch.active == true) {
+                    } else if (hours_spinbutton.get_value_as_int () == 12 && am_pm_modebutton.selected == 1) {
                         _time = _time.add_hours (-_time.get_hour () + 12);
-                    } else if (hours_spinbutton.get_value_as_int () < 12 && am_pm_switch.active == true) {
+                    } else if (hours_spinbutton.get_value_as_int () < 12 && am_pm_modebutton.selected == 1) {
                         _time = _time.add_hours (new_hour + 12);
 
                         if (time.get_hour () <= 12)
@@ -236,18 +224,18 @@
                 hours_spinbutton.set_value (time.get_hour ());
 
             if (Granite.DateTime.is_clock_format_12h ()) {
-                am_pm_grid.no_show_all = false;
-                am_pm_grid.show_all ();
+                am_pm_modebutton.no_show_all = false;
+                am_pm_modebutton.show_all ();
 
                 if (time.get_hour () > 12) {
                     hours_spinbutton.set_value (time.get_hour () - 12);
                 } else if (time.get_hour () == 0) {
-                        hours_spinbutton.set_value (12);
+                    hours_spinbutton.set_value (12);
                 } else {
                     hours_spinbutton.set_value (time.get_hour ());
                 }
             } else {
-                am_pm_grid.hide ();
+                am_pm_modebutton.hide ();
                 hours_spinbutton.set_value (time.get_hour ());
             }