Merge lp:~elementary-pantheon/switchboard-plug-security-privacy/info-tooltip into lp:~elementary-apps/switchboard-plug-security-privacy/trunk

[Danielle Foré]

TrackPanel.vala: Remove info_popover in favor of tooltip text

Follow up from some discussion we had before. If there are no interactive elements and only information, we should use (i) with a tooltip. If there are interactive elements then it's ... with a popover.

Since this is only info, should be a tooltip

=== modified file 'src/TrackPanel.vala'
--- src/TrackPanel.vala	2016-03-02 18:05:24 +0000
+++ src/TrackPanel.vala	2016-09-29 20:38:29 +0000
@@ -25,7 +25,6 @@
     private Gtk.RecentManager recent;
     private List<Gtk.RecentInfo> items;
 
-    private Gtk.Popover info_popover;
     private Gtk.Popover remove_popover;
     private Dialogs.AppChooser app_chooser;
     private ApplicationBlacklist app_blacklist;
@@ -87,17 +86,8 @@
 
         create_description_panel ();
 
-        var info_button = new Gtk.ToggleButton ();
-        info_button.tooltip_text = _("Read more…");
-        info_button.image = new Gtk.Image.from_icon_name ("help-info-symbolic", Gtk.IconSize.MENU);
-        info_button.relief = Gtk.ReliefStyle.NONE;
-        info_button.notify["active"].connect (() => {
-            if (info_button.active == false) {
-                info_popover.hide ();
-            } else {
-                info_popover.show_all ();
-            }
-        });
+        var info_button = new Gtk.Image.from_icon_name ("help-info-symbolic", Gtk.IconSize.MENU);
+        info_button.tooltip_text = _("This operating system can gather useful statistics about file and app usage to provide extra functionality. If other people can see or access your account, you may wish to limit which items are recorded.");
 
         var record_grid = new Gtk.Grid ();
         record_grid.column_spacing = 12;
@@ -105,23 +95,6 @@
         record_grid.add (record_switch);
         record_grid.add (info_button);
 
-        /* Info Popover */
-
-        var explain_label = new Gtk.Label (_("This operating system can gather useful statistics about file and app usage to provide extra functionality. If other people can see or access your account, you may wish to limit which items are recorded."));
-        explain_label.wrap = true;
-        explain_label.max_width_chars = 60;
-        
-        var info_popover_grid = new Gtk.Grid ();
-        info_popover_grid.margin = 12;
-
-        info_popover = new Gtk.Popover (info_button);
-        info_popover.add (info_popover_grid);
-        info_popover.closed.connect (() => {
-            info_button.active = false;
-        });
-
-        info_popover_grid.add (explain_label);
-
         /* Remove Popover */
 
         var clear_data = new Gtk.ToggleButton.with_label (_("Clear Usage Data…"));