Merge lp:~artem-anufrij/webby-browser/edit-functionality into lp:webby-browser

[Artem Anufrij]

edit functionality was implemented

edit functionality was implemented

[Erasmo Marín (erasmo-marin)]

I like your approach with enum

review: Approve (all)

=== modified file 'src/AppWindow.vala'
--- src/AppWindow.vala	2015-10-11 13:32:10 +0000
+++ src/AppWindow.vala	2015-10-12 21:56:20 +0000
@@ -4,6 +4,8 @@
     private Gtk.HeaderBar headerbar;
     private Gtk.Button back_button;
 
+    private WebbyAssistant assistant;
+
     public AppWindow () {
 
         set_default_size (700, 500);
@@ -19,7 +21,7 @@
         back_button.get_style_context().add_class("back-button");
 
         var apps_view = new ApplicationsView();
-        var assistant = new WebbyAssistant();
+        assistant = new WebbyAssistant();
         stack = new Gtk.Stack ();
         stack.set_transition_duration (500);
 
@@ -33,12 +35,21 @@
             show_assistant ();
         });
 
+        apps_view.edit_request.connect ((desktop_file) => {
+            show_assistant (desktop_file);
+        });
+
         assistant.application_created.connect ((new_file) => {
             show_apps_view ();
             apps_view.add_button (new_file);
             apps_view.select_last_item ();
         });
 
+        assistant.application_edited.connect ((edited_file) => {
+            show_apps_view ();
+            apps_view.update_button (edited_file);
+        });
+
         back_button.clicked.connect (() => {
             show_apps_view ();
         });
@@ -46,18 +57,22 @@
         this.destroy.connect (Gtk.main_quit);
     }
 
-    private void show_assistant () {
+    private void show_assistant (DesktopFile? desktop_file = null) {
         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 ();
+
+        if (desktop_file != null)
+            assistant.edit_desktop_file (desktop_file);
     }
 
     private void show_apps_view () {
         stack.set_transition_type (Gtk.StackTransitionType.SLIDE_RIGHT);
         stack.set_visible_child_name("apps_view");
         headerbar.remove (back_button);
+        assistant.reset_fields ();
     }
 }

=== modified file 'src/ApplicationsView.vala'
--- src/ApplicationsView.vala	2015-10-11 13:32:10 +0000
+++ src/ApplicationsView.vala	2015-10-12 21:56:20 +0000
@@ -1,6 +1,7 @@
 public class ApplicationsView : Gtk.Box {
 
     public signal void add_request();
+    public signal void edit_request(DesktopFile desktop_file);
 
     private Gtk.FlowBox icon_view;
     private Gee.HashMap<string, GLib.DesktopAppInfo> applications;
@@ -51,10 +52,14 @@
     }
 
     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();
+        var image = new ApplicationIcon (app);
+        image.edit_request.connect ((desktop_file) => {
+            edit_request (desktop_file);
+            icon_view.unselect_all ();
+        });
+        image.deleted.connect ((parent) => {
+            this.icon_view.remove (parent);
+            this.select_first_item ();
         });
         icon_view.add (image);
         icon_view.show_all ();
@@ -63,6 +68,24 @@
     public void select_last_item () {
         icon_view.select_child (icon_view.get_child_at_index ((int)icon_view.get_children ().length () - 1));
     }
+
+    public void select_first_item () {
+        icon_view.select_child (icon_view.get_child_at_index (0));
+    }
+
+    public void update_button (GLib.DesktopAppInfo app) {
+        foreach (var item in icon_view.get_children ()) {
+            if ((item as Gtk.FlowBoxChild).get_child () is ApplicationIcon) {
+                var app_icon = (item as Gtk.FlowBoxChild).get_child () as ApplicationIcon;
+
+                if (app_icon.desktop_file.name == app.get_display_name ()) {
+                    app_icon.set_new_desktopfile (new DesktopFile.from_desktopappinfo (app));
+                    icon_view.select_child (item as Gtk.FlowBoxChild);
+                    break;
+                }
+            }
+        }
+    }
 }
 
 
@@ -74,14 +97,63 @@
     Gtk.Box box;
     Gtk.ActionGroup action_group;
 
