Merge lp:~elementary-pantheon/switchboard-plug-security-privacy/trackpanel-classes into lp:~elementary-apps/switchboard-plug-security-privacy/trunk

[Danielle Foré]

* Split TrackPanel.vala into 3 classes
* Rename "Privacy" to History
* Update copy to reflect the rename
* Invert switch active state to match the new label

These changes are a bit unrelated but I split this up so I could understand what was going on in order to implement this change

[David Hewitt (davidmhewitt)]

Tested the two treeviews and the on/off switch with d-feet, they're still making the required changes in zeitgeist. Rename to History makes much more sense in the context of the other privacy related panels that will be added.

review: Approve (code, function)

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2017-02-26 20:21:42 +0000
+++ src/CMakeLists.txt	2017-02-27 23:09:39 +0000
@@ -25,6 +25,8 @@
     Widgets/AppChooser.vala
     Widgets/AppRow.vala
     Widgets/ClearUsagePopover.vala
+    Widgets/ExcludeTreeView.vala
+    Widgets/IncludeTreeView.vala
     Widgets/ServiceItem.vala
     Widgets/ServiceList.vala
 

=== modified file 'src/Views/TrackPanel.vala'
--- src/Views/TrackPanel.vala	2017-02-27 18:20:56 +0000
+++ src/Views/TrackPanel.vala	2017-02-27 23:09:39 +0000
@@ -22,32 +22,8 @@
 
 public class SecurityPrivacy.TrackPanel : Gtk.Grid {
     private Widgets.ClearUsagePopover remove_popover;
-    private Dialogs.AppChooser app_chooser;
-    private ApplicationBlacklist app_blacklist;
-    private PathBlacklist path_blacklist;
-    private FileTypeBlacklist filetype_blacklist;
-    private Gtk.Grid record_grid;
-    private Gtk.Container description_frame;
-    private Gtk.Grid exclude_grid;
-
     private Gtk.Switch record_switch;
 
-    private enum Columns {
-        ACTIVE,
-        NAME,
-        ICON,
-        FILE_TYPE,
-        N_COLUMNS
-    }
-
-    private enum NotColumns {
-        NAME,
-        ICON,
-        PATH,
-        IS_APP,
-        N_COLUMNS
-    }
-
     public TrackPanel () {
         Object (column_spacing: 12,
                 margin: 12,
@@ -55,34 +31,28 @@
     }
 
     construct {
-        app_blacklist = new ApplicationBlacklist (blacklist);
-        path_blacklist = new PathBlacklist (blacklist);
-        filetype_blacklist = new FileTypeBlacklist (blacklist);
-
-        create_description_panel ();
-
-        var privacy_settings = new GLib.Settings ("org.gnome.desktop.privacy");
-
-        var icon = new Gtk.Image.from_icon_name ("document-open-recent", Gtk.IconSize.DIALOG);
-
-        var record_label = new Gtk.Label (_("Privacy"));
+        var title = _("History Is Disabled").printf (get_operating_system_name ());
+        var description = ("%s\n\n%s\n\n%s".printf (
+                    _("%s won't retain any further data or statistics about file and application usage.").printf (get_operating_system_name ()),
+                    _("The additional functionality that this data provides will be affected."),
+                    _("This will not prevent apps from recording their own usage data like browser history.")));
+
+        var alert = new Granite.Widgets.AlertView (title, description, "");
+        alert.show_all ();
+
+        var description_frame = new Gtk.Frame (null);
+        description_frame.no_show_all = true;
+        description_frame.add (alert);
+
+        var header_image = new Gtk.Image.from_icon_name ("document-open-recent", Gtk.IconSize.DIALOG);
+
+        var record_label = new Gtk.Label (_("History"));
         record_label.get_style_context ().add_class ("h2");
 
         record_switch = new Gtk.Switch ();
+        record_switch.active = true;
         record_switch.valign = Gtk.Align.CENTER;
 
-        record_switch.notify["active"].connect (() => {
-            bool privacy_mode = record_switch.active;
-            record_grid.visible = !privacy_mode;
-            exclude_grid.visible = !privacy_mode;
-            description_frame.visible = privacy_mode;
-            if (privacy_mode != blacklist.get_incognito ()) {
-                blacklist.set_incognito (privacy_mode);
-                privacy_settings.set_boolean ("remember-recent-files", !privacy_mode);
-                privacy_settings.set_boolean ("remember-app-usage", !privacy_mode);
-            }
-        });
-
         var info_button = new Gtk.Image.from_icon_name ("help-info-symbolic", Gtk.IconSize.MENU);
         info_button.hexpand = true;
         info_button.xalign = 0;
@@ -91,12 +61,12 @@
         var header_grid = new Gtk.Grid ();
         header_grid.column_spacing = 12;
         header_grid.margin_bottom = 12;
-        header_grid.add (icon);
+        header_grid.add (header_image);
         header_grid.add (record_label);
         header_grid.add (info_button);
         header_grid.add (record_switch);
 
-        var clear_data = new Gtk.ToggleButton.with_label (_("Clear Usage Data…"));
+        var clear_data = new Gtk.ToggleButton.with_label (_("Clear History…"));
         clear_data.halign = Gtk.Align.END;
         clear_data.notify["active"].connect (() => {
             if (clear_data.active == false) {
@@ -111,13 +81,31 @@
             clear_data.active = false;
         });
 
-        create_include_treeview ();
-        create_exclude_treeview ();
+        var include_treeview = new IncludeTreeView ();
+        var exclude_treeview = new ExcludeTreeView ();
+
         attach (header_grid, 0, 0, 2, 1);
-        attach (exclude_grid, 1, 1, 1, 1);
+        attach (description_frame, 0, 1, 2, 1);
+        attach (include_treeview, 0, 1, 1, 1);
+        attach (exclude_treeview, 1, 1, 1, 1);
         attach (clear_data, 1, 2, 1, 1);
 
-        record_switch.active = blacklist.get_incognito ();
+        record_switch.notify["active"].connect (() => {
+            bool privacy_mode = !record_switch.active;
+            include_treeview.visible = !privacy_mode;
+            exclude_treeview.visible = !privacy_mode;
+            description_frame.visible = privacy_mode;
+
+            if (privacy_mode != blacklist.get_incognito ()) {
+                blacklist.set_incognito (privacy_mode);
+
+                var privacy_settings = new GLib.Settings ("org.gnome.desktop.privacy");
+                privacy_settings.set_boolean ("remember-recent-files", !privacy_mode);
+                privacy_settings.set_boolean ("remember-app-usage", !privacy_mode);
+            }
+        });
+
+        record_switch.active = !blacklist.get_incognito ();
     }
     
     public void focus_privacy_switch () {
@@ -137,241 +125,4 @@
         }
         return system;
     }
-
-    private void create_description_panel () {
-        description_frame = new Gtk.Frame (null);
-        description_frame.expand = true;
-        description_frame.no_show_all = true;
-
-        string system = get_operating_system_name ();
-
-        var icon = "view-private";
-        var title = _("%s is in Privacy Mode").printf (system);
-        var description = ("%s\n\n%s\n\n%s".printf (
-                    _("While in Privacy Mode, this operating system won't retain any further data or statistics about file and application usage."),
-                    _("The additional functionality that this data provides will be affected."),
-                    _("This will not prevent apps from recording their own usage data like browser history.")));
-
-        var alert = new Granite.Widgets.AlertView (title, description, icon);
-        alert.show_all ();
-
-        description_frame.add (alert);
-
-        attach (description_frame, 0, 1, 2, 1);
-    }
-
-    private void create_include_treeview () {
-        var list_store = new Gtk.ListStore (Columns.N_COLUMNS, typeof (bool),
-                typeof (string), typeof (string), typeof (string));
-
-        var view = new Gtk.TreeView.with_model (list_store);
-        view.vexpand = true;
-        view.headers_visible = false;
-        view.activate_on_single_click = true;
-
-        var celltoggle = new Gtk.CellRendererToggle ();
-        view.row_activated.connect ((path, column) => {
-            Value active;
-            Gtk.TreeIter iter;
-            list_store.get_iter (out iter, path);
-            list_store.get_value (iter, Columns.ACTIVE, out active);
-            var is_active = !active.get_boolean ();
-            list_store.set (iter, Columns.ACTIVE, is_active);
-            Value name;
-            list_store.get_value (iter, Columns.FILE_TYPE, out name);
-            if (is_active == true) {
-                filetype_blacklist.unblock (name.get_string ());
-            } else {
-                filetype_blacklist.block (name.get_string ());
-            }
-        });
-
-        var cell = new Gtk.CellRendererText ();
-        var cellpixbuf = new Gtk.CellRendererPixbuf ();
-        cellpixbuf.stock_size = Gtk.IconSize.DND;
-        view.insert_column_with_attributes (-1, "", celltoggle, "active", Columns.ACTIVE);
-        view.insert_column_with_attributes (-1, "", cellpixbuf, "icon-name", Columns.ICON);
-        view.insert_column_with_attributes (-1, "", cell, "markup", Columns.NAME);
-
-        var scrolled = new Gtk.ScrolledWindow (null, null);
-        scrolled.shadow_type = Gtk.ShadowType.IN;
-        scrolled.expand = true;
-        scrolled.add (view);
-
-        var record_label = new Gtk.Label (_("Data Sources:"));
-        record_label.xalign = 0;
-
-        record_grid = new Gtk.Grid ();
-        record_grid.row_spacing = 6;
-        record_grid.attach (record_label, 0, 0, 1, 1);
-        record_grid.attach (scrolled, 0, 1, 1, 1);
-        attach (record_grid, 0, 1, 1, 1);
-
-        set_inclue_iter_to_liststore (list_store, _("Chat Logs"), "internet-chat", Zeitgeist.NMO.IMMESSAGE);
-        set_inclue_iter_to_liststore (list_store, _("Documents"), "x-office-document", Zeitgeist.NFO.DOCUMENT);
-        set_inclue_iter_to_liststore (list_store, _("Music"), "audio-x-generic", Zeitgeist.NFO.AUDIO);
-        set_inclue_iter_to_liststore (list_store, _("Pictures"), "image-x-generic", Zeitgeist.NFO.IMAGE);
-        set_inclue_iter_to_liststore (list_store, _("Presentations"), "x-office-presentation", Zeitgeist.NFO.PRESENTATION);
-        set_inclue_iter_to_liststore (list_store, _("Spreadsheets"), "x-office-spreadsheet", Zeitgeist.NFO.SPREADSHEET);
-        set_inclue_iter_to_liststore (list_store, _("Videos"), "video-x-generic", Zeitgeist.NFO.VIDEO);
-    }
-
-    private void set_inclue_iter_to_liststore (Gtk.ListStore list_store, string name, string icon, string file_type) {
-        Gtk.TreeIter iter;
-        list_store.append (out iter);
-        bool active = (filetype_blacklist.all_filetypes.contains (file_type) == false);
-        list_store.set (iter, Columns.ACTIVE, active, Columns.NAME, name,
-                        Columns.ICON, icon, Columns.FILE_TYPE, file_type);
-    }
-
-    private void create_exclude_treeview () {
-        var list_store = new Gtk.ListStore (NotColumns.N_COLUMNS, typeof (string),
-                typeof (Icon), typeof (string), typeof (bool));
-
-        var view = new Gtk.TreeView.with_model (list_store);
-        view.vexpand = true;
-        view.headers_visible = false;
-
-        var cell = new Gtk.CellRendererText ();
-        var cellpixbuf = new Gtk.CellRendererPixbuf ();
-        cellpixbuf.stock_size = Gtk.IconSize.DND;
-        view.insert_column_with_attributes (-1, "", cellpixbuf, "gicon", NotColumns.ICON);
-        view.insert_column_with_attributes (-1, "", cell, "markup", NotColumns.NAME);
-
-        var scrolled = new Gtk.ScrolledWindow (null, null);
-        scrolled.expand = true;
-        scrolled.add (view);
-
-        var add_app_button = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("application-add-symbolic", Gtk.IconSize.SMALL_TOOLBAR), null);
-        add_app_button.tooltip_text = _("Add Application…");
-        add_app_button.clicked.connect (() => {
-            if (app_chooser.visible == false) {
-                app_chooser.show_all ();
-            }
-        });
-
-        app_chooser = new Dialogs.AppChooser (add_app_button);
-        app_chooser.modal = true;
-        app_chooser.app_chosen.connect ((info) => {
-            var file = File.new_for_path (info.filename);
-            app_blacklist.block (file.get_basename ());
-        });
-
-        var add_folder_button = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("folder-new-symbolic", Gtk.IconSize.SMALL_TOOLBAR), null);
-        add_folder_button.tooltip_text = _("Add Folder…");
-        add_folder_button.clicked.connect (() => {
-            var chooser = new Gtk.FileChooserDialog (_("Select a folder to blacklist"), null, Gtk.FileChooserAction.SELECT_FOLDER);
-            chooser.add_buttons (_("Cancel"), Gtk.ResponseType.CANCEL, _("Add"), Gtk.ResponseType.OK);
-            int res = chooser.run ();
-            chooser.hide ();
-            if (res == Gtk.ResponseType.OK) {
-                string folder = chooser.get_filename ();
-                if (this.path_blacklist.is_duplicate (folder) == false) {
-                    path_blacklist.block (folder);
-                }
-            }
-        });
-
-        var remove_button = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("list-remove-symbolic", Gtk.IconSize.SMALL_TOOLBAR), null);
-        remove_button.tooltip_text = _("Delete");
-        remove_button.sensitive = false;
-        remove_button.clicked.connect (() => {
-            Gtk.TreePath path;
-            Gtk.TreeViewColumn column;
-            view.get_cursor (out path, out column);
-            Gtk.TreeIter iter;
-            list_store.get_iter (out iter, path);
-            Value is_app;
-            list_store.get_value (iter, NotColumns.IS_APP, out is_app);
-            if (is_app.get_boolean () == true) {
-                string name;
-                list_store.get (iter, NotColumns.PATH, out name);
-                app_blacklist.unblock (name);
-            } else {
-                string name;
-                list_store.get (iter, NotColumns.PATH, out name);
-                path_blacklist.unblock (name);
-            }
-
-#if VALA_0_36
-            list_store.remove (ref iter);
-#else
-            list_store.remove (iter);
-#endif
-        });
-
-        var list_toolbar = new Gtk.Toolbar ();
-        list_toolbar.get_style_context ().add_class (Gtk.STYLE_CLASS_INLINE_TOOLBAR);
-        list_toolbar.set_icon_size (Gtk.IconSize.SMALL_TOOLBAR);
-        list_toolbar.insert (add_app_button, -1);
-        list_toolbar.insert (add_folder_button, -1);
-        list_toolbar.insert (remove_button, -1);
-
-        var frame_grid = new Gtk.Grid ();
-        frame_grid.orientation = Gtk.Orientation.VERTICAL;
-        frame_grid.add (scrolled);
-        frame_grid.add (list_toolbar);
-
-        var frame = new Gtk.Frame (null);
-        frame.add (frame_grid);
-
-        var record_label = new Gtk.Label (_("Do not collect data from the following:"));
-        record_label.xalign = 0;
-
-        exclude_grid = new Gtk.Grid ();
-        exclude_grid.row_spacing = 6;
-        exclude_grid.orientation = Gtk.Orientation.VERTICAL;
-        exclude_grid.add (record_label);
-        exclude_grid.add (frame);
-
-        view.cursor_changed.connect (() => {
-            remove_button.sensitive = true;
-        });
-
-        Gtk.TreeIter iter;
-        foreach (var app_info in AppInfo.get_all ()) {
-            if (app_info is DesktopAppInfo) {
-                var file = File.new_for_path (((DesktopAppInfo)app_info).filename);
-                if (app_blacklist.all_apps.contains (file.get_basename ())) {
-                    list_store.append (out iter);
-                    list_store.set (iter, NotColumns.NAME, Markup.escape_text (app_info.get_display_name ()),
-                            NotColumns.ICON, app_info.get_icon (), NotColumns.PATH, file.get_basename (),
-                            NotColumns.IS_APP, true);
-                }
-            }
-        }
-
-        foreach (var folder in path_blacklist.all_folders) {
-            list_store.append (out iter);
-            var file = File.new_for_path (folder);
-            list_store.set (iter, NotColumns.NAME, Markup.escape_text (file.get_basename ()),
-                    NotColumns.ICON, new ThemedIcon ("folder"), NotColumns.PATH, folder,
-                    NotColumns.IS_APP, false);
-        }
-
-        app_blacklist.application_added.connect ((name, ev) => {
-            Gtk.TreeIter it;
-            foreach (var app_info in AppInfo.get_all ()) {
-                if (app_info is DesktopAppInfo) {
-                    var file = File.new_for_path (((DesktopAppInfo)app_info).filename);
-                    if (file.get_basename () == name) {
-                        list_store.append (out it);
-                        list_store.set (it, NotColumns.NAME, Markup.escape_text (app_info.get_display_name ()),
-                                NotColumns.ICON, app_info.get_icon (), NotColumns.PATH, file.get_basename (),
-                                NotColumns.IS_APP, true);
-                        break;
-                    }
-                }
-            }
-        });
-
-        path_blacklist.folder_added.connect ((path) => {
-            Gtk.TreeIter it;
-            list_store.append (out it);
-            var file = File.new_for_path (path);
-            list_store.set (it, NotColumns.NAME, Markup.escape_text (file.get_basename ()),
-                    NotColumns.ICON, new ThemedIcon ("folder"), NotColumns.PATH, path,
-                    NotColumns.IS_APP, false);
-        });
-    }
 }

