Settings menu in two declared pages, with the input box layout as a setting

pyproject.toml

@@ -31,7 +31,7 @@ dependencies = [
     "metaclass-registry",
     "agent-client-protocol==0.12.1",
     "ui-theme",
-    "formbridge==0.2.0",
+    "formbridge",
     "objectstate==5.0.0",
     "msgpack==1.2.2",
 ]
@@ -44,7 +44,7 @@ ui-theme = { git = "https://github.com/OpenHCSDev/ui-theme.git", branch = "main"
 agent-comms = { git = "https://github.com/OpenHCSDev/agent-comms.git", branch = "main" }
 metaclass-registry = { git = "https://github.com/OpenHCSDev/metaclass-registry", branch = "main" }
 textual = { git = "https://github.com/OpenHCSDev/textual.git", branch = "main" }
-formbridge = { git = "https://github.com/OpenHCSDev/formbridge.git", rev = "ebe2fa9173428e2bd7154a0de23698757677c3c2" }
+formbridge = { git = "https://github.com/OpenHCSDev/formbridge.git", branch = "main" }
 objectstate = { git = "https://github.com/OpenHCSDev/objectstate.git", rev = "b5dd9f78b9293df145d7629f21deb89b042b9400" }
 textual-image = { git = "https://github.com/OpenHCSDev/textual-image.git", rev = "1f1d8b8ea3c30b39da3b14ea0ac0786ce9c49a80" }
 textual-diff-view = { git = "https://github.com/OpenHCSDev/textual-diff-view.git", rev = "95db444b536cba27081dd2c1496f71e25670a446" }

src/toad/core/preference_events.py

@@ -2,7 +2,7 @@
 
 from dataclasses import dataclass
 
-from toad.forms.declared_views import DeclaredField
+from formbridge.forms.declared_fields import DeclaredField
 from .events import CoreEvent
 
 

src/toad/forms/editors.py

@@ -20,13 +20,11 @@
 from textual.validation import Function
 from textual.geometry import Spacing
 from textual.css.scalar import Scalar
-from textual.color import TRANSPARENT
 from textual.widget import Widget
 from textual.widgets import Checkbox, Input, Select, TextArea
 from textual.widgets._input import InputType
 
-from toad.forms.declared_views import DeclaredField, DeclaredViews, declarations
-from toad.forms.kinds import Multiline
+from formbridge.forms.declared_fields import DeclaredField, DeclaredViews, Multiline, declarations
 from toad.forms.presentation import FormCheckbox, FormInput, FormSelectCurrent, FramedControl
 from toad.widget_view import WidgetView
 from toad.tone_paint import UntintedTonePaint
@@ -45,9 +43,6 @@ class ValueEditor(DeclaredViews, EditorWidget):
     control is initialized: `class BoolEditor(ValueEditor, Checkbox)`.
     """
 
-    states_default: ClassVar[bool] = True
-    """Whether the field's help should end with its default value."""
-
     field: DeclaredField
     feedback: var[str] = var("", init=False)
 
@@ -86,6 +81,10 @@ def value_text(self, value: object) -> str:
         """How a value of this field reads."""
         return self.field.placeholder if value is None else str(value)
 
+    def default_note(self) -> str:
+        """The line ending the field's help that names its default value."""
+        return f"\ndefault: {self.value_text(self.field.default)}" if self.field.has_default else ""
+
     def send(self, value: object) -> None:
         try:
             self.field.edit(value)
@@ -186,7 +185,9 @@ class MultilineEditor(ValueEditor, UntintedTonePaint, FramedControl, TextArea):
     height = Scalar.from_number(10)
     padding = Spacing(0, 1, 0, 1)
 
-    states_default = False
+    def default_note(self) -> str:
+        """A text block's default is too long to restate under its help."""
+        return ""
 
     def control_arguments(self) -> dict[str, object]:
         return {"text": str(self.field.value or "")}