Merge lp:~kalikiana/midori/apps into lp:midori

[Cris Dywan]

Clean launcher filenames, double-click to open and delete button

Clean launcher filenames, double-click to open and delete button

[André Stösel (ivaldi)]

A function to change the label of a profile would be nice too.

review: Approve

=== modified file 'extensions/apps.vala'
--- extensions/apps.vala	2013-05-31 11:58:17 +0000
+++ extensions/apps.vala	2013-06-03 23:33:29 +0000
@@ -22,9 +22,9 @@
 
         internal static async void create (string prefix, GLib.File folder, string uri, string title, Gtk.Widget proxy) {
             /* Strip LRE leading character and / */
-            string filename = title.delimit ("‪/", ' ').strip() + ".desktop";
             string exec = prefix + uri;
-            string name = title;
+            string name = title.delimit ("‪/", ' ').strip();
+            string filename = Midori.Download.clean_filename (name) + ".desktop";
             // TODO: Midori.Paths.get_icon save to png
             string icon_name = Midori.Stock.WEB_BROWSER;
             string contents = """
@@ -45,9 +45,6 @@
                 var browser = proxy.get_toplevel () as Midori.Browser;
                 browser.send_notification (_("Launcher created"),
                     _("You can now run <b>%s</b> from your launcher or menu").printf (name));
-                /* TODO: Use infobar; currently hits gtk_widget_get_realized: assertion `GTK_IS_WIDGET (widget)' failed
-                (browser.tab as Midori.View).add_info_bar (Gtk.MessageType.INFO,
-                    _("You can now run <b>%s</b> from your launcher or menu").printf (name), null, null, null); */
             }
             catch (Error error) {
                 var browser = proxy.get_toplevel () as Midori.Browser;
@@ -128,6 +125,46 @@
             return toolbar;
         }
 
+        void row_activated (Gtk.TreePath path, Gtk.TreeViewColumn column) {
+            Gtk.TreeIter iter;
+            if (store.get_iter (out iter, path)) {
+                Launcher launcher;
+                store.get (iter, 0, out launcher);
+                try {
+                    GLib.Process.spawn_command_line_async (launcher.exec);
+                }
+                catch (Error error) {
+                    var browser = get_toplevel () as Midori.Browser;
+                    browser.send_notification (_("Error launching"), error.message);
+                }
+            }
+        }
+
+        bool button_released (Gdk.EventButton event) {
+            Gtk.TreePath? path;
+            Gtk.TreeViewColumn column;
+            if (treeview.get_path_at_pos ((int)event.x, (int)event.y, out path, out column, null, null)) {
+                if (path != null) {
+                    if (column == treeview.get_column (2)) {
+                        Gtk.TreeIter iter;
+                        if (store.get_iter (out iter, path)) {
+                            Launcher launcher;
+                            store.get (iter, 0, out launcher);
+                            try {
+                                launcher.file.trash (null);
+                                store.remove (iter);
+                            }
+                            catch (Error error) {
+                                GLib.critical (error.message);
+                            }
+                            return true;
+                        }
+                    }
+                }
+            }
+            return false;
+        }
+
         public Sidebar (Katze.Array array, GLib.File app_folder) {
             Gtk.TreeViewColumn column;
 
@@ -151,6 +188,14 @@
             column.set_cell_data_func (renderer_text, on_render_text);
             treeview.append_column (column);
 
+            column = new Gtk.TreeViewColumn ();
+            Gtk.CellRendererPixbuf renderer_button = new Gtk.CellRendererPixbuf ();
+            column.pack_start (renderer_button, false);
+            column.set_cell_data_func (renderer_button, on_render_button);
+            treeview.append_column (column);
+
+            treeview.row_activated.connect (row_activated);
+            treeview.button_release_event.connect (button_released);
             treeview.show ();
             pack_start (treeview, true, true, 0);
 
@@ -203,6 +248,13 @@
                     launcher.name, launcher.uri),
                           "ellipsize", Pango.EllipsizeMode.END);
         }
+
+        void on_render_button (Gtk.CellLayout column, Gtk.CellRenderer renderer,
+            Gtk.TreeModel model, Gtk.TreeIter iter) {
+
+            renderer.set ("stock-id", Gtk.STOCK_DELETE,
+                          "stock-size", Gtk.IconSize.MENU);
+        }
     }
 
     private class Manager : Midori.Extension {
 
=== modified file 'midori/midori-download.vala'
--- midori/midori-download.vala	2013-05-19 09:43:05 +0000
+++ midori/midori-download.vala	2013-06-03 23:33:29 +0000
@@ -244,9 +244,9 @@
 
         public string clean_filename (string filename) {
             #if HAVE_WIN32
-            return filename.delimit ("/\\<>:\"|?*", '_');
+            return filename.delimit ("/\\<>:\"|?* ", '_');
             #else
-            return filename.delimit ("/", '_');
+            return filename.delimit ("/ ", '_');
             #endif
         }