Remove the app item from the items list - fix removing non existent items from the sidebar; create new application entry with the same category of the selected app

Author: donadigo

src/AppInfoView.vala

@@ -283,8 +283,7 @@ public class AppEditor.AppInfoView : Gtk.Box {
             error_label.label = _("Something went wrong and the changes could not be saved: %s".printf (e.message));
         }
 
-        validate_cmdline_entry ();
-        update_restore_button ();
+        update_page ();
     }
 
     public bool get_changed () {
@@ -435,6 +434,7 @@ public class AppEditor.AppInfoView : Gtk.Box {
         terminal_switch.active = desktop_app.get_terminal ();
         notifications_switch.active = desktop_app.info.get_boolean (DesktopApp.USES_NOTIFICATIONS_KEY);
 
+        validate_cmdline_entry ();
         update_restore_button ();
     }
 

src/AppInfoViewSaver.vala

@@ -20,13 +20,17 @@
 public class AppEditor.AppInfoViewSaver : Object {
     public AppInfoView target { get; set; }
 
-    public static DesktopApp? create_new_local_app () {
+    public static DesktopApp? create_new_local_app (AppCategory? category) {
         string lang = Intl.get_language_names ()[0];
 
         var key = new KeyFile ();
         key.set_list_separator (DesktopApp.DEFAULT_LIST_SEPARATOR);
         key.set_string (KeyFileDesktop.GROUP, KeyFileDesktop.KEY_TYPE, KeyFileDesktop.TYPE_APPLICATION);
         key.set_locale_string (KeyFileDesktop.GROUP, KeyFileDesktop.KEY_NAME, lang, _("New Application"));
+        if (category != null) {
+            string[] categories = { category.id };
+            key.set_string_list (KeyFileDesktop.GROUP, KeyFileDesktop.KEY_CATEGORIES, categories);
+        }
 
         string path = AppDirectoryScanner.get_config_path ();
 

src/AppSourceList.vala

@@ -92,6 +92,7 @@ public class AppEditor.AppSourceList : Granite.Widgets.SourceList {
         foreach (var app_item in app_items) {
             if (app_item.desktop_app.compare (desktop_app)) {
                 app_item.parent.remove (app_item);
+                app_items.remove (app_item);
                 break;
             }
         }

src/MainWindow.vala

@@ -265,7 +265,13 @@ public class AppEditor.MainWindow : Gtk.Window {
     private void on_new_button_clicked () {
         search_entry.text = "";
 
-        var new_app = AppInfoViewSaver.create_new_local_app ();
+        AppCategory? current_category = null;
+        var current_view = app_info_view_stack.get_current_view ();
+        if (current_view != null) {
+            current_category = current_view.desktop_app.get_main_category ();
+        }
+
+        var new_app = AppInfoViewSaver.create_new_local_app (current_category);
         app_source_list.add_app (new_app, true);
     }