changes per ch9 review

Author: alandmoore

Chapter09/ABQ_Data_Entry/abq_data_entry/application.py

@@ -21,6 +21,10 @@ def __init__(self, *args, **kwargs):
     # Hide window while GUI is built
     self.withdraw()
 
+    # Set taskbar icon
+    self.taskbar_icon = tk.PhotoImage(file=images.ABQ_LOGO_64)
+    self.iconphoto(True, self.taskbar_icon)
+
     # Authenticate
     if not self._show_login():
       self.destroy()
@@ -32,24 +36,14 @@ def __init__(self, *args, **kwargs):
    # Create model
     self.model = m.CSVModel()
 
-    # Load settings
-    # self.settings = {
-    #   'autofill date': tk.BooleanVar(),
-    #   'autofill sheet data': tk.BoleanVar()
-    # }
+    # load settings
     self.settings_model = m.SettingsModel()
     self._load_settings()
 
-    self.inserted_rows = []
-    self.updated_rows = []
-
     # Begin building GUI
     self.title("ABQ Data Entry Application")
     self.columnconfigure(0, weight=1)
 
-    # Set taskbar icon
-    self.taskbar_icon = tk.PhotoImage(file=images.ABQ_LOGO_64)
-    self.iconphoto(True, self.taskbar_icon)
 
     # Create the menu
     menu = MainMenu(self, self.settings)
@@ -91,9 +85,7 @@ def __init__(self, *args, **kwargs):
 
     # The data record list
     self.recordlist_icon = tk.PhotoImage(file=images.LIST_ICON)
-    self.recordlist = v.RecordList(
-      self, self.inserted_rows, self.updated_rows
-    )
+    self.recordlist = v.RecordList(self)
     self.notebook.insert(
         0, self.recordlist, text='Records',
         image=self.recordlist_icon, compound=tk.LEFT
@@ -139,10 +131,10 @@ def _on_save(self, *_):
     rownum = self.recordform.current_record
     self.model.save_record(data, rownum)
     if rownum is not None:
-      self.updated_rows.append(rownum)
+      self.recordlist.add_updated_row(rownum)
     else:
       rownum = len(self.model.get_all_records()) -1
-      self.inserted_rows.append(rownum)
+      self.recordlist.add_inserted_row(rownum)
     self.records_saved += 1
     self.status.set(
       "{} records saved this session".format(self.records_saved)
@@ -160,9 +152,8 @@ def _on_file_select(self, *_):
     )
     if filename:
       self.model = m.CSVModel(filename=filename)
-      self.inserted_rows.clear()
-      self.updated_rows.clear()
       self._populate_recordlist()
+      self.recordlist.clear_tags()
 
   @staticmethod
   def _simple_login(username, password):
@@ -260,7 +251,9 @@ def _set_font(self, *_):
     """Set the application's font"""
     font_size = self.settings['font size'].get()
     font_family = self.settings['font family'].get()
-    font_names = ('TkDefaultFont', 'TkMenuFont', 'TkTextFont')
+    font_names = (
+      'TkDefaultFont', 'TkMenuFont', 'TkTextFont', 'TkFixedFont'
+    )
     for font_name in font_names:
       tk_font = font.nametofont(font_name)
       tk_font.config(size=font_size, family=font_family)

Chapter09/ABQ_Data_Entry/abq_data_entry/views.py

@@ -126,14 +126,16 @@ def __init__(self, parent, model, settings, *args, **kwargs):
       field_spec=fields['Lab'],
       var=self._vars['Lab'],
       label_args={'style': 'RecordInfo.TLabel'},
-      input_args={'style': 'RecordInfo.TRadiobutton'}
+      input_args={
+        'button_args':{'style': 'RecordInfo.TRadiobutton'}
+      }
     ).grid(row=1, column=0)
     w.LabelInput(
       r_info, "Plot",
       field_spec=fields['Plot'],
       var=self._vars['Plot'],
       label_args={'style': 'RecordInfo.TLabel'}
-    ).grid(row=1, column=0)
+    ).grid(row=1, column=1)
     w.LabelInput(
       r_info, "Seed Sample",
       field_spec=fields['Seed Sample'],
@@ -419,10 +421,11 @@ class RecordList(tk.Frame):
   default_minwidth = 10
   default_anchor = tk.CENTER
 
-  def __init__(self, parent, inserted, updated, *args, **kwargs):
+  def __init__(self, parent, *args, **kwargs):
     super().__init__(parent, *args, **kwargs)
-    self.inserted = inserted
-    self.updated = updated
+    self._inserted = list()
+    self._updated = list()
+
     self.columnconfigure(0, weight=1)
     self.rowconfigure(0, weight=1)
 
@@ -471,9 +474,9 @@ def populate(self, rows):
     cids = list(self.column_defs.keys())[1:]
     for rownum, rowdata in enumerate(rows):
       values = [rowdata[cid] for cid in cids]
-      if rownum in self.inserted:
+      if rownum in self._inserted:
         tag = 'inserted'
-      elif rownum in self.updated:
+      elif rownum in self._updated:
         tag = 'updated'
       else:
         tag = ''
@@ -490,3 +493,15 @@ def _on_open_record(self, *args):
 
     self.selected_id = int(self.treeview.selection()[0])
     self.event_generate('<<OpenRecord>>')
+
+  def add_updated_row(self, row):
+    if row not in self._updated:
+      self._updated.append(row)
+
+  def add_inserted_row(self, row):
+    if row not in self._inserted:
+      self._inserted.append(row)
+
+  def clear_tags(self):
+    self._inserted.clear()
+    self._updated.clear()

Chapter09/ABQ_Data_Entry/abq_data_entry/widgets.py

@@ -283,23 +283,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()
 
-  def _focusout_validate(self, *_):
+    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 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."""
@@ -337,7 +345,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,
@@ -381,14 +389,14 @@ 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', []):