=== added file 'src/Widgets/ExcludeTreeView.vala'
--- src/Widgets/ExcludeTreeView.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/ExcludeTreeView.vala	2017-02-27 23:09:39 +0000
@@ -0,0 +1,186 @@
+/*-
+* Copyright (c) 2014-2017 elementary LLC. (http://launchpad.net/switchboard-plug-security-privacy)
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*
+* Authored by: Corentin Noël <[e-mail]>
+*/
+
+public class ExcludeTreeView : Gtk.Grid {
+    private SecurityPrivacy.Dialogs.AppChooser app_chooser;
+    private SecurityPrivacy.ApplicationBlacklist app_blacklist;
+    private SecurityPrivacy.PathBlacklist path_blacklist;
+
+    private enum NotColumns {
+        NAME,
+        ICON,
+        PATH,
+        IS_APP,
+        N_COLUMNS
+    }
+
+    construct {
+        app_blacklist = new SecurityPrivacy.ApplicationBlacklist (SecurityPrivacy.blacklist);
+        path_blacklist = new SecurityPrivacy.PathBlacklist (SecurityPrivacy.blacklist);
+
+        var list_store = new Gtk.ListStore (NotColumns.N_COLUMNS, typeof (string), typeof (Icon), typeof (string), typeof (bool));
+
+        var view = new Gtk.TreeView.with_model (list_store);
+        view.vexpand = true;
+        view.headers_visible = false;
+
+        var cell = new Gtk.CellRendererText ();
+        var cellpixbuf = new Gtk.CellRendererPixbuf ();
+        cellpixbuf.stock_size = Gtk.IconSize.DND;
+        view.insert_column_with_attributes (-1, "", cellpixbuf, "gicon", NotColumns.ICON);
+        view.insert_column_with_attributes (-1, "", cell, "markup", NotColumns.NAME);
+
+        var scrolled = new Gtk.ScrolledWindow (null, null);
+        scrolled.expand = true;
+        scrolled.add (view);
+
+        var add_app_button = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("application-add-symbolic", Gtk.IconSize.SMALL_TOOLBAR), null);
+        add_app_button.tooltip_text = _("Add Application…");
+        add_app_button.clicked.connect (() => {
+            if (app_chooser.visible == false) {
+                app_chooser.show_all ();
+            }
+        });
+
+        app_chooser = new SecurityPrivacy.Dialogs.AppChooser (add_app_button);
+        app_chooser.modal = true;
+        app_chooser.app_chosen.connect ((info) => {
+            var file = File.new_for_path (info.filename);
+            app_blacklist.block (file.get_basename ());
+        });
+
+        var add_folder_button = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("folder-new-symbolic", Gtk.IconSize.SMALL_TOOLBAR), null);
+        add_folder_button.tooltip_text = _("Add Folder…");
+        add_folder_button.clicked.connect (() => {
+            var chooser = new Gtk.FileChooserDialog (_("Select a folder to blacklist"), null, Gtk.FileChooserAction.SELECT_FOLDER);
+            chooser.add_buttons (_("Cancel"), Gtk.ResponseType.CANCEL, _("Add"), Gtk.ResponseType.OK);
+            int res = chooser.run ();
+            chooser.hide ();
+            if (res == Gtk.ResponseType.OK) {
+                string folder = chooser.get_filename ();
+                if (this.path_blacklist.is_duplicate (folder) == false) {
+                    path_blacklist.block (folder);
+                }
+            }
+        });
+
+        var remove_button = new Gtk.ToolButton (new Gtk.Image.from_icon_name ("list-remove-symbolic", Gtk.IconSize.SMALL_TOOLBAR), null);
+        remove_button.tooltip_text = _("Delete");
+        remove_button.sensitive = false;
+        remove_button.clicked.connect (() => {
+            Gtk.TreePath path;
+            Gtk.TreeViewColumn column;
+            view.get_cursor (out path, out column);
+            Gtk.TreeIter iter;
+            list_store.get_iter (out iter, path);
+            Value is_app;
+            list_store.get_value (iter, NotColumns.IS_APP, out is_app);
+            if (is_app.get_boolean () == true) {
+                string name;
+                list_store.get (iter, NotColumns.PATH, out name);
+                app_blacklist.unblock (name);
+            } else {
+                string name;
+                list_store.get (iter, NotColumns.PATH, out name);
+                path_blacklist.unblock (name);
+            }
+
+#if VALA_0_36
+            list_store.remove (ref iter);
+#else
+            list_store.remove (iter);
+#endif
+        });
+
+        var list_toolbar = new Gtk.Toolbar ();
+        list_toolbar.get_style_context ().add_class (Gtk.STYLE_CLASS_INLINE_TOOLBAR);
+        list_toolbar.set_icon_size (Gtk.IconSize.SMALL_TOOLBAR);
+        list_toolbar.insert (add_app_button, -1);
+        list_toolbar.insert (add_folder_button, -1);
+        list_toolbar.insert (remove_button, -1);
+
+        var frame_grid = new Gtk.Grid ();
+        frame_grid.orientation = Gtk.Orientation.VERTICAL;
+        frame_grid.add (scrolled);
+        frame_grid.add (list_toolbar);
+
+        var frame = new Gtk.Frame (null);
+        frame.add (frame_grid);
+
+        var record_label = new Gtk.Label (_("Do not collect data from the following:"));
+        record_label.xalign = 0;
+
+        row_spacing = 6;
+        orientation = Gtk.Orientation.VERTICAL;
+        add (record_label);
+        add (frame);
+
+        view.cursor_changed.connect (() => {
+            remove_button.sensitive = true;
+        });
+
+        Gtk.TreeIter iter;
+        foreach (var app_info in AppInfo.get_all ()) {
+            if (app_info is DesktopAppInfo) {
+                var file = File.new_for_path (((DesktopAppInfo)app_info).filename);
+                if (app_blacklist.all_apps.contains (file.get_basename ())) {
+                    list_store.append (out iter);
+                    list_store.set (iter, NotColumns.NAME, Markup.escape_text (app_info.get_display_name ()),
+                            NotColumns.ICON, app_info.get_icon (), NotColumns.PATH, file.get_basename (),
+                            NotColumns.IS_APP, true);
+                }
+            }
+        }
+
+        foreach (var folder in path_blacklist.all_folders) {
+            list_store.append (out iter);
+            var file = File.new_for_path (folder);
+            list_store.set (iter, NotColumns.NAME, Markup.escape_text (file.get_basename ()),
+                    NotColumns.ICON, new ThemedIcon ("folder"), NotColumns.PATH, folder,
+                    NotColumns.IS_APP, false);
+        }
+
+        app_blacklist.application_added.connect ((name, ev) => {
+            Gtk.TreeIter it;
+            foreach (var app_info in AppInfo.get_all ()) {
+                if (app_info is DesktopAppInfo) {
+                    var file = File.new_for_path (((DesktopAppInfo)app_info).filename);
+                    if (file.get_basename () == name) {
+                        list_store.append (out it);
+                        list_store.set (it, NotColumns.NAME, Markup.escape_text (app_info.get_display_name ()),
+                                NotColumns.ICON, app_info.get_icon (), NotColumns.PATH, file.get_basename (),
+                                NotColumns.IS_APP, true);
+                        break;
+                    }
+                }
+            }
+        });
+
+        path_blacklist.folder_added.connect ((path) => {
+            Gtk.TreeIter it;
+            list_store.append (out it);
+            var file = File.new_for_path (path);
+            list_store.set (it, NotColumns.NAME, Markup.escape_text (file.get_basename ()),
+                    NotColumns.ICON, new ThemedIcon ("folder"), NotColumns.PATH, path,
+                    NotColumns.IS_APP, false);
+        });
+    }
+}

