Merge pull request #27 from molssi-seamm/dev

Bugfix: problem deleting 2 or more keywords

Author: seamm

HISTORY.rst

@@ -2,7 +2,9 @@
 History
 =======
 
-0.1.0 (2019-04-02)
-------------------
+2022.10.28 -- Bugfix: problem deleting 2 or more keywords
+  There was a crash if you deleted a second keyword in the Keywords tab of
+  calculation.
 
-* First release on PyPI.
+0.1.0 (2019-04-02)
+  * First release on PyPI.

seamm_widgets/keywords.py

@@ -163,8 +163,12 @@ def layout_keywords(self):
             else:
                 widgets = d["widgets"]
 
-            if "remove" not in widgets:
-                # The button to remove a row...
+            # The button to remove a row...
+            if "remove" in widgets:
+                widgets["remove"].configure(
+                    command=lambda row=row: self.remove_keyword(row)
+                )
+            else:
                 widgets["remove"] = ttk.Button(
                     frame,
                     text="-",
@@ -173,7 +177,20 @@ def layout_keywords(self):
                     takefocus=True,
                 )
 
-            if "entry" not in widgets:
+            if "entry" in widgets:
+                widgets["entry"].configure(
+                    validatecommand=(
+                        self.keyword_cb,
+                        keyword,
+                        row,
+                        "%W",
+                        "%P",
+                        "%s",
+                        "%d",
+                        "%S",
+                    )
+                )
+            else:
                 # the name of the keyword
                 widgets["entry"] = ttk.Entry(
                     frame,
@@ -192,11 +209,11 @@ def layout_keywords(self):
                     takefocus=True,
                     style="Red.TEntry",
                 )
-                widgets["entry"].bind(
-                    "<KeyPress-Tab>",
-                    lambda event=None, row=row: self.handle_tab(event, row),
-                )
                 widgets["entry"].insert("end", keyword)
+            widgets["entry"].bind(
+                "<KeyPress-Tab>",
+                lambda event=None, row=row: self.handle_tab(event, row),
+            )
 
             self.logger.debug("  widgets: " + str(widgets))
             widgets["remove"].grid(row=row, column=0, sticky=tk.W)