Merge lp:~artem-anufrij/webby-browser/reload-apps-after-added-new-app into lp:webby-browser

[Artem Anufrij]

Reload preview after adding a new app.

Reload preview after adding a new app.

[Erasmo Marín (erasmo-marin)]

This is great, just 2 details:

1) Can you explicitly declare the new attributes as private please?
2) Would be cool if the new added app is selected when you are back to the icon view.

Thanks! :)

review: Needs Fixing (code & functionality)

[lp:~artem-anufrij/webby-browser/reload-apps-after-added-new-app]

14. By Artem Anufrij on 2015-10-11

var -> private; select last item after insert new app

[Artem Anufrij (artem-anufrij)]

1) done
2) done

Unmerged revisions

=== modified file 'src/AppWindow.vala'
--- src/AppWindow.vala	2015-02-26 20:16:44 +0000
+++ src/AppWindow.vala	2015-10-11 13:32:23 +0000
@@ -1,23 +1,27 @@
 public class AppWindow : Gtk.ApplicationWindow {
 
+    private Gtk.Stack stack;
+    private Gtk.HeaderBar headerbar;
+    private Gtk.Button back_button;
+
     public AppWindow () {
 
         set_default_size (700, 500);
         set_wmclass("Webby", "Webby");
 
         //headerbar
-        var headerbar = new Gtk.HeaderBar ();
+        headerbar = new Gtk.HeaderBar ();
         headerbar.show_close_button = true;
         headerbar.title = "Webby";
         this.set_titlebar (headerbar);
 
-        var back_button = new Gtk.Button.with_label(_("Applications"));
+        back_button = new Gtk.Button.with_label(_("Applications"));
         back_button.get_style_context().add_class("back-button");
-        
+
         var apps_view = new ApplicationsView();
         var assistant = new WebbyAssistant();
-        var stack = new Gtk.Stack ();
-        stack.set_transition_duration (500); 
+        stack = new Gtk.Stack ();
+        stack.set_transition_duration (500);
 
         stack.add_named (apps_view, "apps_view");
         stack.add_named (assistant, "assistant");
@@ -25,22 +29,35 @@
 
         add (stack);
 
-        apps_view.add_request.connect( () => {
-            stack.set_transition_type (Gtk.StackTransitionType.SLIDE_LEFT);
-            stack.set_visible_child_name("assistant");
-            headerbar.pack_start (back_button);
-            back_button.show_all ();
-            //fix ugly border at the bottom of headerbar
-            queue_draw ();
-        });
-
-        back_button.clicked.connect ( () => {
-            stack.set_transition_type (Gtk.StackTransitionType.SLIDE_RIGHT);
-            stack.set_visible_child_name("apps_view");
-            headerbar.remove (back_button);
+        apps_view.add_request.connect (() => {
+            show_assistant ();
+        });
+
+        assistant.application_created.connect ((new_file) => {
+            show_apps_view ();
+            apps_view.add_button (new_file);
+            apps_view.select_last_item ();
+        });
+
+        back_button.clicked.connect (() => {
+            show_apps_view ();
         });
 
         this.destroy.connect (Gtk.main_quit);
     }
 
+    private void show_assistant () {
+        stack.set_transition_type (Gtk.StackTransitionType.SLIDE_LEFT);
+        stack.set_visible_child_name("assistant");
+        headerbar.pack_start (back_button);
+        back_button.show_all ();
+        //fix ugly border at the bottom of headerbar
+        queue_draw ();
+    }
+
+    private void show_apps_view () {
+        stack.set_transition_type (Gtk.StackTransitionType.SLIDE_RIGHT);
+        stack.set_visible_child_name("apps_view");
+        headerbar.remove (back_button);
+    }
 }

=== modified file 'src/ApplicationsView.vala'
--- src/ApplicationsView.vala	2015-03-23 21:19:58 +0000
+++ src/ApplicationsView.vala	2015-10-11 13:32:23 +0000
@@ -19,6 +19,14 @@
         icon_view.row_spacing = 15;
         icon_view.margin = 15;
 
+        load_applications ();
+
+        scrolled.add(icon_view);
+        this.pack_start(scrolled, true, true, 0);
+
+    }
+
+    public void load_applications () {
 
         var add_button = new Gtk.Button ();
         var add_image = new Gtk.Image();
@@ -36,20 +44,25 @@
         applications = DesktopFile.get_webby_applications();
 
         foreach (GLib.DesktopAppInfo app in applications.values) {
-            var icon = app.get_icon ().to_string ();
-            var name = app.get_display_name ();
-            var image = new ApplicationIcon(icon, name);
-            var desktop_file = new DesktopFile.from_desktopappinfo (app);
-            image.delete_request.connect (()=>{
-                desktop_file.delete_file();
-            });
-            icon_view.add (image);
+            this.add_button (app);
         }
 
-        scrolled.add(icon_view);
-        this.pack_start(scrolled, true, true, 0);
         this.show_all();
     }
+
+    public void add_button (GLib.DesktopAppInfo app) {
+        var image = new ApplicationIcon(app.get_icon ().to_string (), app.get_display_name ());
+        var desktop_file = new DesktopFile.from_desktopappinfo (app);
+        image.delete_request.connect (()=>{
+            desktop_file.delete_file();
+        });
+        icon_view.add (image);
+        icon_view.show_all ();
+    }
+
+    public void select_last_item () {
+        icon_view.select_child (icon_view.get_child_at_index ((int)icon_view.get_children ().length () - 1));
+    }
 }
 
 

