Merge lp:~vikoadi/switchboard-plug-locale/missing-locale into lp:~elementary-apps/switchboard-plug-locale/trunk

[Viko Adi Rahmawan]

Suggest installation of incomplete language packages in InfoBar

Suggest installation of incomplete language packages in InfoBar

this one use "check-language-support" command to find missing packages

[lp:~vikoadi/switchboard-plug-locale/missing-locale]

55. By Viko Adi Rahmawan on 2014-12-10

clean code style

[PerfectCarl (name-is-carl)]

get_missing_languages should be async not to block the UI if for any reason the command "/usr/bin/check-language-support" takes time or hangs.

[lp:~vikoadi/switchboard-plug-locale/missing-locale]

56. By Viko Adi Rahmawan on 2014-12-11

asynchronously query missing language packages

[Danielle Foré (danrabbit)]

Maybe a better string would be like "Install Language Support" or "Complete Install" or something. I'm not sure "Install Missing" sounds right as an English string since "missing" is an adjective and not a noun.

Otherwise, I think this is an acceptable fix.

review: Approve (ux)

[David Gomes (davidgomes)]

Shouldn't this better clarify which packages it is installing? It seemed really simple for me, but I have no idea, as a user, of what just happened.

[Viko Adi Rahmawan (vikoadi)]

I would love to hear UX sugestion on how we list installed packaged,

How do we list missing package?
How do we show installation progress?
How do we cancel installation?

[lp:~vikoadi/switchboard-plug-locale/missing-locale]

57. By Viko Adi Rahmawan on 2014-12-12

change install button label, cleaning code

58. By Viko Adi Rahmawan on 2014-12-13

show installation and removal progress

59. By Viko Adi Rahmawan on 2014-12-13

code cleaning

[Viko Adi Rahmawan (vikoadi)]

show installation and removal progress
provide cancel button

[lp:~vikoadi/switchboard-plug-locale/missing-locale]

60. By Viko Adi Rahmawan on 2014-12-14

oops, forget to bzr add

[Viko Adi Rahmawan (vikoadi)]

add InstallInfobar.vala

[lp:~vikoadi/switchboard-plug-locale/missing-locale]

61. By Viko Adi Rahmawan on 2014-12-14

add copyright text

[Corentin Noël (tintou)]

It does the job, needed feature.

[Corentin Noël (tintou)]

review: Approve

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-06-09 19:13:14 +0000
+++ src/CMakeLists.txt	2014-12-14 05:12:27 +0000
@@ -23,6 +23,7 @@
     Widgets/LanguageEntry.vala
     Widgets/InstallEntry.vala
     Widgets/InstallPopover.vala
+    Widgets/InstallInfoBar.vala
     ${CMAKE_CURRENT_BINARY_DIR}/config.vala
 PACKAGES
     gtk+-3.0
@@ -42,4 +43,4 @@
 target_link_libraries(${PLUGNAME} ${DEPS_LIBRARIES})
 
 # Installation
-install (TARGETS ${PLUGNAME} DESTINATION ${PKGDATADIR})
\ No newline at end of file
+install (TARGETS ${PLUGNAME} DESTINATION ${PKGDATADIR})

=== modified file 'src/Installer/UbuntuInstaller.vala'
--- src/Installer/UbuntuInstaller.vala	2014-05-01 19:51:14 +0000
+++ src/Installer/UbuntuInstaller.vala	2014-12-14 05:12:27 +0000
@@ -18,9 +18,22 @@
     static const string LOCALES_REMOVER = "/usr/share/locales/install-language-pack";
 
     AptdProxy aptd;
+    AptdTransactionProxy proxy;
+
+    string []? missing_packages = null;
+    public bool install_cancellable;
+    public TransactionMode transaction_mode;
 
     public signal void install_finished (string langcode);
     public signal void remove_finished (string langcode);
+    public signal void check_missing_finished (string [] missing);
+    public signal void progress_changed (int progress);
+
+    public enum TransactionMode {
+        INSTALL,
+        REMOVE,
+        INSTALL_MISSING,
+    }
 
     Gee.HashMap<string, string> transactions;
 
