Corrections to chapter 7 per revision

Author: alandmoore

Chapter07/ABQ_Data_Entry/abq_data_entry/application.py

@@ -69,7 +69,7 @@ def __init__(self, *args, **kwargs):
     self.statusbar.grid(sticky=(tk.W + tk.E), row=3, padx=10)
 
 
-    self.records_saved = 0
+    self._records_saved = 0
 
 
   def _on_save(self, *_):
@@ -96,9 +96,9 @@ def _on_save(self, *_):
 
     data = self.recordform.get()
     self.model.save_record(data)
-    self.records_saved += 1
+    self._records_saved += 1
     self.status.set(
-      "{} records saved this session".format(self.records_saved)
+      "{} records saved this session".format(self._records_saved)
     )
     self.recordform.reset()
 

Chapter07/ABQ_Data_Entry/abq_data_entry/widgets.py

@@ -274,23 +274,31 @@ def _focusout_validate(self, **kwargs):
 
     return valid
 
-class ValidatedRadio(ttk.Radiobutton):
-  """A validated radio button"""
+class ValidatedRadioGroup(ttk.Frame):
+  """A validated radio button group"""
 
-  def __init__(self, *args, error_var=None, **kwargs):
+  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.variable = kwargs.get("variable")
-    self.bind('<FocusOut>', self._focusout_validate)
+    self.values = values or list()
+    button_args = button_args or dict()
+
+    for v in self.values:
+      button = ttk.Radiobutton(
+        self, value=v, text=v, variable=self.variable, **button_args
+      )
+      button.pack(side=tk.LEFT, ipadx=10, ipady=2, expand=True, fill='x')
+    self.bind('<FocusOut>', self.trigger_focusout_validation)
 
-  def _focusout_validate(self, *_):
+  def trigger_focusout_validation(self, *_):
     self.error.set('')
     if not self.variable.get():
       self.error.set('A value is required')
 
-  def trigger_focusout_validation(self):
-    self._focusout_validate()
-
 
 class BoundText(tk.Text):
   """A Text widget with a bound variable."""
@@ -328,7 +336,7 @@ class LabelInput(ttk.Frame):
   field_types = {
     FT.string: RequiredEntry,
     FT.string_list: ValidatedCombobox,
-    FT.short_string_list: ValidatedRadio,
+    FT.short_string_list: ValidatedRadioGroup,
     FT.iso_date_string: DateEntry,
     FT.long_string: BoundText,
     FT.decimal: ValidatedSpinbox,
@@ -372,24 +380,23 @@ def __init__(
 
     # setup the variable
     if input_class in (
-        ttk.Checkbutton, ttk.Button, ttk.Radiobutton, ValidatedRadio
+        ttk.Checkbutton, ttk.Button, ttk.Radiobutton, ValidatedRadioGroup
     ):
       input_args["variable"] = self.variable
     else:
       input_args["textvariable"] = self.variable
 
     # Setup the input
-    if input_class in (ttk.Radiobutton, ValidatedRadio):
+    if input_class == ttk.Radiobutton:
       # for Radiobutton, create one input per value
       self.input = tk.Frame(self)
       for v in input_args.pop('values', []):
         button = input_class(
           self.input, value=v, text=v, **input_args
         )
         button.pack(side=tk.LEFT, ipadx=10, ipady=2, expand=True, fill='x')
-      self.input.error = getattr(button, 'error')
-      self.input.trigger_focusout_validation = \
-        button._focusout_validate
+    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)