Merge lp:~elementary-pantheon/switchboard-plug-onlineaccounts/accountview-redesign into lp:~elementary-apps/switchboard-plug-onlineaccounts/trunk

[Danielle Foré]

AccountView.vala:
* Use provider icon
* Put user name and provider name on separate lines
* Remove extra grid
* Don't cast when we don't need to
* Put switch on the outside
* Emails -> Email
* Add apps to the main view

[lp:~elementary-pantheon/switchboard-plug-onlineaccounts/accountview-redesign]

321. By Danielle Foré on 2016-07-21

rename the ACLPopover

=== modified file 'plugins/Providers/FastMail/fastmail-mail.service'
--- plugins/Providers/FastMail/fastmail-mail.service	2016-07-20 16:09:07 +0000
+++ plugins/Providers/FastMail/fastmail-mail.service	2016-07-21 07:55:52 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <service id="fastmail-mail">
   <type>mail</type>
-  <name>Emails</name>
-  <description>Sync your emails</description>
+  <name>Email</name>
+  <description>Sync your email</description>
   <icon>internet-mail</icon>
   <provider>fastmail</provider>
   <translations>pantheon-online-accounts</translations>

=== modified file 'plugins/Providers/Google/google-gmail.service'
--- plugins/Providers/Google/google-gmail.service	2016-04-25 16:14:02 +0000
+++ plugins/Providers/Google/google-gmail.service	2016-07-21 07:55:52 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <service id="google-gmail">
   <type>mail</type>
-  <name>Emails</name>
-  <description>Sync your emails</description>
+  <name>Email</name>
+  <description>Sync your email</description>
   <icon>internet-mail</icon>
   <provider>google</provider>
   <translations>pantheon-online-accounts</translations>

=== modified file 'plugins/Providers/Microsoft/microsoft-mails.service'
--- plugins/Providers/Microsoft/microsoft-mails.service	2016-01-14 21:54:38 +0000
+++ plugins/Providers/Microsoft/microsoft-mails.service	2016-07-21 07:55:52 +0000
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <service id="microsoft-mails">
   <type>mail</type>
-  <name>Emails</name>
-  <description>Sync your emails</description>
+  <name>Email</name>
+  <description>Sync your email</description>
   <icon>internet-mail</icon>
   <provider>microsoft</provider>
   <translations>pantheon-online-accounts</translations>

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2015-09-24 18:33:58 +0000
+++ src/CMakeLists.txt	2016-07-21 07:55:52 +0000
@@ -26,7 +26,7 @@
     OnlineAccounts.vala
     Views/SourceSelector.vala
     Views/AccountView.vala
-    Views/ACLPopover.vala
+    Views/ACListBox.vala
     Authentification/Server.vala
     Authentification/DialogService.vala
     Authentification/RequestQueue.vala

=== modified file 'src/Translation.vala'
--- src/Translation.vala	2016-07-20 16:09:07 +0000
+++ src/Translation.vala	2016-07-21 07:55:52 +0000
@@ -26,8 +26,8 @@
 _("Contacts");
 _("Sync your contacts");
 _("Sync your files");
-_("Emails");
-_("Sync your emails");
+_("Email");
+_("Sync your email");
 _("Sync your photos");
 _("Watch your newsfeed");
 _("Chat with your friends");

=== renamed file 'src/Views/ACLPopover.vala' => 'src/Views/ACListBox.vala'
--- src/Views/ACLPopover.vala	2016-07-20 16:09:07 +0000
+++ src/Views/ACListBox.vala	2016-07-21 07:55:52 +0000
@@ -20,37 +20,25 @@
  * Authored by: Corentin Noël <[e-mail]>
  */
 
