Merge lp:~djaler1/switchboard-plug-power/fix-bug-1598368 into lp:~elementary-apps/switchboard-plug-power/trunk

[Kirill Romanov]

Remove deprecated keys: button-power, button-sleep, critical-battery-action. Add new key - power-button-action.

Fix bug#1598368

[kay van der Zander (kay20)]

looks good thank you.

review: Approve (code)

=== modified file 'src/ActionComboBox.vala'
--- src/ActionComboBox.vala	2016-07-04 02:25:39 +0000
+++ src/ActionComboBox.vala	2016-07-16 21:00:29 +0000
@@ -24,9 +24,9 @@
         private string key;
 
         // this maps combobox indices to gsettings enums
-        private int[] map_to_sett = {1, 2, 3, 4, 5};
+        private int[] map_to_sett = {0, 1, 2};
         // and vice-versa
-        private int[] map_to_list = {4, 0, 1, 2, 3, 4};
+        private int[] map_to_list = {0, 1, 2};
 
         public ActionComboBox (string label_name, string key_value) {
             key = key_value;
@@ -34,11 +34,9 @@
             label.halign = Gtk.Align.END;
             ((Gtk.Misc) label).xalign = 1.0f;
 
+            append_text (_("Do nothing"));
             append_text (_("Suspend"));
-            append_text (_("Shutdown"));
             append_text (_("Hibernate"));
-            append_text (_("Ask me"));
-            append_text (_("Do nothing"));
 
             hexpand = true;
 
 
=== modified file 'src/Plug.vala'
--- src/Plug.vala	2016-07-07 04:27:29 +0000
+++ src/Plug.vala	2016-07-16 21:00:29 +0000
@@ -242,18 +242,13 @@
             var screen_timeout = new TimeoutComboBox (pantheon_dpms_settings, "standby-time");
             screen_timeout.changed.connect (run_dpms_helper);
 
-            var sleep_combobox = new ActionComboBox (_("Sleep button:"), "button-sleep");
-            label_size.add_widget (sleep_combobox.label);
-
-            var power_combobox = new ActionComboBox (_("Power button:"), "button-power");
+            var power_combobox = new ActionComboBox (_("Power button:"), "power-button-action");
             label_size.add_widget (power_combobox.label);
 
             main_grid.attach (screen_timeout_label, 0, 3, 1, 1);
             main_grid.attach (screen_timeout, 1, 3, 1, 1);
-            main_grid.attach (sleep_combobox.label, 0, 4, 1, 1);
-            main_grid.attach (sleep_combobox, 1, 4, 1, 1);
-            main_grid.attach (power_combobox.label, 0, 5, 1, 1);
-            main_grid.attach (power_combobox, 1, 5, 1, 1);
+            main_grid.attach (power_combobox.label, 0, 4, 1, 1);
+            main_grid.attach (power_combobox, 1, 4, 1, 1);
 
             return main_grid;
         }
@@ -307,20 +302,15 @@
 
                 settings.bind ("idle-dim", dim_switch, "active", SettingsBindFlags.DEFAULT);
 
-                var critical_box = new ActionComboBox (_("When power is critically low:"), "critical-battery-action");
-                label_size.add_widget (critical_box.label);
-
                 lid_closed_box.sensitive = false;
                 lid_closed_box.label.sensitive = false;
                 label_size.add_widget (lid_closed_box.label);
 
                 grid.attach (dim_label, 0, 0, 1, 1);
                 grid.attach (dim_switch, 1, 0, 1, 1);
-                grid.attach (critical_box.label, 0, 2, 1, 1);
-                grid.attach (critical_box, 1, 2, 1, 1);
-                grid.attach (lid_closed_box.label, 0, 3, 1, 1);
-                grid.attach (lid_closed_box, 1, 3, 1, 1);
-                grid.attach (lock_image2, 2, 3, 1, 1);
+                grid.attach (lid_closed_box.label, 0, 2, 1, 1);
+                grid.attach (lid_closed_box, 1, 2, 1, 1);
+                grid.attach (lock_image2, 2, 2, 1, 1);
 
             } else if (battery.laptop) {
                 lid_dock_box.sensitive = false;