=== added file 'src/Widgets/IncludeTreeView.vala'
--- src/Widgets/IncludeTreeView.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/IncludeTreeView.vala	2017-02-27 23:09:39 +0000
@@ -0,0 +1,98 @@
+/*-
+* Copyright (c) 2014-2017 elementary LLC. (http://launchpad.net/switchboard-plug-security-privacy)
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU Lesser General Public
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this program; if not, write to the
+* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+* Boston, MA 02110-1301 USA
+*
+* Authored by: Corentin Noël <[e-mail]>
+*/
+
+public class IncludeTreeView : Gtk.Grid {
+    private SecurityPrivacy.FileTypeBlacklist filetype_blacklist;
+
+    private enum Columns {
+        ACTIVE,
+        NAME,
+        ICON,
+        FILE_TYPE,
+        N_COLUMNS
+    }
+
+    public IncludeTreeView () {
+        Object (row_spacing: 6);
+    }
+
+    construct {
+        filetype_blacklist = new SecurityPrivacy.FileTypeBlacklist (SecurityPrivacy.blacklist);
+
+        var list_store = new Gtk.ListStore (Columns.N_COLUMNS, typeof (bool), typeof (string), typeof (string), typeof (string));
+
+        var view = new Gtk.TreeView.with_model (list_store);
+        view.vexpand = true;
+        view.headers_visible = false;
+        view.activate_on_single_click = true;
+
+        var celltoggle = new Gtk.CellRendererToggle ();
+        view.row_activated.connect ((path, column) => {
+            Value active;
+            Gtk.TreeIter iter;
+            list_store.get_iter (out iter, path);
+            list_store.get_value (iter, Columns.ACTIVE, out active);
+            var is_active = !active.get_boolean ();
+            list_store.set (iter, Columns.ACTIVE, is_active);
+            Value name;
+            list_store.get_value (iter, Columns.FILE_TYPE, out name);
+            if (is_active == true) {
+                filetype_blacklist.unblock (name.get_string ());
+            } else {
+                filetype_blacklist.block (name.get_string ());
+            }
+        });
+
+        var cell = new Gtk.CellRendererText ();
+        var cellpixbuf = new Gtk.CellRendererPixbuf ();
+        cellpixbuf.stock_size = Gtk.IconSize.DND;
+        view.insert_column_with_attributes (-1, "", celltoggle, "active", Columns.ACTIVE);
+        view.insert_column_with_attributes (-1, "", cellpixbuf, "icon-name", Columns.ICON);
+        view.insert_column_with_attributes (-1, "", cell, "markup", Columns.NAME);
+
+        var scrolled = new Gtk.ScrolledWindow (null, null);
+        scrolled.shadow_type = Gtk.ShadowType.IN;
+        scrolled.expand = true;
+        scrolled.add (view);
+
+        var record_label = new Gtk.Label (_("Data Sources:"));
+        record_label.xalign = 0;
+
+        attach (record_label, 0, 0, 1, 1);
+        attach (scrolled, 0, 1, 1, 1);
+
+        set_inclue_iter_to_liststore (list_store, _("Chat Logs"), "internet-chat", Zeitgeist.NMO.IMMESSAGE);
+        set_inclue_iter_to_liststore (list_store, _("Documents"), "x-office-document", Zeitgeist.NFO.DOCUMENT);
+        set_inclue_iter_to_liststore (list_store, _("Music"), "audio-x-generic", Zeitgeist.NFO.AUDIO);
+        set_inclue_iter_to_liststore (list_store, _("Pictures"), "image-x-generic", Zeitgeist.NFO.IMAGE);
+        set_inclue_iter_to_liststore (list_store, _("Presentations"), "x-office-presentation", Zeitgeist.NFO.PRESENTATION);
+        set_inclue_iter_to_liststore (list_store, _("Spreadsheets"), "x-office-spreadsheet", Zeitgeist.NFO.SPREADSHEET);
+        set_inclue_iter_to_liststore (list_store, _("Videos"), "video-x-generic", Zeitgeist.NFO.VIDEO);
+    }
+
+    private void set_inclue_iter_to_liststore (Gtk.ListStore list_store, string name, string icon, string file_type) {
+        Gtk.TreeIter iter;
+        list_store.append (out iter);
+        bool active = (filetype_blacklist.all_filetypes.contains (file_type) == false);
+        list_store.set (iter, Columns.ACTIVE, active, Columns.NAME, name,
+                        Columns.ICON, icon, Columns.FILE_TYPE, file_type);
+    }
+}

=== modified file 'src/Widgets/ServiceList.vala'
--- src/Widgets/ServiceList.vala	2017-02-27 01:30:20 +0000
+++ src/Widgets/ServiceList.vala	2017-02-27 23:09:39 +0000
@@ -5,7 +5,7 @@
     }
 
     construct {
-        var privacy_item = new ServiceItem ("document-open-recent", "tracking", _("Privacy"));
+        var privacy_item = new ServiceItem ("document-open-recent", "tracking", _("History"));
         var lock_item = new ServiceItem ("system-lock-screen", "locking", _("Locking"));
         var firewall_item = new ServiceItem ("network-firewall", "firewall", _("Firewall"));