changes per chapter 6 revisions

Author: alandmoore

Chapter05/data_entry_app.py

@@ -568,7 +568,7 @@ def __init__(self, *args, **kwargs):
     buttons = tk.Frame(self)
     buttons.grid(sticky=tk.W + tk.E, row=4)
     self.savebutton = ttk.Button(
-      buttons, text="Save", command=self.master.on_save)
+      buttons, text="Save", command=self.master._on_save)
     self.savebutton.pack(side=tk.RIGHT)
 
     self.resetbutton = ttk.Button(
@@ -682,7 +682,7 @@ def __init__(self, *args, **kwargs):
 
     self._records_saved = 0
 
-  def on_save(self):
+  def _on_save(self):
     """Handles save button clicks"""
 
     # Check for errors first

Chapter06/ABQ_Data_Entry/abq_data_entry/application.py

@@ -33,7 +33,7 @@ def __init__(self, *args, **kwargs):
     self.statusbar = ttk.Label(self, textvariable=self.status)
     self.statusbar.grid(sticky=(tk.W + tk.E), row=3, padx=10)
 
-    self.records_saved = 0
+    self._records_saved = 0
 
   def _on_save(self, *_):
     """Handles file-save requests"""
@@ -50,8 +50,8 @@ def _on_save(self, *_):
 
     data = self.recordform.get()
     self.model.save_record(data)
-    self.records_saved += 1
+    self._records_saved += 1
     self.status.set(
-      f"{self.records_saved} records saved this session"
+      f"{self._records_saved} records saved this session"
     )
     self.recordform.reset()

Chapter06/ABQ_Data_Entry/abq_data_entry/widgets.py

@@ -274,6 +274,35 @@ def _focusout_validate(self, **kwargs):
 
     return valid
 
+class ValidatedRadioGroup(ttk.Frame):
+  """A validated radio button group"""
+
+  def __init__(
+    self, *args, variable=None, error_var=None,
+    values=None, button_args=None, **kwargs
+  ):
+    super().__init__(*args, **kwargs)
+    self.variable = variable or tk.StringVar()
+    self.error = error_var or tk.StringVar()
+    self.values = values or list()
+    self.button_args = button_args or dict()
+
+    for v in self.values:
+      button = ttk.Radiobutton(
+        self, value=v, text=v,
+        variable=self.variable, **self.button_args
+      )
+      button.pack(
+        side=tk.LEFT, ipadx=10, ipady=2, expand=True, fill='x'
+      )
+    self.bind('<FocusOut>', self.trigger_focusout_validation)
+
+  def trigger_focusout_validation(self, *_):
+    self.error.set('')
+    if not self.variable.get():
+      self.error.set('A value is required')
+
+
 class BoundText(tk.Text):
   """A Text widget with a bound variable."""
 
@@ -310,7 +339,7 @@ class LabelInput(ttk.Frame):
   field_types = {
     FT.string: RequiredEntry,
     FT.string_list: ValidatedCombobox,
-    FT.short_string_list: ttk.Radiobutton,
+    FT.short_string_list: ValidatedRadioGroup,
     FT.iso_date_string: DateEntry,
     FT.long_string: BoundText,
     FT.decimal: ValidatedSpinbox,
@@ -353,7 +382,9 @@ def __init__(
       self.label.grid(row=0, column=0, sticky=(tk.W + tk.E))
 
     # setup the variable
-    if input_class in (ttk.Checkbutton, ttk.Button, ttk.Radiobutton):
+    if input_class in (
+        ttk.Checkbutton, ttk.Button, ttk.Radiobutton, ValidatedRadioGroup
+    ):
       input_args["variable"] = self.variable
     else:
       input_args["textvariable"] = self.variable
@@ -363,12 +394,12 @@ def __init__(
       # for Radiobutton, create one input per value
       self.input = tk.Frame(self)
       for v in input_args.pop('values', []):
-        button = ttk.Radiobutton(
-          self.input, value=v, text=v, **input_args)
+        button = input_class(
+          self.input, value=v, text=v, **input_args
+        )
         button.pack(side=tk.LEFT, ipadx=10, ipady=2, expand=True, fill='x')
     else:
       self.input = input_class(self, **input_args)
-
     self.input.grid(row=1, column=0, sticky=(tk.W + tk.E))
     self.columnconfigure(0, weight=1)