Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ed6951f4cd | ||
|
|
8a61bfff04 |
No files matched your search
@@ -29,11 +29,33 @@ the selected entry disappeared so a reader can refuse to change a different
|
|||||||
setting by mistake. `MessageIDs` lists the menu's own English messages for
|
setting by mistake. `MessageIDs` lists the menu's own English messages for
|
||||||
translation catalogs.
|
translation catalogs.
|
||||||
|
|
||||||
|
`voiceprofiles` supplies the shared Voice profile quick setting: `Quick_options`
|
||||||
|
lists "Default" for the saved voice, then each profile, and adds "Custom" only
|
||||||
|
while the current voice matches neither. These helpers are available starting
|
||||||
|
with v0.7.0. `Quick_choice` reports the current
|
||||||
|
choice and `Quick_profile` resolves a selection. Readers pass the voice that
|
||||||
|
"Default" restores, such as the focused application's saved voice.
|
||||||
|
|
||||||
Both readers store rate, pitch and volume on Speech Dispatcher's -100..100
|
Both readers store rate, pitch and volume on Speech Dispatcher's -100..100
|
||||||
scale, which the hardware protocol also uses. `speechdispatcher.DiscoverQuery`
|
scale, which the hardware protocol also uses. `speechdispatcher.DiscoverQuery`
|
||||||
validates module and voice lists, drops repeated voice aliases and keeps
|
validates module and voice lists, drops repeated voice aliases and keeps
|
||||||
partial results; `Discover` returns the same data as a `Catalog`.
|
partial results; `Discover` returns the same data as a `Catalog`.
|
||||||
|
|
||||||
|
## Translation message IDs
|
||||||
|
|
||||||
|
Shared packages present English text as message IDs and readers translate it
|
||||||
|
through `internalui.Messages`. Each package that presents its own messages
|
||||||
|
exports `MessageIDs()` for reader catalogs: `internalui` for toolkit
|
||||||
|
announcements, `voiceprofiles` for editor labels and `quicksettings` for the
|
||||||
|
menu. Reader extractors add these lists to the IDs found in reader sources.
|
||||||
|
|
||||||
|
Pass message text to `T` or `Format` as a literal, or wrap an ID chosen before
|
||||||
|
translation with `Mark`. Literal `Label` and `Title` values of forms, tabs,
|
||||||
|
controls, choices and options are IDs unless marked `Literal`. User data,
|
||||||
|
product names and voice names are literal. Every package's `MessageIDs` test
|
||||||
|
compares the list with its source in both directions, so a new, renamed or
|
||||||
|
removed message fails until the list is updated.
|
||||||
|
|
||||||
## AI-assisted contributions
|
## AI-assisted contributions
|
||||||
|
|
||||||
AI-assisted contributions are welcome. The person submitting a contribution
|
AI-assisted contributions are welcome. The person submitting a contribution
|
||||||
@@ -44,7 +66,8 @@ before editing. Describe what changed, the tests run, and remaining live reader
|
|||||||
checks. Leave submission to the contributor after their review and testing.
|
checks. Leave submission to the contributor after their review and testing.
|
||||||
|
|
||||||
The shared quick menu and validated discovery API are available starting with
|
The shared quick menu and validated discovery API are available starting with
|
||||||
v0.5.0. Both readers pin v0.6.0 for standalone builds.
|
v0.5.0. Shared translation message ID lists are available starting with v0.6.1.
|
||||||
|
Both readers pin v0.7.0 for standalone builds.
|
||||||
|
|
||||||
## License
|
## License
|
||||||
|
|
||||||
@@ -174,7 +197,7 @@ and 0..9 pitch/volume values at the boundary. It no longer has a separate
|
|||||||
DECtalk encoding. Port opening, serial/USB I/O, flush timing and cancellation
|
DECtalk encoding. Port opening, serial/USB I/O, flush timing and cancellation
|
||||||
synchronization remain the responsibility of the device-owning reader.
|
synchronization remain the responsibility of the device-owning reader.
|
||||||
|
|
||||||
These additions are available starting with v0.4.0. Both readers pin v0.6.0
|
These additions are available starting with v0.4.0. Both readers pin v0.7.0
|
||||||
for standalone builds. Verify pinned dependencies with `GOWORK=off`;
|
for standalone builds. Verify pinned dependencies with `GOWORK=off`;
|
||||||
physical keyboard, audible speech, braille, and hardware acceptance remain
|
physical keyboard, audible speech, braille, and hardware acceptance remain
|
||||||
separate live checks.
|
separate live checks.
|
||||||
@@ -182,8 +205,8 @@ separate live checks.
|
|||||||
## Primary voice profiles
|
## Primary voice profiles
|
||||||
|
|
||||||
`voiceprofiles` supplies the shared primary-voice preset model, collection
|
`voiceprofiles` supplies the shared primary-voice preset model, collection
|
||||||
validation/copying, unique automatic names, management-tab controls, and editor
|
validation/copying, automatic names with duplicate rejection, management-tab
|
||||||
forms for software and hardware speech. `Editor.Refresh_session` maintains
|
controls, and editor forms for software and hardware speech. `Editor.Refresh_session` maintains
|
||||||
module/language/voice dependencies in the shared UI toolkit; native GTK hosts
|
module/language/voice dependencies in the shared UI toolkit; native GTK hosts
|
||||||
use the same form and dependent-control updates. Catalog discovery, native
|
use the same form and dependent-control updates. Catalog discovery, native
|
||||||
widget rendering, speech preparation/rollback and atomic settings persistence
|
widget rendering, speech preparation/rollback and atomic settings persistence
|
||||||
@@ -193,7 +216,7 @@ settings and never modifies unrelated preferences.
|
|||||||
|
|
||||||
`internalui.Session.Focus_control` restores a control when a child editor
|
`internalui.Session.Focus_control` restores a control when a child editor
|
||||||
returns to its parent form. `quicksettings.Option.Literal` preserves user-chosen
|
returns to its parent form. `quicksettings.Option.Literal` preserves user-chosen
|
||||||
profile names without translation. These APIs are available in v0.6.0, pinned
|
profile names without translation. These APIs are available starting with v0.6.0;
|
||||||
by both readers for standalone builds. Run `go test -race ./...` here and the
|
both readers pin v0.7.0 for standalone builds. Run `go test -race ./...` here and the
|
||||||
consumer settings/speech regressions with `GOWORK=off` in both readers. The
|
consumer settings/speech regressions with `GOWORK=off` in both readers. The
|
||||||
sibling workspace supports local development without machine-specific replaces.
|
sibling workspace supports local development without machine-specific replaces.
|
||||||
@@ -0,0 +1,168 @@
|
|||||||
|
// Copyright (c) 2026 Storm Dragon
|
||||||
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
|
// Package messagecheck verifies that a package's exported message ID list
|
||||||
|
// matches the English messages its source actually presents.
|
||||||
|
package messagecheck
|
||||||
|
|
||||||
|
import (
|
||||||
|
"go/ast"
|
||||||
|
"go/parser"
|
||||||
|
"go/token"
|
||||||
|
"io/fs"
|
||||||
|
"path/filepath"
|
||||||
|
"slices"
|
||||||
|
"strconv"
|
||||||
|
"strings"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Collect returns message IDs found in non-test Go files under root:
|
||||||
|
// literal arguments of Messages T/Format calls, literal arguments of Mark,
|
||||||
|
// and literal Label/Title fields of composite values not marked Literal.
|
||||||
|
func Collect(root string) ([]string, error) {
|
||||||
|
found := map[string]bool{}
|
||||||
|
err := filepath.WalkDir(root, func(path string, entry fs.DirEntry, err error) error {
|
||||||
|
if err != nil || entry.IsDir() || !strings.HasSuffix(path, ".go") || strings.HasSuffix(path, "_test.go") {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
file, err := parser.ParseFile(token.NewFileSet(), path, nil, 0)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
// Elided element types, as in []Control{{...}}, inherit the outer element type.
|
||||||
|
elided := map[*ast.CompositeLit]string{}
|
||||||
|
ast.Inspect(file, func(node ast.Node) bool {
|
||||||
|
switch n := node.(type) {
|
||||||
|
case *ast.CallExpr:
|
||||||
|
if len(n.Args) > 0 && is_message_call(n.Fun) {
|
||||||
|
add(found, n.Args[0])
|
||||||
|
}
|
||||||
|
case *ast.CompositeLit:
|
||||||
|
typeName, ok := elided[n]
|
||||||
|
if n.Type != nil {
|
||||||
|
typeName = type_name(n.Type)
|
||||||
|
} else if !ok {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
for _, element := range n.Elts {
|
||||||
|
if pair, ok := element.(*ast.KeyValueExpr); ok {
|
||||||
|
element = pair.Value
|
||||||
|
}
|
||||||
|
if inner, ok := element.(*ast.CompositeLit); ok && inner.Type == nil {
|
||||||
|
elided[inner] = element_type_name(n.Type, typeName)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !uiTypes[typeName] {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
fields := map[string]ast.Expr{}
|
||||||
|
for _, element := range n.Elts {
|
||||||
|
if pair, ok := element.(*ast.KeyValueExpr); ok {
|
||||||
|
if key, ok := pair.Key.(*ast.Ident); ok {
|
||||||
|
fields[key.Name] = pair.Value
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if literal, ok := fields["Literal"].(*ast.Ident); ok && literal.Name == "true" {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
for _, name := range []string{"Label", "Title"} {
|
||||||
|
if value, ok := fields[name]; ok {
|
||||||
|
add(found, value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
})
|
||||||
|
return nil
|
||||||
|
})
|
||||||
|
ids := make([]string, 0, len(found))
|
||||||
|
for id := range found {
|
||||||
|
ids = append(ids, id)
|
||||||
|
}
|
||||||
|
slices.Sort(ids)
|
||||||
|
return ids, err
|
||||||
|
}
|
||||||
|
|
||||||
|
// uiTypes are the presentation values whose Label and Title are message IDs.
|
||||||
|
var uiTypes = map[string]bool{"Form": true, "Tab": true, "Control": true, "Choice": true, "Option": true}
|
||||||
|
|
||||||
|
func type_name(expr ast.Expr) string {
|
||||||
|
switch t := expr.(type) {
|
||||||
|
case *ast.Ident:
|
||||||
|
return t.Name
|
||||||
|
case *ast.SelectorExpr:
|
||||||
|
return t.Sel.Name
|
||||||
|
case *ast.StarExpr:
|
||||||
|
return type_name(t.X)
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// element_type_name names the type of elided values inside a composite literal.
|
||||||
|
func element_type_name(outer ast.Expr, inherited string) string {
|
||||||
|
switch t := outer.(type) {
|
||||||
|
case *ast.ArrayType:
|
||||||
|
return type_name(t.Elt)
|
||||||
|
case *ast.MapType:
|
||||||
|
return type_name(t.Value)
|
||||||
|
case nil:
|
||||||
|
return inherited
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
func is_message_call(fun ast.Expr) bool {
|
||||||
|
switch f := fun.(type) {
|
||||||
|
case *ast.Ident:
|
||||||
|
return f.Name == "Mark"
|
||||||
|
case *ast.SelectorExpr:
|
||||||
|
if f.Sel.Name == "Mark" {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
if f.Sel.Name != "T" && f.Sel.Name != "Format" {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
owner := f.X
|
||||||
|
if selector, ok := owner.(*ast.SelectorExpr); ok {
|
||||||
|
owner = selector.Sel
|
||||||
|
}
|
||||||
|
ident, ok := owner.(*ast.Ident)
|
||||||
|
return ok && strings.EqualFold(ident.Name, "messages")
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
|
func add(found map[string]bool, expr ast.Expr) {
|
||||||
|
if literal, ok := expr.(*ast.BasicLit); ok && literal.Kind == token.STRING {
|
||||||
|
if text, err := strconv.Unquote(literal.Value); err == nil && text != "" {
|
||||||
|
found[text] = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Match fails t unless ids lists exactly the messages Collect finds under root.
|
||||||
|
func Match(t *testing.T, root string, ids []string) {
|
||||||
|
t.Helper()
|
||||||
|
collected, err := Collect(root)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
listed := map[string]bool{}
|
||||||
|
for _, id := range ids {
|
||||||
|
if id == "" || listed[id] {
|
||||||
|
t.Errorf("empty or duplicate message ID %q", id)
|
||||||
|
}
|
||||||
|
listed[id] = true
|
||||||
|
}
|
||||||
|
for _, id := range collected {
|
||||||
|
if !listed[id] {
|
||||||
|
t.Errorf("message %q is presented but missing from MessageIDs", id)
|
||||||
|
}
|
||||||
|
delete(listed, id)
|
||||||
|
}
|
||||||
|
for id := range listed {
|
||||||
|
t.Errorf("MessageIDs lists %q, which the source no longer presents", id)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
// Copyright (c) 2026 Storm Dragon
|
||||||
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
|
package messagecheck
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"slices"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestCollectFindsOnlyPresentedMessages(t *testing.T) {
|
||||||
|
root := t.TempDir()
|
||||||
|
source := `package sample
|
||||||
|
|
||||||
|
func render(s session, choice Choice) {
|
||||||
|
s.messages.T("Translated")
|
||||||
|
s.messages.Format("Formatted {0}", "value")
|
||||||
|
m.Messages.T("Selector owner")
|
||||||
|
clock.Format("2006-01-02")
|
||||||
|
state := Mark("Marked")
|
||||||
|
_ = message.Mark("Qualified mark")
|
||||||
|
_ = Form{Title: "Title", Tabs: []Tab{{Label: "Elided tab", Controls: []Control{{Label: "Nested"}}}}}
|
||||||
|
_ = ui.Choice{Label: "Literal name", Literal: true}
|
||||||
|
_ = []*ui.Choice{{Label: "Pointer choice"}}
|
||||||
|
_ = Driver{Label: "Product name"}
|
||||||
|
_ = s.messages.T(state)
|
||||||
|
}
|
||||||
|
`
|
||||||
|
if err := os.WriteFile(filepath.Join(root, "sample.go"), []byte(source), 0o644); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if err := os.WriteFile(filepath.Join(root, "sample_test.go"), []byte("package sample\n\nvar _ = Mark(\"Test only\")\n"), 0o644); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
got, err := Collect(root)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
want := []string{"Elided tab", "Formatted {0}", "Marked", "Nested", "Pointer choice", "Qualified mark", "Selector owner", "Title", "Translated"}
|
||||||
|
if !slices.Equal(got, want) {
|
||||||
|
t.Fatalf("got %q, want %q", got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -12,6 +12,10 @@ import (
|
|||||||
// calling context; a nil function selects the built-in English messages.
|
// calling context; a nil function selects the built-in English messages.
|
||||||
type Messages struct{ Translate func(string) string }
|
type Messages struct{ Translate func(string) string }
|
||||||
|
|
||||||
|
// Mark returns id unchanged. It flags a message ID that is chosen before
|
||||||
|
// translation, such as a template held in a variable, for catalog extraction.
|
||||||
|
func Mark(id string) string { return id }
|
||||||
|
|
||||||
func (m Messages) T(message string) string {
|
func (m Messages) T(message string) string {
|
||||||
if m.Translate != nil {
|
if m.Translate != nil {
|
||||||
return m.Translate(message)
|
return m.Translate(message)
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
// Copyright (c) 2026 Storm Dragon
|
||||||
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
|
package internalui
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"git.stormux.org/storm/screenreader-common/internal/messagecheck"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestMessageIDsMatchPresentedMessages(t *testing.T) {
|
||||||
|
messagecheck.Match(t, ".", MessageIDs())
|
||||||
|
}
|
||||||
@@ -6,3 +6,21 @@ package internalui
|
|||||||
import "git.stormux.org/storm/screenreader-common/internalui/message"
|
import "git.stormux.org/storm/screenreader-common/internalui/message"
|
||||||
|
|
||||||
type Messages = message.Messages
|
type Messages = message.Messages
|
||||||
|
|
||||||
|
// Mark flags a message ID chosen before translation; see message.Mark.
|
||||||
|
func Mark(id string) string { return message.Mark(id) }
|
||||||
|
|
||||||
|
// MessageIDs lists the toolkit's own English messages for translation
|
||||||
|
// catalogs. Hosts add their form titles, labels and choices separately.
|
||||||
|
func MessageIDs() []string {
|
||||||
|
return []string{
|
||||||
|
" (selected {0} characters)", "1 character", "Copy and cut are unavailable for password fields",
|
||||||
|
"Deleted {0}", "End of text", "Hidden character", "Inserted {0}", "Invalid text", "No matches",
|
||||||
|
"Only single-line text is accepted", "Search cleared", "Search {0}", "Selected all",
|
||||||
|
"Text limit reached", "checked", "unavailable", "unchecked", "{0} button", "{0} characters",
|
||||||
|
"{0} combo box {1}", "{0} entry {1}", "{0} grid. {1}", "{0} is required", "{0} tab",
|
||||||
|
"{0}, button", "{0}, edit: {1}", "{0}, password edit, {1}", "{0}, password edit: {1}",
|
||||||
|
"{0}, selected", "{0}. row {1}, column {2}", "{0}. row {1}, column {2}. {3} of {4}",
|
||||||
|
"{0}. {1} of {2}", "{0}: {1}, {2} of {3}",
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -37,9 +37,9 @@ func (s *Session) describe() string {
|
|||||||
label := s.messages.T(control.Label)
|
label := s.messages.T(control.Label)
|
||||||
switch control.Kind {
|
switch control.Kind {
|
||||||
case CheckBox:
|
case CheckBox:
|
||||||
state := "unchecked"
|
state := Mark("unchecked")
|
||||||
if control.Checked {
|
if control.Checked {
|
||||||
state = "checked"
|
state = Mark("checked")
|
||||||
}
|
}
|
||||||
return label + " " + s.messages.T(state)
|
return label + " " + s.messages.T(state)
|
||||||
case Number:
|
case Number:
|
||||||
@@ -103,13 +103,13 @@ func (s *Session) Presentation() Result {
|
|||||||
c := s.form.Tabs[s.tab].Controls[s.focus]
|
c := s.form.Tabs[s.tab].Controls[s.focus]
|
||||||
label := s.messages.T(c.Label)
|
label := s.messages.T(c.Label)
|
||||||
if c.Kind == Entry {
|
if c.Kind == Entry {
|
||||||
template := "{0}, edit: {1}"
|
template := Mark("{0}, edit: {1}")
|
||||||
if !s.form.Detailed {
|
if !s.form.Detailed {
|
||||||
template = "{0} entry {1}"
|
template = Mark("{0} entry {1}")
|
||||||
}
|
}
|
||||||
value := c.Text
|
value := c.Text
|
||||||
if c.Secret {
|
if c.Secret {
|
||||||
template = "{0}, password edit: {1}"
|
template = Mark("{0}, password edit: {1}")
|
||||||
value = strings.Repeat("*", utf8.RuneCountInString(c.Text))
|
value = strings.Repeat("*", utf8.RuneCountInString(c.Text))
|
||||||
}
|
}
|
||||||
text := s.messages.Format(template, label, value)
|
text := s.messages.Format(template, label, value)
|
||||||
@@ -142,9 +142,9 @@ func (s *Session) Presentation() Result {
|
|||||||
text = s.messages.Format("{0}: {1}, {2} of {3}", label, speech, strconv.Itoa(c.Selected+1), strconv.Itoa(len(s.list_labels(c))))
|
text = s.messages.Format("{0}: {1}, {2} of {3}", label, speech, strconv.Itoa(c.Selected+1), strconv.Itoa(len(s.list_labels(c))))
|
||||||
}
|
}
|
||||||
case CheckBox:
|
case CheckBox:
|
||||||
state := "unchecked"
|
state := Mark("unchecked")
|
||||||
if c.Checked {
|
if c.Checked {
|
||||||
state = "checked"
|
state = Mark("checked")
|
||||||
}
|
}
|
||||||
text = label + ", " + s.messages.T(state)
|
text = label + ", " + s.messages.T(state)
|
||||||
speech = text
|
speech = text
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
// Copyright (c) 2026 Storm Dragon
|
||||||
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
|
package quicksettings
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"git.stormux.org/storm/screenreader-common/internal/messagecheck"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestMessageIDsMatchPresentedMessages(t *testing.T) {
|
||||||
|
messagecheck.Match(t, ".", MessageIDs())
|
||||||
|
}
|
||||||
+19
-8
@@ -54,9 +54,9 @@ func (e *Editor) controls(p Profile) []ui.Control {
|
|||||||
for _, driver := range e.drivers {
|
for _, driver := range e.drivers {
|
||||||
drivers = append(drivers, choice(driver.ID, driver.Label))
|
drivers = append(drivers, choice(driver.ID, driver.Label))
|
||||||
}
|
}
|
||||||
controls := []ui.Control{{ID: "name", Label: "Voice Profile Name", Kind: ui.Entry, Text: p.Name, MaxLength: 128}, combo("driver", "Synthesizer", p.Driver, drivers)}
|
controls := []ui.Control{{ID: "name", Label: "Voice Profile Name", Kind: ui.Entry, Text: p.Name, MaxLength: 128}, combo("driver", ui.Mark("Synthesizer"), p.Driver, drivers)}
|
||||||
driver, _ := driver_for(p.Driver)
|
driver, _ := driver_for(p.Driver)
|
||||||
modules := []ui.Choice{choice("", "Default")}
|
modules := []ui.Choice{ui.Choice{ID: "", Label: "Default"}}
|
||||||
keys := []string{}
|
keys := []string{}
|
||||||
for module := range e.catalog {
|
for module := range e.catalog {
|
||||||
if module != "" {
|
if module != "" {
|
||||||
@@ -67,8 +67,8 @@ func (e *Editor) controls(p Profile) []ui.Control {
|
|||||||
for _, module := range keys {
|
for _, module := range keys {
|
||||||
modules = append(modules, choice(module, module))
|
modules = append(modules, choice(module, module))
|
||||||
}
|
}
|
||||||
languages := []ui.Choice{choice("", "Default")}
|
languages := []ui.Choice{ui.Choice{ID: "", Label: "Default"}}
|
||||||
voices := []ui.Choice{choice("", "Default")}
|
voices := []ui.Choice{ui.Choice{ID: "", Label: "Default"}}
|
||||||
seen := map[string]bool{"": true}
|
seen := map[string]bool{"": true}
|
||||||
for _, voice := range e.catalog[p.Module] {
|
for _, voice := range e.catalog[p.Module] {
|
||||||
if !seen[voice.Language] {
|
if !seen[voice.Language] {
|
||||||
@@ -87,7 +87,7 @@ func (e *Editor) controls(p Profile) []ui.Control {
|
|||||||
seen[voice.Name] = true
|
seen[voice.Name] = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
for _, c := range []ui.Control{combo("module", "Module", p.Module, modules), combo("language", "Language", p.Language, languages), combo("voice", "Voice", p.Voice, voices)} {
|
for _, c := range []ui.Control{combo("module", ui.Mark("Module"), p.Module, modules), combo("language", ui.Mark("Language"), p.Language, languages), combo("voice", ui.Mark("Voice"), p.Voice, voices)} {
|
||||||
c.Hidden = driver.Hardware
|
c.Hidden = driver.Hardware
|
||||||
controls = append(controls, c)
|
controls = append(controls, c)
|
||||||
}
|
}
|
||||||
@@ -96,13 +96,13 @@ func (e *Editor) controls(p Profile) []ui.Control {
|
|||||||
baud = append(baud, choice(strconv.Itoa(n), strconv.Itoa(n)))
|
baud = append(baud, choice(strconv.Itoa(n), strconv.Itoa(n)))
|
||||||
}
|
}
|
||||||
device := ui.Control{ID: "device", Label: "Serial device", Kind: ui.Entry, Text: p.Device, Hidden: !driver.Serial, MaxLength: 1024}
|
device := ui.Control{ID: "device", Label: "Serial device", Kind: ui.Entry, Text: p.Device, Hidden: !driver.Serial, MaxLength: 1024}
|
||||||
baudControl := combo("baud", "Baud rate", strconv.Itoa(p.BaudRate), baud)
|
baudControl := combo("baud", ui.Mark("Baud rate"), strconv.Itoa(p.BaudRate), baud)
|
||||||
baudControl.Hidden = !driver.Serial
|
baudControl.Hidden = !driver.Serial
|
||||||
controls = append(controls, device, baudControl)
|
controls = append(controls, device, baudControl)
|
||||||
for _, item := range []struct {
|
for _, item := range []struct {
|
||||||
id, label string
|
id, label string
|
||||||
value int
|
value int
|
||||||
}{{"rate", "Rate", p.Rate}, {"pitch", "Pitch", p.Pitch}, {"volume", "Volume", p.Volume}} {
|
}{{"rate", ui.Mark("Rate"), p.Rate}, {"pitch", ui.Mark("Pitch"), p.Pitch}, {"volume", ui.Mark("Volume"), p.Volume}} {
|
||||||
controls = append(controls, ui.Control{ID: item.id, Label: item.label, Kind: ui.Number, Number: float64(item.value), Min: -100, Max: 100, Step: 10, UpDownStep: 1})
|
controls = append(controls, ui.Control{ID: item.id, Label: item.label, Kind: ui.Number, Number: float64(item.value), Min: -100, Max: 100, Step: 10, UpDownStep: 1})
|
||||||
}
|
}
|
||||||
return append(controls, ui.Control{ID: "save", Label: "Save Voice Profile", Kind: ui.Button, Action: "save-profile"}, ui.Control{ID: "cancel", Label: "Cancel", Kind: ui.Button, Action: "cancel", SkipValidation: true})
|
return append(controls, ui.Control{ID: "save", Label: "Save Voice Profile", Kind: ui.Button, Action: "save-profile"}, ui.Control{ID: "cancel", Label: "Cancel", Kind: ui.Button, Action: "cancel", SkipValidation: true})
|
||||||
@@ -217,9 +217,20 @@ func (c Collection) Tab() ui.Tab {
|
|||||||
}
|
}
|
||||||
tab.Controls = append(tab.Controls, ui.Control{ID: "add", Label: "Add Voice Profile", Kind: ui.Button, Action: "add-profile"})
|
tab.Controls = append(tab.Controls, ui.Control{ID: "add", Label: "Add Voice Profile", Kind: ui.Button, Action: "add-profile"})
|
||||||
if len(c.Profiles) > 0 {
|
if len(c.Profiles) > 0 {
|
||||||
for _, item := range []struct{ id, label string }{{"edit", "Edit Voice Profile"}, {"remove", "Remove Voice Profile"}, {"use", "Use Voice Profile"}} {
|
for _, item := range []struct{ id, label string }{{"edit", ui.Mark("Edit Voice Profile")}, {"remove", ui.Mark("Remove Voice Profile")}, {"use", ui.Mark("Use Voice Profile")}} {
|
||||||
tab.Controls = append(tab.Controls, ui.Control{ID: item.id, Label: item.label, Kind: ui.Button, Action: item.id + "-profile"})
|
tab.Controls = append(tab.Controls, ui.Control{ID: item.id, Label: item.label, Kind: ui.Button, Action: item.id + "-profile"})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return tab
|
return tab
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// MessageIDs lists the editor's English labels for translation catalogs.
|
||||||
|
// Synthesizer, module, language and voice names are presented literally.
|
||||||
|
func MessageIDs() []string {
|
||||||
|
return []string{
|
||||||
|
"Add Voice Profile", "Baud rate", "Cancel", "Custom", "Default", "Edit Voice Profile", "Language",
|
||||||
|
"Module", "Pitch", "Rate", "Remove Voice Profile", "Save Voice Profile", "Serial device",
|
||||||
|
"Synthesizer", "Use Voice Profile", "Voice", "Voice Profile", "Voice Profile Name",
|
||||||
|
"Voice Profiles", "Volume",
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
// Copyright (c) 2026 Storm Dragon
|
||||||
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
|
package voiceprofiles
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"git.stormux.org/storm/screenreader-common/internal/messagecheck"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestMessageIDsMatchPresentedMessages(t *testing.T) {
|
||||||
|
messagecheck.Match(t, ".", MessageIDs())
|
||||||
|
}
|
||||||
@@ -119,3 +119,15 @@ func TestEditorCancelAndGeneratedName(t *testing.T) {
|
|||||||
t.Fatal(tab)
|
t.Fatal(tab)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestEditorTranslatesLabelsButNotVoiceData(t *testing.T) {
|
||||||
|
catalog := sd.Catalog{"fixture": {{Name: "English", Language: "en"}}}
|
||||||
|
editor := New_editor(Profile{Name: "Saved", Driver: "speech-dispatcher"}, Drivers(), catalog)
|
||||||
|
for _, c := range editor.Form().Tabs[0].Controls {
|
||||||
|
for _, choice := range c.Choices {
|
||||||
|
if choice.Literal == (choice.ID == "") {
|
||||||
|
t.Fatalf("%s choice %q literal=%v", c.ID, choice.Label, choice.Literal)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
// Copyright (c) 2026 Storm Dragon
|
||||||
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
|
package voiceprofiles
|
||||||
|
|
||||||
|
import "git.stormux.org/storm/screenreader-common/quicksettings"
|
||||||
|
|
||||||
|
// QuickSavedChoice is the quick settings choice for the saved voice, announced
|
||||||
|
// as "Default". Profile names are visible text, so this ID cannot collide.
|
||||||
|
const QuickSavedChoice = "\x00saved"
|
||||||
|
|
||||||
|
// Quick_choice names the profile matching current, then QuickSavedChoice when
|
||||||
|
// current is the saved voice, and otherwise "" for a voice changed this session.
|
||||||
|
// saved is the voice the reader would use without session changes, such as the
|
||||||
|
// focused application's saved voice; nil when unknown.
|
||||||
|
func (c Collection) Quick_choice(current Profile, saved *Profile) string {
|
||||||
|
if name := c.Matching(current); name != "" {
|
||||||
|
return name
|
||||||
|
}
|
||||||
|
if saved != nil && Same_voice(*saved, current) {
|
||||||
|
return QuickSavedChoice
|
||||||
|
}
|
||||||
|
return ""
|
||||||
|
}
|
||||||
|
|
||||||
|
// Quick_options lists "Custom" only while current matches no saved voice, then
|
||||||
|
// "Default" for the saved voice, then each profile by name.
|
||||||
|
func (c Collection) Quick_options(current Profile, saved *Profile) []quicksettings.Option {
|
||||||
|
options := []quicksettings.Option{}
|
||||||
|
if c.Quick_choice(current, saved) == "" {
|
||||||
|
options = append(options, quicksettings.Option{ID: "", Label: "Custom"})
|
||||||
|
}
|
||||||
|
if saved != nil {
|
||||||
|
options = append(options, quicksettings.Option{ID: QuickSavedChoice, Label: "Default"})
|
||||||
|
}
|
||||||
|
for _, p := range c.Profiles {
|
||||||
|
options = append(options, quicksettings.Option{ID: p.Name, Label: p.Name, Literal: true})
|
||||||
|
}
|
||||||
|
return options
|
||||||
|
}
|
||||||
|
|
||||||
|
// Quick_profile returns the voice a quick settings choice selects.
|
||||||
|
func (c Collection) Quick_profile(choice string, saved *Profile) (Profile, bool) {
|
||||||
|
if choice == QuickSavedChoice {
|
||||||
|
if saved == nil {
|
||||||
|
return Profile{}, false
|
||||||
|
}
|
||||||
|
return *saved, true
|
||||||
|
}
|
||||||
|
return c.Find(choice)
|
||||||
|
}
|
||||||
@@ -0,0 +1,57 @@
|
|||||||
|
// Copyright (c) 2026 Storm Dragon
|
||||||
|
// SPDX-License-Identifier: GPL-3.0-or-later
|
||||||
|
|
||||||
|
package voiceprofiles
|
||||||
|
|
||||||
|
import (
|
||||||
|
"reflect"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"git.stormux.org/storm/screenreader-common/quicksettings"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestQuickChoicesNameSavedVoiceDefault(t *testing.T) {
|
||||||
|
saved := fixture_profile()
|
||||||
|
named := fixture_profile()
|
||||||
|
named.Name, named.Rate = "Fast", 50
|
||||||
|
collection := Collection{Profiles: []Profile{named}}
|
||||||
|
labels := func(options []quicksettings.Option) []string {
|
||||||
|
var result []string
|
||||||
|
for _, option := range options {
|
||||||
|
result = append(result, option.Label)
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
if choice := collection.Quick_choice(saved, &saved); choice != QuickSavedChoice {
|
||||||
|
t.Fatalf("unchanged voice choice = %q", choice)
|
||||||
|
}
|
||||||
|
if got := labels(collection.Quick_options(saved, &saved)); !reflect.DeepEqual(got, []string{"Default", "Fast"}) {
|
||||||
|
t.Fatalf("unchanged voice options = %q", got)
|
||||||
|
}
|
||||||
|
if choice := collection.Quick_choice(named, &saved); choice != "Fast" {
|
||||||
|
t.Fatalf("profile choice = %q", choice)
|
||||||
|
}
|
||||||
|
|
||||||
|
changed := saved
|
||||||
|
changed.Rate = 20
|
||||||
|
if choice := collection.Quick_choice(changed, &saved); choice != "" {
|
||||||
|
t.Fatalf("changed voice choice = %q", choice)
|
||||||
|
}
|
||||||
|
if got := labels(collection.Quick_options(changed, &saved)); !reflect.DeepEqual(got, []string{"Custom", "Default", "Fast"}) {
|
||||||
|
t.Fatalf("changed voice options = %q", got)
|
||||||
|
}
|
||||||
|
if got := labels((Collection{}).Quick_options(saved, &saved)); !reflect.DeepEqual(got, []string{"Default"}) {
|
||||||
|
t.Fatalf("options without profiles = %q", got)
|
||||||
|
}
|
||||||
|
|
||||||
|
if p, ok := collection.Quick_profile(QuickSavedChoice, &saved); !ok || p != saved {
|
||||||
|
t.Fatal("saved choice did not return the saved voice")
|
||||||
|
}
|
||||||
|
if _, ok := collection.Quick_profile(QuickSavedChoice, nil); ok {
|
||||||
|
t.Fatal("unknown saved voice was selectable")
|
||||||
|
}
|
||||||
|
if p, ok := collection.Quick_profile("Fast", &saved); !ok || p.Name != "Fast" {
|
||||||
|
t.Fatal("profile choice did not return the profile")
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in new issue
Block a user