-    public signal void delete_request ();
-
-    public ApplicationIcon (string icon, string label_str) {
+    internal DesktopFile desktop_file { get; private set; }
+
+    public signal void deleted (Gtk.Container? parent);
+    public signal void edit_request (DesktopFile desktop_file);
+
+    public ApplicationIcon (GLib.DesktopAppInfo app) {
+        this.desktop_file = new DesktopFile.from_desktopappinfo (app);
+
         hexpand = false;
         vexpand = false;
 
-        label = new Gtk.Label (label_str);
-
+        label = new Gtk.Label (this.desktop_file.name);
+
+        set_icon (this.desktop_file.icon);
+
+        this.margin = 6;
+        this.margin_start = 20;
+        this.margin_end = 20;
+
+        var menu = new ActionMenu ();
+        menu.halign = Gtk.Align.CENTER;
+        menu.delete_clicked.connect (() => { remove_application (); });
+        menu.edit_clicked.connect (() => { edit_request (desktop_file); });
+
+        box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+        box.pack_start (image, false, false, 0);
+        box.pack_start (label, false, false, 0);
+        box.pack_start (menu, false, false, 0);
+
+        box.hexpand = false;
+        box.vexpand = false;
+
+        var event_box = new Gtk.EventBox ();
+        event_box.add (box);
+        event_box.events |= Gdk.EventMask.ENTER_NOTIFY_MASK|Gdk.EventMask.LEAVE_NOTIFY_MASK;
+
+        event_box.enter_notify_event.connect ((event) => {
+            menu.set_reveal_child (true);
+            return false;
+        });
+
+        event_box.leave_notify_event.connect ((event) => {
+            if (event.detail == Gdk.NotifyType.INFERIOR)
+                return false;
+            menu.set_reveal_child (false);
+            return false;
+        });
+
+        this.add (event_box);
+    }
+
+    public void set_new_desktopfile (DesktopFile desktop_file) {
+        this.desktop_file = desktop_file;
+        set_icon (this.desktop_file.icon);
+    }
+
+    private void set_icon (string icon) {
         if (File.new_for_path (icon).query_exists ()) {
             var pix = new Gdk.Pixbuf.from_file (icon);
 
@@ -97,7 +169,11 @@
                 new_height = new_height * pix.height / pix.width;
                 margin_vertical = (new_width - new_height) / 2;
             }
-            image = new Gtk.Image.from_pixbuf (pix.scale_simple (new_width, new_height, Gdk.InterpType.BILINEAR));
+            if (image == null)
+                image = new Gtk.Image.from_pixbuf (pix.scale_simple (new_width, new_height, Gdk.InterpType.BILINEAR));
+            else
+                image.set_from_pixbuf (pix.scale_simple (new_width, new_height, Gdk.InterpType.BILINEAR));
+
             image.margin_top = margin_vertical;
             image.margin_bottom = margin_vertical;
             image.margin_right = margin_horizontal;
@@ -107,48 +183,38 @@
             image.icon_name = icon;
             image.pixel_size = 64;
         }
-
-        this.margin = 5;
-        this.margin_start = 20;
-        this.margin_end = 20;
-
-        box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
-        box.pack_start (image, false, false, 0);
-        box.pack_start (label, false, false, 0);
-        box.hexpand = false;
-        box.vexpand = false;
-
-        conf_btn = new Gtk.MenuButton();
-        conf_btn.valign = Gtk.Align.START;
-        conf_btn.halign = Gtk.Align.END;
-        conf_btn.get_style_context ().remove_class ("button");
-        conf_btn.get_style_context ().add_class ("titlebutton");
-        conf_btn.set_image (new Gtk.Image.from_icon_name("document-properties", Gtk.IconSize.MENU));
-
-        build_menu ();
-
-        this.add (box);
-        this.add_overlay (conf_btn);
     }
 
     private void remove_application () {
-        delete_request ();
-        this.get_parent().get_parent().remove(this.get_parent());
+        desktop_file.delete_file ();
+        deleted (this.get_parent());
         this.destroy ();
     }
-
-    private void build_menu () {
-
-		Gtk.Menu menu = new Gtk.Menu ();
-
-		Gtk.MenuItem remove_app = new Gtk.MenuItem.with_label (_("Remove Application"));
-		menu.add (remove_app);
-
-        remove_app.activate.connect( () => {
-            remove_application ();
-        });
-
-        menu.show_all();
-        conf_btn.set_popup (menu);
+}
+
+public class ActionMenu : Gtk.Revealer {
+
+    public signal void delete_clicked ();
+    public signal void edit_clicked ();
+
+    public ActionMenu () {
+        var delete_button = new Gtk.Button.from_icon_name ("edit-delete-symbolic", Gtk.IconSize.BUTTON);
+        delete_button.tooltip_text = _("Delete Webapp");
+        delete_button.relief = Gtk.ReliefStyle.NONE;
+        delete_button.clicked.connect (() => { delete_clicked (); });
+
+        var edit_button = new Gtk.Button.from_icon_name ("edit-symbolic", Gtk.IconSize.BUTTON);
+        edit_button.tooltip_text = _("Edit Webapp Properties");
+        edit_button.relief = Gtk.ReliefStyle.NONE;
+        edit_button.clicked.connect (() => { edit_clicked (); });
+
+        var buttons = new Gtk.Grid ();
+        buttons.orientation = Gtk.Orientation.HORIZONTAL;
+        buttons.add (edit_button);
+        buttons.add (delete_button);
+        buttons.opacity = 0.5;
+
+        this.transition_type = Gtk.RevealerTransitionType.CROSSFADE;
+        this.add (buttons);
     }
 }