=== modified file 'src/Assistant.vala'
--- src/Assistant.vala	2015-02-27 02:49:54 +0000
+++ src/Assistant.vala	2015-10-11 13:32:23 +0000
@@ -1,5 +1,7 @@
 public class WebbyAssistant : Gtk.Box {
 
+    public signal void application_created (GLib.DesktopAppInfo? new_file);
+
     private Gtk.Label message;
     private Gtk.Button icon_button;
     private Gtk.Entry app_name_entry;
@@ -13,7 +15,7 @@
     private Gtk.Button accept_button;
     private GLib.Regex protocol_regex;
     private Gee.HashMap<string, GLib.AppInfo> apps;
-    
+
     private string default_app_icon = "application-default-icon";
 
     private bool app_name_valid = false;
@@ -70,7 +72,7 @@
         icon_chooser_button.grab_focus ();
 
         icon_selector_popover.add (popover_box);
-        
+
         //TODO: categories
         //combobox
 
@@ -265,12 +267,8 @@
 
         if (app_icon_valid && app_name_valid && app_url_valid) {
             var desktop_file = new DesktopFile (name, url, icon);
-            desktop_file.save_to_file ();
             reset_fields ();
-            print("dialog");
-            var dialog = new InfoDialog (_("App created"), _("The application shortcut was successfully created"), "dialog-information");
-            dialog.show_all ();
-            dialog.response.connect (()=>{dialog.destroy();});
+            application_created (desktop_file.save_to_file ());
         }
     }
 }

=== modified file 'src/DesktopFile.vala'
--- src/DesktopFile.vala	2015-02-26 20:16:44 +0000
+++ src/DesktopFile.vala	2015-10-11 13:32:23 +0000
@@ -41,15 +41,14 @@
         file = new GLib.KeyFile();
         file.load_from_file (filename, KeyFileFlags.NONE);
         file.set_string ("Desktop Entry", propertie, val);
-        file.save_to_file (filename);
-        return true;
+        return file.save_to_file (filename);
     }
 
-    public bool save_to_file () {
+    public GLib.DesktopAppInfo save_to_file () {
         string filename = GLib.Environment.get_user_data_dir () + "/applications/" +file.get_string("Desktop Entry", "Name") + "-webby.desktop";
         print("Desktop file created: " + filename);
         file.save_to_file (filename);
-        return true;
+        return new GLib.DesktopAppInfo.from_filename (filename);
     }
 
     public bool delete_file () {