@@ -38,6 +51,7 @@
     }
 
     public void install (string language) {
+        transaction_mode = TransactionMode.INSTALL;
         var packages = get_remaining_packages_for_language (language);
 
         foreach (var packet in packages) {
@@ -53,14 +67,54 @@
             } catch (Error e) {
                 warning ("Could not queue downloads: %s", e.message);
             }
-            
-
-        });
-
+
+
+        });
+
+    }
+
+    public void install_packages (string [] packages) {
+        foreach (var packet in packages) {
+            message ("will install: %s", packet);
+        }
+
+        aptd.install_packages.begin (packages, (obj, res) => {
+
+            try {
+                var transaction_id = aptd.install_packages.end (res);
+                transactions.@set (transaction_id, "install-missing");
+                run_transaction (transaction_id);
+            } catch (Error e) {
+                warning ("Could not queue downloads: %s", e.message);
+            }
+        });
+
+    }
+
+    public void check_missing_languages () {
+        Utils.get_missing_languages.begin ((obj, res) => {
+                try {
+                    missing_packages = Utils.get_missing_languages.end (res);
+
+                    if (missing_packages != null)
+                        check_missing_finished (missing_packages);
+                } catch (Error e) {
+                    warning ("cant parse missing language:%s", e.message);
+                }
+        });
+
+    }
+
+    public void install_missing_languages () {
+        if (missing_packages == null || missing_packages.length == 0)
+            return;
+        transaction_mode = TransactionMode.INSTALL_MISSING;
+
+        install_packages (missing_packages);
     }
 
     public void remove (string languagecode) {
-
+        transaction_mode = TransactionMode.REMOVE;
 
         var installed = get_to_remove_packages_for_language (languagecode);
 
@@ -79,13 +133,31 @@
 
     }
 
+    public void cancel_install () {
+        if (install_cancellable) {
+            warning ("cancel_install");
+            try {
+                proxy.cancel ();
+            } catch (Error e) {
+                warning ("cannot cancel installation:%s", e.message);
+            }
+        }
+    }
+
     void run_transaction (string transaction_id) {
 
-        var proxy = new AptdTransactionProxy ();
+        proxy = new AptdTransactionProxy ();
         proxy.finished.connect (() => {
             on_apt_finshed (transaction_id, true);
         });
 
+        proxy.property_changed.connect ((prop, val) => {
+            if (prop == "Progress")
+                progress_changed ((int) val.get_int32 ());
+            if (prop == "Cancellable")
+                install_cancellable = val.get_boolean ();
+        });
+
         try {
             proxy.connect_to_aptd (transaction_id);
             proxy.simulate ();
@@ -110,6 +182,11 @@
         }
 
         var action = transactions.get (id);
+        if (action == "install-missing") {
+            install_finished ("");
+            transactions.unset (id);
+            return;
+        }
         var lang = action[2:action.length];
 
         message ("ID %s -> %s", id, success ? "success" : "failed");
@@ -188,4 +265,4 @@
         return output.strip ().split (" ");
 
     }
-}
\ No newline at end of file
+}

=== modified file 'src/Installer/aptd-client.vala'
--- src/Installer/aptd-client.vala	2014-04-09 17:30:07 +0000
+++ src/Installer/aptd-client.vala	2014-12-14 05:12:27 +0000
@@ -37,6 +37,7 @@
     public abstract void simulate () throws IOError;
     public abstract void cancel () throws IOError;
     public signal void finished (string exit_state);
+    public signal void property_changed (string property, Variant val);
   }
   
   public class AptdProxy: GLib.Object
@@ -69,6 +70,7 @@
   public class AptdTransactionProxy: GLib.Object
   {
     public signal void finished (string transaction_id);
+    public signal void property_changed (string property, Variant variant);
 
     public void connect_to_aptd (string transaction_id) throws IOError
     {
@@ -78,6 +80,9 @@
           debug ("aptd transaction finished: %s\n", exit_state);
           finished (transaction_id);
         });
+      _aptd_service.property_changed.connect ((prop, variant) => {
+          property_changed (prop, variant);
+        });
     }
 
     public void simulate () throws IOError
@@ -90,5 +95,10 @@
       _aptd_service.run ();
     }
 
+    public void cancel () throws IOError
+    {
+      _aptd_service.cancel ();
+    }
+
     private AptdTransactionService _aptd_service;
   }

=== modified file 'src/Plug.vala'
--- src/Plug.vala	2014-05-07 11:39:44 +0000
+++ src/Plug.vala	2014-12-14 05:12:27 +0000
@@ -32,6 +32,7 @@
     LocaleManager lm;
 
     Gtk.InfoBar infobar;
+    Gtk.InfoBar missing_lang_infobar;
     Gtk.Grid grid;
     Gtk.Box top_box;
 
@@ -149,6 +150,47 @@
             infobar.show_all ();
         });
 
