Small rewrites (to be continued)

addon/globalPlugins/brailleExtender/brailleTablesExt.py

@@ -25,38 +25,52 @@
 POSITION_NEXT = "n"
 POSITIONS = [POSITION_CURRENT, POSITION_PREVIOUS, POSITION_NEXT]
 
-USABLE_INPUT = 'i'
-USABLE_OUTPUT = 'o'
-USABLE_LIST = [USABLE_INPUT, USABLE_OUTPUT]
+USABLE_INPUT = 0
+USABLE_OUTPUT = 1
+USABLE_BOTH = 2
+USABLE_LIST = [USABLE_INPUT, USABLE_OUTPUT, USABLE_BOTH]
 
-GroupTables = namedtuple("GroupTables", ("name", "members", "usableIn"))
+USABLE_LIST_LABELS = {
+	USABLE_INPUT: _("input only"),
+	USABLE_OUTPUT: _("output only"),
+	USABLE_BOTH: _("input and output")
+}
+GroupTables = namedtuple("GroupTables", (
+	"name", "members", "usableIn"))
 
+conf = config.conf["brailleExtender"]["tables"]
 
-def listContractedTables(tables=None): return [table for table in (
-	tables or listTables()) if table.contracted]
+def listContractedTables(tables=None):
+	return [table for table in (
+		tables or listTables()) if table.contracted]
 
 
-def listUncontractedTables(tables=None): return [table for table in (
-	tables or listTables()) if not table.contracted]
+def listUncontractedTables(tables=None):
+	return [table for table in (
+		tables or listTables()) if not table.contracted]
 
 
-def listInputTables(tables=None): return [
-	table for table in (tables or listTables()) if table.input]
+def listInputTables(tables=None):
+	return [
+		table for table in (tables or listTables()) if table.input]
 
 
 listUncontractedInputTables = listInputTables(listUncontractedTables())
 
 
-def listOutputTables(tables=None): return [
-	table for table in (tables or listTables()) if table.output]
+def listOutputTables(tables=None):
+	return [
+		table for table in (tables or listTables()) if table.output]
 
 
-def listTablesFileName(tables=None): return [
-	table.fileName for table in (tables or listTables())]
+def listTablesFileName(tables=None):
+	return [
+		table.fileName for table in (tables or listTables())]
 
 
-def listTablesDisplayName(tables=None): return [
-	table.displayName for table in (tables or listTables())]
+def listTablesDisplayName(tables=None):
+	return [
+		table.displayName for table in (tables or listTables())]
 
 
 def fileName2displayName(l):
@@ -78,9 +92,9 @@ def listTablesIndexes(l, tables):
 def getPreferredTables() -> Tuple[List[str]]:
 	allInputTablesFileName = listTablesFileName(listInputTables())
 	allOutputTablesFileName = listTablesFileName(listOutputTables())