-public class OnlineAccounts.ACLPopover : Gtk.Popover {
+public class OnlineAccounts.ACListBox : Gtk.ListBox {
     Ag.Account account;
     Signon.Identity identity;
     unowned Signon.SecurityContextList acl = null;
-    Gtk.ListBox list_box;
     Ag.Service service;
 
-    public ACLPopover (Ag.Account account, Ag.Service service, Signon.Identity identity) {
+    public ACListBox (Ag.Account account, Ag.Service service, Signon.Identity identity) {
         this.account = account;
         this.service = service;
         this.identity = identity;
         account.manager.list_applications_by_service (service).foreach ((app) => {
             var row = new AppRow (account, app, service, identity);
-            list_box.add (row);
+            add (row);
             row.show_all ();
         });
 
         update_acl.begin ();
     }
 
-    construct {
-        height_request = 100;
-        list_box = new Gtk.ListBox ();
-        var scrolled = new Gtk.ScrolledWindow (null, null);
-        scrolled.hscrollbar_policy = Gtk.PolicyType.NEVER;
-        scrolled.margin = 6;
-        scrolled.expand = true;
-        scrolled.add (list_box);
-        add (scrolled);
-    }
-
     private async void update_acl () {
         identity.query_info ((self, info, error) => {
             if (error != null) {
@@ -59,7 +47,7 @@
             }
 
             acl = info.get_access_control_list ();
-            list_box.get_children ().foreach ((child) => {
+            get_children ().foreach ((child) => {
                 var approw = child as AppRow;
                 approw.check_acl (acl);
             });
@@ -67,14 +55,14 @@
     }
 
     public void allow_service () {
-        list_box.get_children ().foreach ((child) => {
+        get_children ().foreach ((child) => {
             var approw = child as AppRow;
             approw.allow_app ();
         });
     }
 
     public void deny_service () {
-        list_box.get_children ().foreach ((child) => {
+        get_children ().foreach ((child) => {
             var approw = child as AppRow;
             approw.deny_app ();
         });
@@ -102,12 +90,15 @@
         construct {
             activatable = false;
             selectable = false;
+            margin = 6;
+
             app_image = new Gtk.Image ();
-            app_image.icon_size = Gtk.IconSize.LARGE_TOOLBAR;
+            app_image.icon_size = Gtk.IconSize.DND;
             app_name = new Gtk.Label (null);
             app_name.halign = Gtk.Align.START;
             app_name.hexpand = true;
             app_switch = new Gtk.Switch ();
+            app_switch.valign = Gtk.Align.CENTER;
             app_switch.activate.connect (() => {
                 if (app_switch.active) {
                     allow_app ();

=== modified file 'src/Views/AccountView.vala'
--- src/Views/AccountView.vala	2015-09-24 17:22:45 +0000
+++ src/Views/AccountView.vala	2016-07-21 07:55:52 +0000
@@ -21,94 +21,79 @@
  */
 
 public class OnlineAccounts.AccountView : Gtk.Grid {
-    Gtk.Grid main_grid;
     OnlineAccounts.Account plugin;
     Signon.Identity identity;
 
     public AccountView (OnlineAccounts.Account plugin) {
+        column_spacing = 6;
+        row_spacing = 3;
+        margin = 24;
         orientation = Gtk.Orientation.VERTICAL;
         this.plugin = plugin;
-        main_grid = new Gtk.Grid ();
-        main_grid.orientation = Gtk.Orientation.VERTICAL;
-        main_grid.margin = 12;
-        main_grid.column_spacing = 6;
-        main_grid.row_spacing = 6;
 
         plugin.account.select_service (null);
         var v_id = plugin.account.get_variant (OnlineAccounts.Account.gsignon_id, null);
         identity = new Signon.Identity.from_db (v_id.get_uint32 ());
 
-        string label_str = plugin.account.manager.get_provider (plugin.account.get_provider_name ()).get_display_name ();
-        var name = plugin.account.get_display_name ();
-        if (name != "" && name != null) {
-            label_str = "%s - %s".printf (plugin.account.get_display_name (), label_str);
-        }
-
-        var user_label = new Gtk.Label (Markup.escape_text (label_str));
-        Granite.Widgets.Utils.apply_text_style_to_label (Granite.TextStyle.H2, user_label);
+        var provider = plugin.account.get_manager ().get_provider (plugin.account.get_provider_name ());
+
+        var provider_image = new Gtk.Image.from_icon_name (provider.get_icon_name (), Gtk.IconSize.DIALOG);
+        provider_image.use_fallback = true;
+
+        var user_label = new Gtk.Label (Markup.escape_text (plugin.account.get_display_name ()));
+        user_label.get_style_context ().add_class ("h2");
         user_label.hexpand = true;
+        user_label.xalign = 0;
 
-        var apps_label = new Gtk.Label ("");
-        apps_label.set_markup ("<b>%s</b>".printf (Markup.escape_text (_("Content to synchronise:"))));
-        ((Gtk.Misc) apps_label).xalign = 0;
-        apps_label.margin_top = 12;
+        var provider_label = new Gtk.Label (provider.get_display_name ());
+        provider_label.xalign = 0;
 
         var scrolled_window = new Gtk.ScrolledWindow (null, null);
         scrolled_window.hscrollbar_policy = Gtk.PolicyType.NEVER;
         scrolled_window.expand = true;
 
         var apps_grid = new Gtk.Grid ();
-        apps_grid.margin_bottom = 12;
-        apps_grid.margin_left = 12;
-        apps_grid.margin_right = 12;
+        apps_grid.margin = 6;
+        apps_grid.margin_top = 12;
         apps_grid.column_spacing = 12;
         apps_grid.row_spacing = 6;
 
-        int i = 1;
+        int i = 0;
         plugin.account.list_services ().foreach ((service) => {
             if (plugin.account.manager.list_applications_by_service (service).length () == 0)
                 return;
 
             unowned string i18n_domain = service.get_i18n_domain ();
 
-            var service_image = new Gtk.Image.from_icon_name (service.get_icon_name (), Gtk.IconSize.DIALOG);
-
-            var service_label = new Gtk.Label ("");
-            service_label.set_markup ("<big>%s</big>".printf (Markup.escape_text (GLib.dgettext (i18n_domain, service.get_display_name ()))));
-            ((Gtk.Misc) service_label).xalign = 0;
+            var service_label = new Gtk.Label (Markup.escape_text (GLib.dgettext (i18n_domain, service.get_display_name ())));
+            service_label.get_style_context ().add_class ("h4");
+            service_label.hexpand = true;
+            service_label.xalign = 0;
 
             var service_switch = new Gtk.Switch ();
+            service_switch.margin_end = 6;
             service_switch.valign = Gtk.Align.CENTER;
             service_switch.tooltip_text = GLib.dgettext (i18n_domain, service.get_description ());
             plugin.account.select_service (service);
             service_switch.active = plugin.account.get_enabled ();
 
-            var app_button = new Gtk.ToggleButton ();
-            app_button.get_style_context ().add_class (Gtk.STYLE_CLASS_FLAT);
-            app_button.image = new Gtk.Image.from_icon_name ("application-menu-symbolic", Gtk.IconSize.MENU);
-            app_button.sensitive = plugin.account.get_enabled ();
-
-            var popover = new ACLPopover (plugin.account, service, identity);
-            popover.relative_to = app_button;
-            popover.hide.connect (() => {
-                app_button.active = false;
-            });
-
-            app_button.toggled.connect (() => {
-                if (app_button.active) {
-                    popover.show_all ();
-                }
-            });
-
-            var app_button_grid = new Gtk.Grid ();
-            app_button_grid.valign = Gtk.Align.CENTER;
-            app_button_grid.add (app_button);
-            service_switch.notify["active"].connect (() => {on_service_switch_activated (service_switch.active, service, app_button, popover);});
-
-            apps_grid.attach (service_image, 1, i, 1, 1);
-            apps_grid.attach (service_label, 2, i, 1, 1);
-            apps_grid.attach (service_switch, 3, i, 1, 1);
-            apps_grid.attach (app_button_grid, 4, i, 1, 1);
+            var acl_list = new ACListBox (plugin.account, service, identity);
+
+            var frame = new Gtk.Frame (null);
+            frame.margin_bottom = 12;
+            frame.add (acl_list);
+
+            var acl_revealer = new Gtk.Revealer ();
+            acl_revealer.reveal_child = service_switch.active;
+            acl_revealer.add (frame);
+
+            service_switch.bind_property ("active", acl_revealer, "reveal-child", BindingFlags.DEFAULT);
+            service_switch.notify["active"].connect (() => {on_service_switch_activated (service_switch.active, service, acl_list);});
+
+            apps_grid.attach (service_label, 0, i, 1, 1);
+            apps_grid.attach (service_switch, 1, i, 1, 1);
+            i++;
+            apps_grid.attach (acl_revealer, 0, i, 2, 1);
             i++;
         });
 
@@ -118,29 +103,22 @@
             var alert = new Granite.Widgets.AlertView (_("No Apps"), no_service_label, "applications-internet-symbolic");
             this.add (alert);
         } else {
-            var fake_grid_l = new Gtk.Grid ();
-            fake_grid_l.hexpand = true;
-            var fake_grid_r = new Gtk.Grid ();
-            fake_grid_r.hexpand = true;
-            apps_grid.attach (fake_grid_l, 0, 0, 1, 1);
-            apps_grid.attach (fake_grid_r, 5, 0, 1, 1);
-
             scrolled_window.add_with_viewport (apps_grid);
-            main_grid.add (user_label);
-            this.add (main_grid);
-            this.add (scrolled_window);
-            apps_grid.attach (apps_label, 1, 0, 2, 1);
+
+            attach (provider_image, 0, 0, 1, 2);
+            attach (user_label, 1, 0, 1, 1);
+            attach (provider_label, 1, 1, 1, 1);
+            attach (scrolled_window, 0, 2, 2, 1);
         }
     }
 
-    private void on_service_switch_activated (bool enabled, Ag.Service service, Gtk.Button button, ACLPopover popover) {
-        button.sensitive = enabled;
+    private void on_service_switch_activated (bool enabled, Ag.Service service, ACListBox listbox) {
         plugin.account.select_service (service);
         plugin.account.set_enabled (enabled);
         if (enabled) {
-            popover.allow_service ();
+            listbox.allow_service ();
         } else {
-            popover.deny_service ();
+            listbox.deny_service ();
         }
     }
 }