+        var install_infobar = new InstallInfoBar ();
+        install_infobar.hide ();
+        install_infobar.cancel_clicked.connect (() => {
+            language_list.cancel_install ();
+        });
+
+        missing_lang_infobar = new Gtk.InfoBar ();
+        missing_lang_infobar.message_type = Gtk.MessageType.INFO;
+
+        var missing_content = missing_lang_infobar.get_content_area () as Gtk.Box;
+
+        var missing_label = new Gtk.Label (_("Language support is not installed completely"));
+
+        var install_missing = new Gtk.Button.with_label (_("Complete Installation"));
+        install_missing.clicked.connect (() => {
+            missing_lang_infobar.hide ();
+
+            language_list.install_missing_languages ();
+        });
+        language_list.check_missing_finished.connect ((missing) => {
+            if (missing.length > 0) {
+                missing_lang_infobar.show ();
+                missing_lang_infobar.show_all ();
+            } else {
+                missing_lang_infobar.hide ();
+            }
+        });
+
+        missing_content.pack_start (missing_label, false);
+        missing_content.pack_end (install_missing, false);
+
+        language_list.settings_changed.connect (() => {
+            infobar.no_show_all = false;
+            infobar.show_all ();
+        });
+        language_list.progress_changed.connect((progress) => {
+            install_infobar.set_progress (progress);
+            install_infobar.set_cancellable (language_list.install_cancellable);
+            install_infobar.set_transaction_mode (language_list.get_transaction_mode ());
+        });
+
         try {
 
             var permission = new Polkit.Permission.sync ("org.freedesktop.locale1.set-locale", Polkit.UnixProcess.new (Posix.getpid ()));
@@ -157,7 +199,7 @@
             apply_button.label = _("Apply for login screen, guest account and new users");
             apply_button.halign = Gtk.Align.CENTER;
             apply_button.margin = 12;
-            grid.attach (apply_button, 0, 4, 4, 1);
+            grid.attach (apply_button, 0, 6, 4, 1);
 
             permission.notify["allowed"].connect (() => {
                 if (permission.allowed) {
@@ -170,14 +212,16 @@
                 critical (e.message);
         }
 
-        
+
         sw.show ();
         header_entry.show_all ();
 
         grid.attach (infobar, 0, 0, 4, 1);
-        grid.attach (header_entry, 0, 1, 4, 1);
-        grid.attach (top_box, 0, 2, 4, 1);
-        grid.attach (sw, 0, 3, 4, 1);
+        grid.attach (missing_lang_infobar, 0, 1, 4, 1);
+        grid.attach (install_infobar, 0, 2, 4, 1);
+        grid.attach (header_entry, 0, 3, 4, 1);
+        grid.attach (top_box, 0, 4, 4, 1);
+        grid.attach (sw, 0, 5, 4, 1);
         grid.show ();
 
     }
@@ -194,4 +238,4 @@
     debug ("Activating About plug");
     var plug = new Locale.Plug ();
     return plug;
-}
\ No newline at end of file
+}

=== modified file 'src/Utils.vala'
--- src/Utils.vala	2014-06-09 19:07:35 +0000
+++ src/Utils.vala	2014-12-14 05:12:27 +0000
@@ -41,6 +41,41 @@
         
     }
 
+    public static async string []? get_missing_languages () {
+
+        /* string output; */
+        string final = null;
+        Pid pid;
+        int input;
+        int output;
+        int error;
+
+        try {
+            Process.spawn_async_with_pipes (null,
+                {"check-language-support", null},
+                Environ.get (),
+                SpawnFlags.SEARCH_PATH,
+                null,
+                out pid,
+                out input,
+                out output,
+                out error);
+            UnixInputStream read_stream = new UnixInputStream (output, true);
+            DataInputStream out_channel = new DataInputStream (read_stream);
+            string line = null;
+            final = "";
+            while ((line = yield out_channel.read_line_async (Priority.DEFAULT)) != null) {
+                final += line;
+            }
+
+            if (final != null)
+                return final.strip ().split (" ");
+            else
+                return null;
+        } catch (Error e) {
+            return null;
+        }
+    }
     public static Gee.ArrayList<string>? get_installed_locales () {
 
         string output;
@@ -71,6 +106,7 @@
 
     }
 
+
     public static string translate_language (string lang) {
         Intl.textdomain ("iso_639");
         var lang_name = dgettext ("iso_639", lang);
@@ -102,4 +138,4 @@
         }
         return instance;
     }
-}
\ No newline at end of file
+}

