pygui: updated validation to be wrapper classes around ttk.Entry for convenience and less code

daemon/core/gui/dialogs/canvassizeandscale.py

@@ -5,6 +5,7 @@ import tkinter as tk
 from tkinter import font, ttk
 from typing import TYPE_CHECKING
 
+from core.gui import validation
 from core.gui.dialogs.dialog import Dialog
 from core.gui.themes import FRAME_PAD, PADX, PADY
 
@@ -21,7 +22,6 @@ class SizeAndScaleDialog(Dialog):
         """
         super().__init__(app, "Canvas Size and Scale")
         self.canvas = self.app.canvas
-        self.validation = app.validation
         self.section_font = font.Font(weight="bold")
         width, height = self.canvas.current_dimensions
         self.pixel_width = tk.IntVar(value=width)
@@ -59,23 +59,11 @@ class SizeAndScaleDialog(Dialog):
         frame.columnconfigure(3, weight=1)
         label = ttk.Label(frame, text="Width")
         label.grid(row=0, column=0, sticky="w", padx=PADX)
-        entry = ttk.Entry(
-            frame,
-            textvariable=self.pixel_width,
-            validate="key",
-            validatecommand=(self.validation.positive_int, "%P"),
-        )
-        entry.bind("<FocusOut>", lambda event: self.validation.focus_out(event, "0"))
+        entry = validation.PositiveIntEntry(frame, textvariable=self.pixel_width)
         entry.grid(row=0, column=1, sticky="ew", padx=PADX)
         label = ttk.Label(frame, text="x Height")
         label.grid(row=0, column=2, sticky="w", padx=PADX)
-        entry = ttk.Entry(
-            frame,
-            textvariable=self.pixel_height,
-            validate="key",
-            validatecommand=(self.validation.positive_int, "%P"),
-        )
-        entry.bind("<FocusOut>", lambda event: self.validation.focus_out(event, "0"))
+        entry = validation.PositiveIntEntry(frame, textvariable=self.pixel_height)
         entry.grid(row=0, column=3, sticky="ew", padx=PADX)
         label = ttk.Label(frame, text="Pixels")
         label.grid(row=0, column=4, sticky="w")
@@ -87,23 +75,11 @@ class SizeAndScaleDialog(Dialog):
         frame.columnconfigure(3, weight=1)
         label = ttk.Label(frame, text="Width")
         label.grid(row=0, column=0, sticky="w", padx=PADX)
-        entry = ttk.Entry(
-            frame,
-            textvariable=self.meters_width,
-            validate="key",
-            validatecommand=(self.validation.positive_float, "%P"),
-        )
-        entry.bind("<FocusOut>", lambda event: self.validation.focus_out(event, "0"))
+        entry = validation.PositiveFloatEntry(frame, textvariable=self.meters_width)
         entry.grid(row=0, column=1, sticky="ew", padx=PADX)
         label = ttk.Label(frame, text="x Height")
         label.grid(row=0, column=2, sticky="w", padx=PADX)
-        entry = ttk.Entry(
-            frame,
-            textvariable=self.meters_height,
-            validate="key",
-            validatecommand=(self.validation.positive_float, "%P"),
-        )
-        entry.bind("<FocusOut>", lambda event: self.validation.focus_out(event, "0"))
+        entry = validation.PositiveFloatEntry(frame, textvariable=self.meters_height)
         entry.grid(row=0, column=3, sticky="ew", padx=PADX)
         label = ttk.Label(frame, text="Meters")
         label.grid(row=0, column=4, sticky="w")
@@ -118,13 +94,7 @@ class SizeAndScaleDialog(Dialog):
         frame.columnconfigure(1, weight=1)
         label = ttk.Label(frame, text=f"{PIXEL_SCALE} Pixels =")
         label.grid(row=0, column=0, sticky="w", padx=PADX)
-        entry = ttk.Entry(
-            frame,
-            textvariable=self.scale,
-            validate="key",
-            validatecommand=(self.validation.positive_float, "%P"),
-        )
-        entry.bind("<FocusOut>", lambda event: self.validation.focus_out(event, "0"))
+        entry = validation.PositiveFloatEntry(frame, textvariable=self.scale)
         entry.grid(row=0, column=1, sticky="ew", padx=PADX)
         label = ttk.Label(frame, text="Meters")
         label.grid(row=0, column=2, sticky="w")
@@ -148,24 +118,12 @@ class SizeAndScaleDialog(Dialog):
 
         label = ttk.Label(frame, text="X")
         label.grid(row=0, column=0, sticky="w", padx=PADX)
-        entry = ttk.Entry(
-            frame,
-            textvariable=self.x,
-            validate="key",
-            validatecommand=(self.validation.positive_float, "%P"),
-        )
-        entry.bind("<FocusOut>", lambda event: self.validation.focus_out(event, "0"))
+        entry = validation.PositiveFloatEntry(frame, textvariable=self.x)
         entry.grid(row=0, column=1, sticky="ew", padx=PADX)
 
         label = ttk.Label(frame, text="Y")
         label.grid(row=0, column=2, sticky="w", padx=PADX)
-        entry = ttk.Entry(
-            frame,
-            textvariable=self.y,
-            validate="key",
-            validatecommand=(self.validation.positive_float, "%P"),
-        )
-        entry.bind("<FocusOut>", lambda event: self.validation.focus_out(event, "0"))
+        entry = validation.PositiveFloatEntry(frame, textvariable=self.y)
         entry.grid(row=0, column=3, sticky="ew", padx=PADX)
 
         label = ttk.Label(label_frame, text="Translates To")
@@ -179,35 +137,17 @@ class SizeAndScaleDialog(Dialog):
 
         label = ttk.Label(frame, text="Lat")
         label.grid(row=0, column=0, sticky="w", padx=PADX)
-        entry = ttk.Entry(
-            frame,
-            textvariable=self.lat,
-            validate="key",
-            validatecommand=(self.validation.float, "%P"),
-        )
-        entry.bind("<FocusOut>", lambda event: self.validation.focus_out(event, "0"))
+        entry = validation.FloatEntry(frame, textvariable=self.lat)
         entry.grid(row=0, column=1, sticky="ew", padx=PADX)
 
         label = ttk.Label(frame, text="Lon")
         label.grid(row=0, column=2, sticky="w", padx=PADX)
-        entry = ttk.Entry(
-            frame,
-            textvariable=self.lon,
-            validate="key",
-            validatecommand=(self.validation.float, "%P"),
-        )
-        entry.bind("<FocusOut>", lambda event: self.validation.focus_out(event, "0"))
+        entry = validation.FloatEntry(frame, textvariable=self.lon)
         entry.grid(row=0, column=3, sticky="ew", padx=PADX)
 
         label = ttk.Label(frame, text="Alt")
         label.grid(row=0, column=4, sticky="w", padx=PADX)
-        entry = ttk.Entry(
-            frame,
-            textvariable=self.alt,
-            validate="key",
-            validatecommand=(self.validation.float, "%P"),
-        )
-        entry.bind("<FocusOut>", lambda event: self.validation.focus_out(event, "0"))
+        entry = validation.FloatEntry(frame, textvariable=self.alt)
         entry.grid(row=0, column=5, sticky="ew")
 
     def draw_save_as_default(self):

daemon/core/gui/dialogs/colorpicker.py

@@ -5,6 +5,7 @@ import tkinter as tk
 from tkinter import ttk
 from typing import TYPE_CHECKING
 
+from core.gui import validation
 from core.gui.dialogs.dialog import Dialog
 
 if TYPE_CHECKING:
@@ -50,13 +51,7 @@ class ColorPickerDialog(Dialog):
         frame.columnconfigure(3, weight=2)
         label = ttk.Label(frame, text="R: ")
         label.grid(row=0, column=0)
-        self.red_entry = ttk.Entry(
-            frame,
-            width=4,
-            textvariable=self.red,
-            validate="key",
-            validatecommand=(self.app.validation.rgb, "%P"),
-        )
+        self.red_entry = validation.RgbEntry(frame, width=4, textvariable=self.red)
         self.red_entry.grid(row=0, column=1, sticky="nsew")
         scale = ttk.Scale(
             frame,
@@ -82,20 +77,13 @@ class ColorPickerDialog(Dialog):
         frame.columnconfigure(3, weight=2)
         label = ttk.Label(frame, text="G: ")
         label.grid(row=0, column=0)
-        self.green_entry = ttk.Entry(
-            frame,
-            width=4,
-            textvariable=self.green,
-            validate="key",
-            validatecommand=(self.app.validation.rgb, "%P"),
-        )
+        self.green_entry = validation.RgbEntry(frame, width=4, textvariable=self.green)
         self.green_entry.grid(row=0, column=1, sticky="nsew")
         scale = ttk.Scale(
             frame,
             from_=0,
             to=255,
             value=0,
-            # length=200,
             orient=tk.HORIZONTAL,
             variable=self.green_scale,
             command=lambda x: self.scale_callback(self.green_scale, self.green),
@@ -114,13 +102,7 @@ class ColorPickerDialog(Dialog):
         frame.columnconfigure(3, weight=2)
         label = ttk.Label(frame, text="B: ")
         label.grid(row=0, column=0)
-        self.blue_entry = ttk.Entry(
-            frame,
-            width=4,
-            textvariable=self.blue,
-            validate="key",
-            validatecommand=(self.app.validation.rgb, "%P"),
-        )
+        self.blue_entry = validation.RgbEntry(frame, width=4, textvariable=self.blue)
         self.blue_entry.grid(row=0, column=1, sticky="nsew")
         scale = ttk.Scale(
             frame,
@@ -144,12 +126,7 @@ class ColorPickerDialog(Dialog):
         frame.columnconfigure(0, weight=1)
         label = ttk.Label(frame, text="Selection: ")
         label.grid(row=0, column=0, sticky="nsew")
-        self.hex_entry = ttk.Entry(
-            frame,
-            textvariable=self.hex,
-            validate="key",
-            validatecommand=(self.app.validation.hex, "%P"),
-        )
+        self.hex_entry = validation.HexEntry(frame, textvariable=self.hex)
         self.hex_entry.grid(row=1, column=0, sticky="nsew")
         self.display = tk.Frame(frame, background=self.color, width=100, height=100)
         self.display.grid(row=2, column=0)

daemon/core/gui/dialogs/linkconfig.py

@@ -6,6 +6,7 @@ from tkinter import ttk
 from typing import TYPE_CHECKING, Union
 
 from core.api.grpc import core_pb2
+from core.gui import validation
 from core.gui.dialogs.colorpicker import ColorPickerDialog
 from core.gui.dialogs.dialog import Dialog
 from core.gui.themes import PADX, PADY
@@ -120,95 +121,65 @@ class LinkConfigurationDialog(Dialog):
 
         label = ttk.Label(frame, text="Bandwidth (bps)")
         label.grid(row=row, column=0, sticky="ew")
-        entry = ttk.Entry(
-            frame,
-            textvariable=self.bandwidth,
-            validate="key",
-            validatecommand=(self.app.validation.positive_int, "%P"),
+        entry = validation.PositiveIntEntry(
+            frame, empty_enabled=False, textvariable=self.bandwidth
         )
         entry.grid(row=row, column=1, sticky="ew", pady=PADY)
         if not self.is_symmetric:
-            entry = ttk.Entry(
-                frame,
-                textvariable=self.down_bandwidth,
-                validate="key",
-                validatecommand=(self.app.validation.positive_int, "%P"),
+            entry = validation.PositiveIntEntry(
+                frame, empty_enabled=False, textvariable=self.down_bandwidth
             )
             entry.grid(row=row, column=2, sticky="ew", pady=PADY)
         row = row + 1
 
         label = ttk.Label(frame, text="Delay (us)")
         label.grid(row=row, column=0, sticky="ew")
-        entry = ttk.Entry(
-            frame,
-            textvariable=self.delay,
-            validate="key",
-            validatecommand=(self.app.validation.positive_int, "%P"),
+        entry = validation.PositiveIntEntry(
+            frame, empty_enabled=False, textvariable=self.delay
         )
         entry.grid(row=row, column=1, sticky="ew", pady=PADY)
         if not self.is_symmetric:
-            entry = ttk.Entry(
-                frame,
-                textvariable=self.down_delay,
-                validate="key",
-                validatecommand=(self.app.validation.positive_int, "%P"),
+            entry = validation.PositiveIntEntry(
+                frame, empty_enabled=False, textvariable=self.down_delay
             )
             entry.grid(row=row, column=2, sticky="ew", pady=PADY)
         row = row + 1
 
         label = ttk.Label(frame, text="Jitter (us)")
         label.grid(row=row, column=0, sticky="ew")
-        entry = ttk.Entry(
-            frame,
-            textvariable=self.jitter,
-            validate="key",
-            validatecommand=(self.app.validation.positive_int, "%P"),
+        entry = validation.PositiveIntEntry(
+            frame, empty_enabled=False, textvariable=self.jitter
         )
         entry.grid(row=row, column=1, sticky="ew", pady=PADY)
         if not self.is_symmetric:
-            entry = ttk.Entry(
-                frame,
-                textvariable=self.down_jitter,
-                validate="key",
-                validatecommand=(self.app.validation.positive_int, "%P"),
+            entry = validation.PositiveIntEntry(
+                frame, empty_enabled=False, textvariable=self.down_jitter
             )
             entry.grid(row=row, column=2, sticky="ew", pady=PADY)
         row = row + 1
 
         label = ttk.Label(frame, text="Loss (%)")
         label.grid(row=row, column=0, sticky="ew")
-        entry = ttk.Entry(
-            frame,
-            textvariable=self.loss,
-            validate="key",
-            validatecommand=(self.app.validation.positive_float, "%P"),
+        entry = validation.PositiveFloatEntry(
+            frame, empty_enabled=False, textvariable=self.loss
         )
         entry.grid(row=row, column=1, sticky="ew", pady=PADY)
         if not self.is_symmetric:
-            entry = ttk.Entry(
-                frame,
-                textvariable=self.down_loss,
-                validate="key",
-                validatecommand=(self.app.validation.positive_float, "%P"),
+            entry = validation.PositiveFloatEntry(
+                frame, empty_enabled=False, textvariable=self.down_loss
             )
             entry.grid(row=row, column=2, sticky="ew", pady=PADY)
         row = row + 1
 
         label = ttk.Label(frame, text="Duplicate (%)")
         label.grid(row=row, column=0, sticky="ew")
-        entry = ttk.Entry(
-            frame,
-            textvariable=self.duplicate,
-            validate="key",
-            validatecommand=(self.app.validation.positive_int, "%P"),
+        entry = validation.PositiveIntEntry(
+            frame, empty_enabled=False, textvariable=self.duplicate
         )
         entry.grid(row=row, column=1, sticky="ew", pady=PADY)
         if not self.is_symmetric:
-            entry = ttk.Entry(
-                frame,
-                textvariable=self.down_duplicate,
-                validate="key",
-                validatecommand=(self.app.validation.positive_int, "%P"),
+            entry = validation.PositiveIntEntry(
+                frame, empty_enabled=False, textvariable=self.down_duplicate
             )
             entry.grid(row=row, column=2, sticky="ew", pady=PADY)
         row = row + 1
@@ -229,11 +200,8 @@ class LinkConfigurationDialog(Dialog):
 
         label = ttk.Label(frame, text="Width")
         label.grid(row=row, column=0, sticky="ew")
-        entry = ttk.Entry(
-            frame,
-            textvariable=self.width,
-            validate="key",
-            validatecommand=(self.app.validation.positive_float, "%P"),
+        entry = validation.PositiveFloatEntry(
+            frame, empty_enabled=False, textvariable=self.width
         )
         entry.grid(row=row, column=1, sticky="ew", pady=PADY)
 

daemon/core/gui/dialogs/nodeconfig.py

@@ -6,7 +6,7 @@ from typing import TYPE_CHECKING
 
 import netaddr
 
-from core.gui import nodeutils
+from core.gui import nodeutils, validation
 from core.gui.appconfig import ICONS_PATH
 from core.gui.dialogs.dialog import Dialog
 from core.gui.dialogs.emaneconfig import EmaneModelDialog
@@ -143,16 +143,7 @@ class NodeConfigDialog(Dialog):
         # name field
         label = ttk.Label(frame, text="Name")
         label.grid(row=row, column=0, sticky="ew", padx=PADX, pady=PADY)
-        entry = ttk.Entry(
-            frame,
-            textvariable=self.name,
-            validate="key",
-            validatecommand=(self.app.validation.name, "%P"),
-            state=state,
-        )
-        entry.bind(
-            "<FocusOut>", lambda event: self.app.validation.focus_out(event, "noname")
-        )
+        entry = validation.NodeNameEntry(frame, textvariable=self.name, state=state)
         entry.grid(row=row, column=1, sticky="ew")
         row += 1
 

daemon/core/gui/dialogs/preferences.py

@@ -4,7 +4,7 @@ import tkinter as tk
 from tkinter import ttk
 from typing import TYPE_CHECKING
 
-from core.gui import appconfig
+from core.gui import appconfig, validation
 from core.gui.dialogs.dialog import Dialog
 from core.gui.themes import FRAME_PAD, PADX, PADY, scale_fonts
 from core.gui.validation import LARGEST_SCALE, SMALLEST_SCALE
@@ -80,12 +80,8 @@ class PreferencesDialog(Dialog):
             variable=self.gui_scale,
         )
         scale.grid(row=0, column=0, sticky="ew")
-        entry = ttk.Entry(
-            scale_frame,
-            textvariable=self.gui_scale,
-            width=4,
-            validate="key",
-            validatecommand=(self.app.validation.app_scale, "%P"),
+        entry = validation.AppScaleEntry(
+            scale_frame, textvariable=self.gui_scale, width=4
         )
         entry.grid(row=0, column=1)