=== modified file 'src/Assistant.vala'
--- src/Assistant.vala	2015-10-07 20:47:50 +0000
+++ src/Assistant.vala	2015-10-12 21:56:20 +0000
@@ -1,6 +1,9 @@
 public class WebbyAssistant : Gtk.Box {
 
+    public enum assistant_mode { new_app, edit_app }
+
     public signal void application_created (GLib.DesktopAppInfo? new_file);
+    public signal void application_edited (GLib.DesktopAppInfo? new_file);
 
     private Gtk.Label message;
     private Gtk.Button icon_button;
@@ -22,6 +25,8 @@
     private bool app_url_valid = false;
     private bool app_icon_valid = true;
 
+    private assistant_mode mode { get; set; default = assistant_mode.new_app; }
+
     public WebbyAssistant () {
 
         GLib.Object (orientation: Gtk.Orientation.VERTICAL);
@@ -102,7 +107,7 @@
 
 
         //create button
-        accept_button = new Gtk.Button.with_label(_("Create app"));
+        accept_button = new Gtk.Button.with_label(_("Save app"));
         accept_button.halign = Gtk.Align.END;
         accept_button.get_style_context ().add_class ("suggested-action");
         accept_button.set_sensitive (false);
@@ -134,7 +139,7 @@
         });
 
         app_name_entry.changed.connect (()=>{
-            if (DesktopFile.get_applications().has_key (app_name_entry.get_text()) ) {
+            if (mode == assistant_mode.new_app && DesktopFile.get_applications().has_key (app_name_entry.get_text()) ) {
                 app_name_entry.get_style_context ().add_class ("error");
                 app_name_entry.set_icon_from_icon_name (Gtk.EntryIconPosition.SECONDARY, "dialog-information");
                 app_name_entry.set_icon_tooltip_text (Gtk.EntryIconPosition.SECONDARY, _("App already exist"));
@@ -247,13 +252,15 @@
     }
 
 
-    private void reset_fields () {
+    public void reset_fields () {
         icon_name_entry.set_text ("");
         app_name_entry.set_text ("");
+        app_name_entry.set_sensitive (true);
         app_url_entry.set_text ("");
         app_name_entry.get_style_context ().remove_class ("error");
         app_url_entry.get_style_context ().remove_class ("error");
         icon_button.set_image (new Gtk.Image.from_icon_name (default_app_icon, Gtk.IconSize.DIALOG) );
+        mode = assistant_mode.new_app;
     }
 
     private void on_accept () {
@@ -267,8 +274,23 @@
 
         if (app_icon_valid && app_name_valid && app_url_valid) {
             var desktop_file = new DesktopFile (name, url, icon);
-            reset_fields ();
-            application_created (desktop_file.save_to_file ());
+            switch (mode) {
+                case assistant_mode.new_app:
+                    application_created (desktop_file.save_to_file ());
+                    break;
+                case assistant_mode.edit_app:
+                    application_edited (desktop_file.save_to_file ());
+                    break;
+            }
         }
     }
+
+    public void edit_desktop_file (DesktopFile desktop_file) {
+        mode = assistant_mode.edit_app;
+        app_name_entry.text = desktop_file.name;
+        app_name_entry.set_sensitive (false);
+        app_url_entry.text = desktop_file.url;
+        icon_name_entry.text = desktop_file.icon;
+        update_app_icon ();
+    }
 }

=== modified file 'src/DesktopFile.vala'
--- src/DesktopFile.vala	2015-10-07 20:47:50 +0000
+++ src/DesktopFile.vala	2015-10-12 21:56:20 +0000
@@ -19,7 +19,15 @@
 
     private GLib.KeyFile file;
 
+    public string name { get; private set; }
+    public string url { get; private set; }
+    public string icon { get; private set; }
+
     public DesktopFile (string name, string url, string icon) {
+        this.name = name;
+        this.url = url;
+        this.icon = icon;
+
         file = new GLib.KeyFile();
         file.load_from_data (template, -1, GLib.KeyFileFlags.NONE);
         //TODO: Category
@@ -34,6 +42,9 @@
     public DesktopFile.from_desktopappinfo(GLib.DesktopAppInfo info) {
         file = new GLib.KeyFile();
         file.load_from_file (info.filename, KeyFileFlags.NONE);
+        this.name = info.get_display_name ();
+        this.icon = info.get_icon ().to_string ();
+        this.url = file.get_string ("Desktop Entry", "Exec").substring (6);
     }
 
     public bool edit_propertie (string propertie, string val) {