From deb0261af1c98655f29e4431e63b34ee96768b1f Mon Sep 17 00:00:00 2001
From: Sean Davis <sean@bluesabre.org>
Date: Wed, 2 Aug 2023 06:57:36 -0400
Subject: [PATCH] Do not take category focus on add launcher

---
 menulibre/ApplicationEditor.py    |  3 +++
 menulibre/CategoryEditor.py       |  2 ++
 menulibre/MenulibreApplication.py |  4 ++++
 po/menulibre.pot                  | 20 ++++++++++----------
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/menulibre/ApplicationEditor.py b/menulibre/ApplicationEditor.py
index a63bbe14..6317c9f4 100644
--- a/menulibre/ApplicationEditor.py
+++ b/menulibre/ApplicationEditor.py
@@ -280,5 +280,8 @@ def commit(self):
         self._name_entry.commit()
         self._comment_entry.commit()
 
+    def take_focus(self):
+        self._icon_entry.grab_focus()
+
     def _on_changed(self, widget, key, value):
         self.emit('value-changed', key, value)
\ No newline at end of file
diff --git a/menulibre/CategoryEditor.py b/menulibre/CategoryEditor.py
index 87d8c426..5b639615 100644
--- a/menulibre/CategoryEditor.py
+++ b/menulibre/CategoryEditor.py
@@ -589,10 +589,12 @@ def _get_required_categories(self, parent_directory):
         return [name]
 
     def insert_required_categories(self, parent_directory):
+        self._row_change_inhibit = True
         current_categories = self._get_categories()
         for category in self._get_required_categories(parent_directory):
             if category not in current_categories:
                 self._append(category)
+        self._row_change_inhibit = False
 
     def _on_row_changed(self, model, path, treeiter):
         if self._row_change_singleton:
diff --git a/menulibre/MenulibreApplication.py b/menulibre/MenulibreApplication.py
index 7178ad7b..2284578d 100644
--- a/menulibre/MenulibreApplication.py
+++ b/menulibre/MenulibreApplication.py
@@ -1111,6 +1111,8 @@ def add_launcher(self):
         self.actions['save_launcher'].set_sensitive(True)
         self.save_button.set_sensitive(True)
 
+        self.editor.take_focus()
+
     def add_directory(self):
         """Add Directory callback function."""
         # Translators: Placeholder text for a newly created directory.
@@ -1132,6 +1134,8 @@ def add_directory(self):
         self.actions['save_launcher'].set_sensitive(True)
         self.save_button.set_sensitive(True)
 
+        self.editor.take_focus()
+
     def add_separator(self):
         """Add Separator callback function."""
         name = "<s>                    </s>"
diff --git a/po/menulibre.pot b/po/menulibre.pot
index f0a8004b..38930d34 100644
--- a/po/menulibre.pot
+++ b/po/menulibre.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-01 07:00-0400\n"
+"POT-Creation-Date: 2023-08-02 06:56-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1020,7 +1020,7 @@ msgstr ""
 
 #. Translators: Help action tooltip
 #: ../menulibre/CommandEditor.py:90 ../menulibre/MenulibreApplication.py:489
-#: ../menulibre/MenulibreApplication.py:1665
+#: ../menulibre/MenulibreApplication.py:1669
 msgid "Help"
 msgstr ""
 
@@ -1292,7 +1292,7 @@ msgstr ""
 
 #. Translators: Separator menu item
 #: ../menulibre/MenuEditor.py:126 ../menulibre/MenulibreApplication.py:846
-#: ../menulibre/MenulibreApplication.py:1139
+#: ../menulibre/MenulibreApplication.py:1143
 msgid "Separator"
 msgstr ""
 
@@ -1456,7 +1456,7 @@ msgstr ""
 
 #. Translators: Quit action tooltip
 #: ../menulibre/MenulibreApplication.py:480
-#: ../menulibre/MenulibreApplication.py:1667
+#: ../menulibre/MenulibreApplication.py:1671
 msgid "Quit"
 msgstr ""
 
@@ -1472,7 +1472,7 @@ msgstr ""
 
 #. Translators: About action tooltip
 #: ../menulibre/MenulibreApplication.py:498
-#: ../menulibre/MenulibreApplication.py:1666
+#: ../menulibre/MenulibreApplication.py:1670
 msgid "About"
 msgstr ""
 
@@ -1535,30 +1535,30 @@ msgid "A small descriptive blurb about this application."
 msgstr ""
 
 #. Translators: Placeholder text for a newly created directory.
-#: ../menulibre/MenulibreApplication.py:1117
+#: ../menulibre/MenulibreApplication.py:1119
 msgid "New Directory"
 msgstr ""
 
 #. Translators: Placeholder text for a newly created directory's
 #. description.
-#: ../menulibre/MenulibreApplication.py:1120
+#: ../menulibre/MenulibreApplication.py:1122
 msgid "A small descriptive blurb about this directory."
 msgstr ""
 
 #. Translators: Confirmation dialog to delete the selected
 #. separator.
-#: ../menulibre/MenulibreApplication.py:1541
+#: ../menulibre/MenulibreApplication.py:1545
 msgid "Are you sure you want to delete this separator?"
 msgstr ""
 
 #. Translators: Confirmation dialog to delete the selected launcher.
-#: ../menulibre/MenulibreApplication.py:1545
+#: ../menulibre/MenulibreApplication.py:1549
 #, python-format
 msgid "Are you sure you want to delete \"%s\"?"
 msgstr ""
 
 #. Translators: Menu item to open the Parsing Errors dialog.
-#: ../menulibre/MenulibreApplication.py:1660
+#: ../menulibre/MenulibreApplication.py:1664
 msgid "Parsing Error Log"
 msgstr ""