-	preferredInputTablesFileName = config.conf["brailleExtender"]["tables"]["preferredInput"].split(
+	preferredInputTablesFileName = conf["preferredInput"].split(
 		'|')
-	preferredOutputTablesFileName = config.conf["brailleExtender"]["tables"]["preferredOutput"].split(
+	preferredOutputTablesFileName = conf["preferredOutput"].split(
 		'|')
 	inputTables = [
 		fn for fn in preferredInputTablesFileName if fn in allInputTablesFileName]
@@ -131,30 +145,17 @@ def getTablesFilenameByID(l: List[int], tables=None) -> List[int]:
 
 
 def translateUsableIn(s):
-	labels = {
-		'i': _("input"),
-		'o': _("output"),
-		'io': _("input and output")
-	}
+	labels = USABLE_LIST_LABELS
 	return labels[s] if s in labels.keys() else _("None")
 
 
-def translateUsableInIndexes(usableIn):
-	o = []
-	if 'i' in usableIn:
-		o.append(0)
-	if 'o' in usableIn:
-		o.append(1)
-	return o
-
-
 def setDict(newGroups):
 	global _groups
 	_groups = newGroups
 
 
 def getPathGroups():
-	return f"{configDir}/groups-tables.json"
+	return f"{configDir}/table-groups.json"
 
 
 def initializeGroups():
@@ -179,7 +180,7 @@ def saveGroups(entries=None):
 		{
 			"name": entry.name,
 			"members": entry.members,
-			"usableIn": entry.usableIn
+			"usableIn": entry.usableIn,
 		}
 		for entry in entries
 	]
@@ -284,9 +285,9 @@ def makeSettings(self, settingsSizer):
 
 		label = _("Input braille table to use for keyboard shortcuts")
 		try:
-			selectedItem = 0 if config.conf["brailleExtender"]["tables"]["shortcuts"] == '?' else listTablesFileName(
+			selectedItem = 0 if conf["shortcuts"] == '?' else listTablesFileName(
 				listUncontractedInputTables
-			).index(config.conf["brailleExtender"]["tables"]["shortcuts"]) + 1
+			).index(conf["shortcuts"]) + 1
 		except ValueError:
 			selectedItem = 0
 		self.inputTableShortcuts = sHelper.addLabeledControl(label, wx.Choice, choices=[
@@ -358,14 +359,14 @@ def onSave(self):
 			[self.inputTableShortcuts.GetSelection()-1],
 			listUncontractedInputTables
 		)[0] if self.inputTableShortcuts.GetSelection() > 0 else '?'
-		config.conf["brailleExtender"]["tables"]["preferredInput"] = inputTables
-		config.conf["brailleExtender"]["tables"]["preferredOutput"] = outputTables
-		config.conf["brailleExtender"]["tables"]["shortcuts"] = tablesShortcuts
+		conf["preferredInput"] = inputTables
+		conf["preferredOutput"] = outputTables
+		conf["shortcuts"] = tablesShortcuts
 		config.conf["brailleExtender"]["tabSpace"] = self.tabSpace.IsChecked()
 		config.conf["brailleExtender"][f"tabSize_{configBE.curBD}"] = self.tabSize.Value
 
 	def postSave(self):
-		configBE.initializePreferredTables()
+		pass #initializePreferredTables()
 
 
 class TableGroupsDlg(gui.settingsDialogs.SettingsDialog):
@@ -514,20 +515,21 @@ def __init__(self, parent=None, title=_("Edit Dictionary Entry")):
 		super().__init__(parent, title=title)
 		mainSizer = wx.BoxSizer(wx.VERTICAL)
 		sHelper = gui.guiHelper.BoxSizerHelper(self, orientation=wx.VERTICAL)
-		self.name = sHelper.addLabeledControl(_("Group name"), wx.TextCtrl)
-		label = _(f"Group members")
+		self.name = sHelper.addLabeledControl(_("Group &name"), wx.TextCtrl)
+		label = _("Group &members")
 		self.members = sHelper.addLabeledControl(
 			label, gui.nvdaControls.CustomCheckListBox, choices=listTablesDisplayName(listUncontractedTables()))
 		self.members.SetSelection(0)
 		self.members.Bind(wx.EVT_CHECKLISTBOX, lambda s: self.refreshOrders())
-		label = _("Usable in")
+		label = _("Table &order")
 		self.order = sHelper.addLabeledControl(
-			_("Order of the tables"), wx.Choice, choices=[])
+			label, wx.Choice, choices=[])
 		self.refreshOrders()
-		choices = [_("input"), _("output")]
-		self.usableIn = sHelper.addLabeledControl(
-			label, gui.nvdaControls.CustomCheckListBox, choices=choices)
-		self.usableIn.SetSelection(0)
+		label = _("&Usable in")
+		choices = list(USABLE_LIST_LABELS.values())
+		self.usableIn = sHelper.addItem(wx.RadioBox(self,
+			label=label, choices=choices))
+		self.usableIn.SetSelection(1)
 		sHelper.addDialogDismissButtons(
 			self.CreateButtonSizer(wx.OK | wx.CANCEL))
 		mainSizer.Add(sHelper.sizer, border=20, flag=wx.ALL)

addon/globalPlugins/brailleExtender/configBE.py

@@ -12,7 +12,6 @@
 import config
 import configobj
 import inputCore
-from . import brailleTablesExt
 from .common import *
 from .oneHandMode import DOT_BY_DOT, ONE_SIDE, BOTH_SIDES
 
@@ -276,16 +275,10 @@ def loadConf():
 	limitCellsRight = int(config.conf["brailleExtender"]["rightMarginCells_%s" % curBD])
 	if (backupDisplaySize-limitCellsRight <= backupDisplaySize and limitCellsRight > 0):
 		braille.handler.displaySize = backupDisplaySize-limitCellsRight
-	if config.conf["brailleExtender"]["tables"]["shortcuts"] not in brailleTablesExt.listTablesFileName(brailleTablesExt.listUncontractedTables()): config.conf["brailleExtender"]["tables"]["shortcuts"] = '?'
 	if config.conf["brailleExtender"]["features"]["roleLabels"]:
 		loadRoleLabels(config.conf["brailleExtender"]["roleLabels"].copy())
-	initializePreferredTables()
 	return True
 
-def initializePreferredTables():
-	global inputTables, outputTables
-	inputTables, outputTables = brailleTablesExt.getPreferredTables()
-
 def loadGestures():
 	if gesturesFileExists:
 		if os.path.exists(os.path.join(profilesDir, "_BrowseMode", config.conf["braille"]["inputTable"] + ".ini")): GLng = config.conf["braille"]["inputTable"]