Refactor

 * Add Switch to HistoryWidget
 * Add "active" setting key
 * Change icon when inactive
 * Connect to owner-changed signal
 * Show different widget when Privacy is on and inactivate switch

Author: jeremypw

src/HistoryWidget.vala

@@ -8,17 +8,34 @@ public class Clipboard.HistoryWidget : Gtk.Box {
     private Gtk.ListBox clipboard_item_list;
     private string last_text = "";
     private uint wait_timeout = 0;
+    private Granite.SwitchModelButton active_switch;
+    private Gtk.Box privacy_widget;
+    private Gtk.ScrolledWindow scroll_box;
+    private Gtk.Stack stack;
+    private unowned Gtk.Clipboard clipboard;
 
     public signal void close_request ();
 
     construct {
         orientation = VERTICAL;
         spacing = 6;
 
-        var active_switch = new Granite.SwitchModelButton (_("Clipboard Manager")) {
+        active_switch = new Granite.SwitchModelButton (_("Clipboard Manager")) {
             description = _("Monitoring the clipboard contents")
         };
 
+        var inactive_header_label = new Granite.HeaderLabel (_("The ClipboardManager is disabled"));
+        var inactive_subheader_label = new Gtk.Label ("") {
+            label = Granite.TOOLTIP_SECONDARY_TEXT_MARKUP.printf (_("History is off in the Privacy and Security settings")),
+            use_markup = true
+        };
+        privacy_widget = new Gtk.Box (VERTICAL, 0) {
+            margin_start = 6,
+            margin_end = 6
+        };
+        privacy_widget.add (inactive_header_label);
+        privacy_widget.add (inactive_subheader_label);
+
         Clipboard.Indicator.settings.bind ("active", active_switch, "active", DEFAULT);
 
         clipboard_text_set = new Gee.HashSet<string> ();
@@ -27,14 +44,20 @@ public class Clipboard.HistoryWidget : Gtk.Box {
             selection_mode = SINGLE
         };
         clipboard_item_list.set_placeholder (new Gtk.Label (_("Clipboard Empty")));
-        var scroll_box = new Gtk.ScrolledWindow (null, null);
+
+        scroll_box = new Gtk.ScrolledWindow (null, null);
         scroll_box.max_content_height = 512;
         scroll_box.propagate_natural_height = true;
         scroll_box.hscrollbar_policy = Gtk.PolicyType.NEVER;
         scroll_box.add (clipboard_item_list);
 
+        stack = new Gtk.Stack ();
+        stack.add_named (scroll_box, "clipboard");
+        stack.add_named (privacy_widget, "privacy");
+
         add (active_switch);
-        add (scroll_box);
+        add (stack);
+
         show_all ();
 
         clipboard_item_list.row_activated.connect ((row) => {
@@ -43,6 +66,8 @@ public class Clipboard.HistoryWidget : Gtk.Box {
             clipboard.set_text (text, -1);
             close_request ();
         });
+
+        clipboard = Gtk.Clipboard.get_default (Gdk.Display.get_default ());
     }
 
     ~HistoryWidget () {
@@ -51,38 +76,45 @@ public class Clipboard.HistoryWidget : Gtk.Box {
 
     // No notifications from clipboard? So poll it periodically for new text
     public void wait_for_text () {
-        var clipboard = Gtk.Clipboard.get_default (Gdk.Display.get_default ());
-        wait_timeout = Timeout.add_full (Priority.LOW, 1000, () => {
-            if (clipboard.wait_is_text_available ()) {
-                clipboard.request_text ((cb, text) => {
-                    if (text != last_text && !clipboard_text_set.contains (text)) {
-                        last_text = text;
-                        clipboard_text_set.add (text);
-                        var new_item = new ItemRow (text);
-                        clipboard_item_list.prepend (new_item);
-                        clipboard_item_list.select_row (new_item);
-                        clipboard_item_list.show_all ();
-                    }
-                });
-            }
-
-            return Source.CONTINUE;
-        });
+        clipboard.owner_change.connect (on_clipboard_owner_change);
     }
 
-    public void stop_waiting_for_text () {
-        if (wait_timeout > 0) {
-            Source.remove (wait_timeout);
+    private void on_clipboard_owner_change () requires (clipboard != null) {
+        if (clipboard.wait_is_text_available ()) {
+            clipboard.request_text ((cb, text) => {
+                if (!clipboard_text_set.contains (text)) {
+                    clipboard_text_set.add (text);
+                    var new_item = new ItemRow (text);
+                    clipboard_item_list.prepend (new_item);
+                    clipboard_item_list.select_row (new_item);
+                    clipboard_item_list.show_all ();
+                }
+            });
         }
     }
 
+    public void stop_waiting_for_text () requires (clipboard != null) {
+        clipboard.owner_change.disconnect (on_clipboard_owner_change);
+    }
+
     public void clear_history () {
         clipboard_text_set.clear ();
         clipboard_item_list.@foreach ((child) => {
             child.destroy ();
         });
     }
 
+    public void set_privacy_mode (bool privacy_on) {
+        active_switch.sensitive = !privacy_on;
+        stack.visible_child_name = privacy_on ? "privacy" : "clipboard";
+        if (privacy_on) {
+            stop_waiting_for_text ();
+            clear_history ();
+        } else {
+            wait_for_text ();
+        }
+    }
+
     private class ItemRow : Gtk.ListBoxRow {
         public string text { get; construct; }
         public string prettier_text { get; construct; }
@@ -115,52 +147,4 @@ public class Clipboard.HistoryWidget : Gtk.Box {
             add (label);
         }
     }
-
-    // Taken from the Code project (https://github.com/elementary/code)
-    private class SettingSwitch : Gtk.Grid {
-        public string label { get; construct; }
-        public string settings_key { get; construct; }
-        public string description { get; construct; }
-
-        public SettingSwitch (string label, string settings_key, string description = "") {
-            Object (
-                description: description,
-                label: label,
-                settings_key: settings_key
-            );
-        }
-
-        construct {
-            var switch_widget = new Gtk.Switch () {
-                valign = CENTER
-            };
-
-            var label_widget = new Gtk.Label (label) {
-                halign = START,
-                hexpand = true,
-                mnemonic_widget = switch_widget
-            };
-
-            column_spacing = 12;
-            attach (label_widget, 0, 0);
-            attach (switch_widget, 1, 0, 1, 2);
-
-            if (description != "") {
-                var description_label = new Gtk.Label (description) {
-                    halign = START,
-                    wrap = true,
-                    xalign = 0
-                };
-                description_label.get_style_context ().add_class (Gtk.STYLE_CLASS_DIM_LABEL);
-                description_label.get_style_context ().add_class (Granite.STYLE_CLASS_SMALL_LABEL);
-
-                attach (description_label, 0, 1);
-
-                switch_widget.get_accessible ().accessible_description = description;
-            }
-
-            Clipboard.Indicator.settings.bind (settings_key, switch_widget, "active", DEFAULT);
-        }
-    }
-
 }

src/Indicator.vala

@@ -10,8 +10,9 @@ public class Clipboard.Indicator : Wingpanel.Indicator {
     private const string STOPPED_ICON_NAME = "task-past-due-symbolic";
     private Gtk.Image panel_icon;
     private HistoryWidget history_widget;
-    private Gtk.Box privacy_widget;
+
     public bool always_hide { get; set; }
+    public bool active { get; set; }
     public bool privacy_on { get; set; }
 
     public Wingpanel.IndicatorManager.ServerType server_type { get; construct set; }
@@ -31,21 +32,13 @@ public class Clipboard.Indicator : Wingpanel.Indicator {
 
         settings = new GLib.Settings ("io.github.ellie_commons.indicator-clipboard");
         settings.bind ("always-hide", this, "always-hide", DEFAULT);
+        settings.bind ("active", this, "active", DEFAULT);
+
 
-        var inactive_header_label = new Granite.HeaderLabel (_("The ClipboardManager is disabled"));
-        var inactive_subheader_label = new Gtk.Label ("") {
-            label = Granite.TOOLTIP_SECONDARY_TEXT_MARKUP.printf (_("History is off in the Privacy and Security settings")),
-            use_markup = true
-        };
-        privacy_widget = new Gtk.Box (VERTICAL, 0) {
-            margin_start = 6,
-            margin_end = 6
-        };
-        privacy_widget.add (inactive_header_label);
-        privacy_widget.add (inactive_subheader_label);
         // Ensure correct appearance before showing
         get_display_widget ();
         get_widget ();
+        update_appearance ();
     }
 
 
@@ -57,7 +50,7 @@ public class Clipboard.Indicator : Wingpanel.Indicator {
                 this.visible = false;
             } else {
                 gnome_privacy_settings = new Settings ("org.gnome.desktop.privacy");
-                gnome_privacy_settings.bind ("remember-recent-files", this, "privacy-on", GET | INVERT_BOOLEAN);
+                gnome_privacy_settings.bind ("remember-recent-files", this, "privacy-on", DEFAULT | INVERT_BOOLEAN);
             }
         }
 
@@ -74,14 +67,12 @@ public class Clipboard.Indicator : Wingpanel.Indicator {
             });
 
             this.notify["privacy-on"].connect (update_appearance);
-            // this.notify["privacy-on"].connect (get_widget);
             this.notify["always-hide"].connect (update_appearance);
+            this.notify["active"].connect (update_appearance);
             update_appearance ();
         }
 
-        // There doesn't seem to be a way of stopping Wingpanel showing the (blank) popover in the inactive state
-        // So show informative label.
-        return !privacy_on ? history_widget : privacy_widget;
+        return history_widget;
     }
 
     public override void opened () {
@@ -92,16 +83,14 @@ public class Clipboard.Indicator : Wingpanel.Indicator {
     }
 
     private void update_appearance () {
-        if (privacy_on || always_hide) {
-            history_widget.clear_history ();
-            history_widget.stop_waiting_for_text ();
+        if (!active || privacy_on || always_hide) {
             panel_icon.icon_name = STOPPED_ICON_NAME;
-        } else if (!privacy_on && !always_hide) {
-            history_widget.wait_for_text ();
+        } else if (active && !privacy_on && !always_hide) {
             panel_icon.icon_name = NORMAL_ICON_NAME;
         }
 
         visible = !always_hide;
+        history_widget.set_privacy_mode (privacy_on);
     }
 }