MainView: use Gtk.Dropdown for power button behavior (#248)

* MainView: use Gtk.Dropdown for power button behavior

* Remove valign

* revert layout changes

---------

Co-authored-by: Leo <lenemter@gmail.com>
Co-authored-by: Jeremy Wootten <jeremywootten@gmail.com>

po/POTFILES

@@ -9,5 +9,4 @@ src/Interfaces.vala
 src/Widgets/BatteryBox.vala
 src/Widgets/TimeoutComboBox.vala
 src/Widgets/LidCloseActionComboBox.vala
-src/Widgets/ActionComboBox.vala
 src/Widgets/PowerModeButton.vala

src/MainView.vala

@@ -30,6 +30,7 @@ public class Power.MainView : Switchboard.SettingsPage {
     private const string SETTINGS_DAEMON_NAME = "org.gnome.SettingsDaemon.Power";
     private const string SETTINGS_DAEMON_PATH = "/org/gnome/SettingsDaemon/Power";
 
+    private Gtk.DropDown powerbutton_dropdown;
     private Gtk.Scale scale;
     private PowerSettings screen;
 
@@ -157,17 +158,25 @@ public class Power.MainView : Switchboard.SettingsPage {
 
         var screen_timeout = new TimeoutComboBox (new GLib.Settings ("org.gnome.desktop.session"), "idle-delay");
 
-        var power_label = new Gtk.Label (_("Power button:")) {
-            halign = Gtk.Align.END,
-            xalign = 1
+        // FIXME: Virtual machines can only shutdown or do nothing. Tablets always suspend.
+        powerbutton_dropdown = new Gtk.DropDown.from_strings ({
+            _("Do nothing"),
+            _("Suspend"),
+            _("Ask to shutdown")
+        }) {
+            hexpand = true
         };
 
-        var power_combobox = new ActionComboBox ("power-button-action");
+        var powerbutton_label = new Gtk.Label (_("Power Button Behavior")) {
+            halign = Gtk.Align.END,
+            xalign = 1,
+            mnemonic_widget = powerbutton_dropdown
+        };
 
         main_grid.attach (screen_timeout_label, 0, 4);
         main_grid.attach (screen_timeout, 1, 4);
-        main_grid.attach (power_label, 0, 5);
-        main_grid.attach (power_combobox, 1, 5);
+        main_grid.attach (powerbutton_label, 0, 5);
+        main_grid.attach (powerbutton_dropdown, 1, 5);
 
         var sleep_timeout_label = new Gtk.Label (_("Suspend when inactive for:")) {
             xalign = 1
@@ -303,10 +312,21 @@ public class Power.MainView : Switchboard.SettingsPage {
 
         label_size.add_widget (sleep_timeout_label);
         label_size.add_widget (screen_timeout_label);
-        label_size.add_widget (power_label);
+        label_size.add_widget (powerbutton_label);
 
         // hide stack switcher if we only have ac line
         stack_switcher.visible = stack.observe_children ().get_n_items () > 1;
+
+        update_powerbutton_dropdown ();
+        settings.changed["power-button-action"].connect (update_powerbutton_dropdown);
+
+        powerbutton_dropdown.notify["selected"].connect (() => {
+            int[] map = {0, 1, 3};
+            settings.set_enum (
+                "power-button-action",
+                map[powerbutton_dropdown.selected]
+            );
+        });
     }
 
     public static Polkit.Permission? get_permission () {
@@ -433,4 +453,9 @@ public class Power.MainView : Switchboard.SettingsPage {
 
         return false;
     }
+
+    private void update_powerbutton_dropdown () {
+        int[] map = {0, 1, 1, 2};
+        powerbutton_dropdown.selected = map [settings.get_enum ("power-button-action")];
+    }
 }

src/Plug.vala

@@ -70,7 +70,7 @@ namespace Power {
         public override async Gee.TreeMap<string, string> search (string search) {
             var search_results = new Gee.TreeMap<string, string> ((GLib.CompareDataFunc<string>)strcmp, (Gee.EqualDataFunc<string>)str_equal);
             search_results.set ("%s → %s".printf (display_name, _("Suspend button")), "");
-            search_results.set ("%s → %s".printf (display_name, _("Power button")), "");
+            search_results.set ("%s → %s".printf (display_name, _("Power Button Behavior")), "");
             search_results.set ("%s → %s".printf (display_name, _("Display inactive")), "");
             search_results.set ("%s → %s".printf (display_name, _("Dim display")), "");
             search_results.set ("%s → %s".printf (display_name, _("Lid close")), "");

src/meson.build

@@ -10,7 +10,6 @@ plug_files = files(
     'Widgets/BatteryBox.vala',
     'Widgets/TimeoutComboBox.vala',
     'Widgets/LidCloseActionComboBox.vala',
-    'Widgets/ActionComboBox.vala',
     'Widgets/PowerModeButton.vala',
 )