Merge lp:~elementary-pantheon/switchboard-plug-security-privacy/rewrite-app-chooser into lp:~elementary-apps/switchboard-plug-security-privacy/trunk

[Danielle Foré]

AppChooser.vala:
* Update copyright header
* GObject-style construction
* Adjust alignment and spacing
* Make search grab focus

Move AppRow class to its own file and rewrite based around AppRow from the applications plug

[Adam Bieńkowski (donadigo)]

Perhaps get_app_comment, get_app_name and get_icon_name can be static since they don't access anything from the class itself?

[lp:~elementary-pantheon/switchboard-plug-security-privacy/rewrite-app-chooser]

294. By Danielle Foré on 2017-02-22

don't pass global var

[David Hewitt (davidmhewitt)]

Much improved. LGTM.

review: Approve (code, function)

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2017-02-19 21:27:25 +0000
+++ src/CMakeLists.txt	2017-02-22 18:16:51 +0000
@@ -23,6 +23,7 @@
     Views/TrackPanel.vala
 
     Widgets/AppChooser.vala
+    Widgets/AppRow.vala
 
     ${CMAKE_CURRENT_BINARY_DIR}/config.vala
 PACKAGES

=== modified file 'src/Widgets/AppChooser.vala'
--- src/Widgets/AppChooser.vala	2017-02-19 21:27:25 +0000
+++ src/Widgets/AppChooser.vala	2017-02-22 18:16:51 +0000
@@ -1,64 +1,28 @@
 // -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
 /*-
- * Copyright (c) 2014 Security & Privacy Plug (http://launchpad.net/switchboard-plug-security-privacy)
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 3 of the License, or (at your option) any later version.
- *
- * This library 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
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authored by: Julien Spautz <[e-mail]>
- *              Corentin Noël <[e-mail]>
- */
+* 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: Julien Spautz <[e-mail]>
+*              Corentin Noël <[e-mail]>
+*/
 
 public class SecurityPrivacy.Dialogs.AppChooser : Gtk.Popover {
 
-    const string FALLBACK_ICON = "application-default-icon";
-    public class AppRow : Gtk.Box {
-        public DesktopAppInfo app_info { get; construct; }
-
-        public AppRow (DesktopAppInfo app_info) {
-            Object (app_info: app_info);
-            orientation = Gtk.Orientation.HORIZONTAL;
-
-            var name = app_info.get_display_name ();
-            if (name == null)
-                name = app_info.get_name ();
-            var escaped_name = Markup.escape_text (name);
-            var comment = app_info.get_description ();
-            if (comment == null)
-                comment = "";
-            var escaped_comment = Markup.escape_text (comment);
-
-            margin = 6;
-            spacing = 12;
-
-            var icon_theme = Gtk.IconTheme.get_default ();
-            if (icon_theme.has_icon (app_info.get_icon ().to_string ()))
-                add (new Gtk.Image.from_gicon (app_info.get_icon (), Gtk.IconSize.DND));
-            else
-                add (new Gtk.Image.from_icon_name (FALLBACK_ICON, Gtk.IconSize.DND));
-
-            var label = new Gtk.Label ("<span font_weight=\"bold\" size=\"large\">%s</span>\n%s".printf (escaped_name, escaped_comment));
-            label.use_markup = true;
-            label.halign = Gtk.Align.START;
-            label.ellipsize = Pango.EllipsizeMode.END;
-            add (label);
-
-            show_all ();
-        }
-    }
-
     public signal void app_chosen (DesktopAppInfo app_info);
 
     private Gtk.ListBox list;
@@ -66,37 +30,38 @@
 
     public AppChooser (Gtk.Widget widget) {
         Object (relative_to: widget);
-        setup_gui ();
-        connect_signals ();
-        init_list ();
     }
 
-    void setup_gui () {
-        var grid = new Gtk.Grid ();
-        grid.margin = 12;
-        grid.row_spacing = 6;
-
+    construct {
         search_entry = new Gtk.SearchEntry ();
+        search_entry.margin_end = 12;
+        search_entry.margin_start = 12;
         search_entry.placeholder_text = _("Search Application");
 
         var scrolled = new Gtk.ScrolledWindow (null, null);
         scrolled.height_request = 200;
         scrolled.width_request = 250;
-        scrolled.vscrollbar_policy = Gtk.PolicyType.AUTOMATIC;
-        scrolled.shadow_type = Gtk.ShadowType.IN;
+        scrolled.hscrollbar_policy = Gtk.PolicyType.NEVER;
 
         list = new Gtk.ListBox ();
         list.expand = true;
-        list.height_request = 250;
-        list.width_request = 200;
         list.set_sort_func (sort_function);
         list.set_filter_func (filter_function);
         scrolled.add (list);
 
+        var grid = new Gtk.Grid ();
+        grid.margin_top = 12;
+        grid.row_spacing = 6;
         grid.attach (search_entry, 0, 0, 1, 1);
         grid.attach (scrolled, 0, 1, 1, 1);
 
         add (grid);
+
+        search_entry.grab_focus ();
+        list.row_activated.connect (on_app_selected);
+        search_entry.search_changed.connect (apply_filter);
+
+        init_list ();
     }
 
     public void init_list () {
@@ -135,11 +100,6 @@
             || search in description.down ();
     }
 
-    void connect_signals () {
-        list.row_activated.connect (on_app_selected);
-        search_entry.search_changed.connect (apply_filter);
-    }
-
     void on_app_selected (Gtk.ListBoxRow list_box_row) {
         var app_row = list_box_row.get_child () as AppRow;
         app_chosen (app_row.app_info);

=== added file 'src/Widgets/AppRow.vala'
--- src/Widgets/AppRow.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/AppRow.vala	2017-02-22 18:16:51 +0000
@@ -0,0 +1,82 @@
+/*-
+* 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: Julien Spautz <[e-mail]>
+*              Corentin Noël <[e-mail]>
+*/
+
+public class AppRow : Gtk.Grid {
+    public DesktopAppInfo app_info { get; construct; }
+
+    public AppRow (DesktopAppInfo app_info) {
+        Object (app_info: app_info);
+    }
+
+    construct {
+        var image = new Gtk.Image.from_icon_name (get_icon_name (), Gtk.IconSize.DND);
+        image.pixel_size = 32;
+
+        var app_name = new Gtk.Label (get_app_name ());
+        app_name.get_style_context ().add_class ("h3");
+        app_name.xalign = 0;
+
+        var app_comment = new Gtk.Label ("<span font_size='small'>" + get_app_comment () + "</span>");
+        app_comment.xalign = 0;
+        app_comment.use_markup = true;
+
+        margin = 6;
+        margin_end = 12;
+        margin_start = 10; // Account for icon position on the canvas
+        column_spacing = 12;
+        attach (image, 0, 0, 1, 2);
+        attach (app_name, 1, 0, 1, 1);
+        attach (app_comment, 1, 1, 1, 1);
+
+        show_all ();
+    }
+
+    private string get_app_comment () {
+        var comment = app_info.get_description ();
+
+        if (comment == null) {
+            comment = "";
+        }
+
+        return Markup.escape_text (comment);
+    }
+
+    private string get_app_name () {
+        var name = app_info.get_display_name ();
+
+        if (name == null) {
+            name = app_info.get_name ();
+        }
+
+        return Markup.escape_text (name);
+    }
+
+    private string get_icon_name () {
+        var icon_theme = Gtk.IconTheme.get_default ();
+
+        if (icon_theme.has_icon (app_info.get_icon ().to_string ())) {
+            return app_info.get_icon ().to_string ();
+        } else {
+            return "application-default-icon";
+        }
+    }
+}