=== added file 'src/Widgets/InstallInfoBar.vala'
--- src/Widgets/InstallInfoBar.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/InstallInfoBar.vala	2014-12-14 05:12:27 +0000
@@ -0,0 +1,71 @@
+/***
+  Copyright (C) 2011-2012 Switchboard Locale Plug Developers
+  This program is free software: you can redistribute it and/or modify it
+  under the terms of the GNU Lesser General Public License version 3, as published
+  by the Free Software Foundation.
+  This program is distributed in the hope that it will be useful, but
+  WITHOUT ANY WARRANTY; without even the implied warranties of
+  MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+  PURPOSE. See the GNU General Public License for more details.
+  You should have received a copy of the GNU General Public License along
+  with this program. If not, see 
+***/
+
+public class InstallInfoBar : Gtk.InfoBar {
+    protected Gtk.Box box;
+    protected Gtk.Label label;
+    protected Gtk.ProgressBar progress;
+    protected Gtk.Button cancel_button;
+
+    private bool _install_cancellable;
+    public void set_cancellable (bool cancellable) {
+        _install_cancellable = cancellable;
+        cancel_button.set_sensitive (_install_cancellable);
+    }
+
+    public signal void cancel_clicked ();
+
+    public InstallInfoBar () {
+        this.message_type = Gtk.MessageType.INFO;
+
+        box = get_content_area () as Gtk.Box;
+
+        label = new Gtk.Label (null);
+
+        progress = new Gtk.ProgressBar ();
+
+        cancel_button = new Gtk.Button.with_label (_("Cancel"));
+        cancel_button.clicked.connect (() => {
+            hide ();
+            cancel_clicked ();
+        });
+
+        box.pack_start (label, false);
+        box.pack_end (cancel_button, false);
+        box.pack_end (progress, false);
+
+        show_all ();
+    }
+
+    public void set_transaction_mode (UbuntuInstaller.TransactionMode transaction_mode) {
+        switch (transaction_mode) {
+            case UbuntuInstaller.TransactionMode.INSTALL:
+                label.set_label (_("installing language"));
+                break;
+            case UbuntuInstaller.TransactionMode.REMOVE:
+                label.set_label (_("removing language"));
+                break;
+            case UbuntuInstaller.TransactionMode.INSTALL_MISSING:
+                label.set_label (_("installing missing language"));
+                break;
+        }
+    }
+
+    public void set_progress (int progress) {
+        if (progress >= 100)
+            hide ();
+        else
+            show ();
+        this.progress.set_fraction(progress/100.0);
+    }
+}

=== modified file 'src/Widgets/LanguageList.vala'
--- src/Widgets/LanguageList.vala	2014-05-07 12:25:29 +0000
+++ src/Widgets/LanguageList.vala	2014-12-14 05:12:27 +0000
@@ -14,12 +14,18 @@
 public class LanguageList : Gtk.ListBox {
 
 	public signal void settings_changed ();
+	public signal void check_missing_finished (string [] missing);
+	public signal void progress_changed (int progress);
 
     InstallPopover language_popover;
     InstallEntry install_entry;
 
     UbuntuInstaller li;
 
+    public bool install_cancellable {
+        get {return li.install_cancellable;}
+    }
+
     public Gtk.RadioButton language_button = new Gtk.RadioButton (null);
     public Gtk.RadioButton format_button = new Gtk.RadioButton (null);
 
@@ -49,6 +55,11 @@
         li = new UbuntuInstaller ();
         li.install_finished.connect (on_install_finished);
         li.remove_finished.connect (on_remove_finished);
+        li.check_missing_languages ();
+        li.check_missing_finished.connect (on_check_missing_finished);
+        li.progress_changed.connect ((progress) => {
+            progress_changed (progress);
+        });
         
         lm = LocaleManager.get_default ();
         
@@ -76,6 +87,8 @@
             add_locale (locale);
         }
 
+        li.check_missing_languages ();
+
         requery_display ();
 
     }
@@ -137,6 +150,8 @@
         reload_languages ();
         install_entry.install_complete ();
 
+        li.check_missing_languages ();
+
     }
 
     void on_deletion_requested (string locale) {
@@ -160,6 +175,20 @@
 
     }
 
+    void on_check_missing_finished (string [] missing) {
+        this.set_sensitive (true);
+        check_missing_finished (missing);
+    }
+
+    public void cancel_install () {
+        li.cancel_install ();
+        check_missing_languages ();
+    }
+
+    public UbuntuInstaller.TransactionMode get_transaction_mode () {
+        return li.transaction_mode;
+    }
+
     public void add_language(string locale) {
 
         var langcode = locale.substring (0, 2);
@@ -211,7 +240,14 @@
         }
     }
 
+    public void check_missing_languages () {
+        li.check_missing_languages ();
+    }
 
+    public void install_missing_languages (){
+        this.set_sensitive (false);
+        li.install_missing_languages ();
+    }
 
     void on_language_changed (UpdateType type, string lang) {
         if (update_lock) 
@@ -295,4 +331,4 @@
         return true;
 
     }
-}
\ No newline at end of file
+}