Skip to content

Commit 9ab3dba

Browse files
CrazySteve0605CrazySteve0605
committed
Merge branch 'wordNavigationForChineseText' into brailleOutputForChinese
2 parents 251811e + 0940a73 commit 9ab3dba

127 files changed

Lines changed: 382495 additions & 336175 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎include/liblouis‎

nvdaHelper/local/nvdaControllerInternal.c renamed to nvdaHelper/local/nvdaControllerInternal.cpp

File renamed without changes.

‎nvdaHelper/local/sconscript‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ localLib = env.SharedLibrary(
8585
"nvdaController.cpp",
8686
winIPCUtilsObj,
8787
controllerRPCServerSource,
88-
"nvdaControllerInternal.c",
88+
"nvdaControllerInternal.cpp",
8989
controllerInternalRPCServerSource,
9090
"dllImportTableHooks.cpp",
9191
"nvdaHelperLocal.def",

‎source/NVDAHelper/__init__.py‎

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -846,16 +846,21 @@ def initialize() -> None:
846846
# Manually start the in-process manager thread for this NVDA main thread now, as a slow system can cause this action to confuse WX
847847
_remoteLib.initInprocManagerThreadIfNeeded()
848848
arch = winVersion.getWinVer().processorArchitecture
849-
if arch != "x86" and ReadPaths.coreArchLibPath != ReadPaths.versionedLibX86Path:
850-
_remoteLoaderX86 = _RemoteLoader(ReadPaths.versionedLibX86Path)
851-
elif arch in ("AMD64", "ARM64") and ReadPaths.coreArchLibPath != ReadPaths.versionedLibAMD64Path:
852-
_remoteLoaderAMD64 = _RemoteLoader(ReadPaths.versionedLibAMD64Path)
853-
elif arch == "ARM64" and ReadPaths.coreArchLibPath != ReadPaths.versionedLibARM64Path:
854-
_remoteLoaderARM64 = _RemoteLoader(ReadPaths.versionedLibARM64Path)
855-
# Windows on ARM from Windows 11 supports running AMD64 apps.
856-
# Thus we also need to be able to inject into these.
857-
if winVersion.getWinVer() >= winVersion.WIN11:
849+
if arch == "AMD64":
850+
if ReadPaths.coreArchLibPath != ReadPaths.versionedLibX86Path:
851+
_remoteLoaderX86 = _RemoteLoader(ReadPaths.versionedLibX86Path)
852+
if ReadPaths.coreArchLibPath != ReadPaths.versionedLibAMD64Path:
858853
_remoteLoaderAMD64 = _RemoteLoader(ReadPaths.versionedLibAMD64Path)
854+
elif arch == "ARM64":
855+
if ReadPaths.coreArchLibPath != ReadPaths.versionedLibX86Path:
856+
_remoteLoaderX86 = _RemoteLoader(ReadPaths.versionedLibX86Path)
857+
if ReadPaths.coreArchLibPath != ReadPaths.versionedLibAMD64Path:
858+
# Windows 10 on ARM does not support AMD64 emulation.
859+
# Thus only start the AMD64 remote loader if on Windows 11 or above.
860+
if winVersion.getWinVer() >= winVersion.WIN11:
861+
_remoteLoaderAMD64 = _RemoteLoader(ReadPaths.versionedLibAMD64Path)
862+
if ReadPaths.coreArchLibPath != ReadPaths.versionedLibARM64Path:
863+
_remoteLoaderARM64 = _RemoteLoader(ReadPaths.versionedLibARM64Path)
859864

860865

861866
def terminate():

‎source/config/featureFlagEnums.py‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -139,23 +139,6 @@ def _displayStringLabels(self) -> dict["FontFormattingBrailleModeFlag", str]:
139139
}
140140

141141

142-
class InitWordSegForUnusedLnagFlag(DisplayStringEnum):
143-
"""Boolean flag for whether to initialize the word segmenters for all languages, even if they are not used."""
144-
145-
@property
146-
def _displayStringLabels(self):
147-
return {
148-
# Translators: Label for an option in NVDA settings.
149-
self.DISABLED: _("Disabled"),
150-
# Translators: Label for an option in NVDA settings.
151-
self.ENABLED: _("Enabled"),
152-
}
153-
154-
DEFAULT = enum.auto()
155-
DISABLED = enum.auto()
156-
ENABLED = enum.auto()
157-
158-
159142
class WordNavigationUnitFlag(DisplayStringEnum):
160143
"""Enumeration for word navigation."""
161144

‎source/gui/settingsDialogs.py‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3092,13 +3092,6 @@ class DocumentNavigationPanel(SettingsPanel):
30923092
def makeSettings(self, settingsSizer: wx.BoxSizer) -> None:
30933093
sHelper = guiHelper.BoxSizerHelper(self, sizer=settingsSizer)
30943094

3095-
# Translators: This is a label for the initialization for word segmenters for unused languages in the document navigation dialog
3096-
initUnusedLangLabel = _("&Initialize Word Segmenters for Unused Languages:")
3097-
self.initUnusedLangCheckBox: wx.CheckBox = sHelper.addItem(
3098-
wx.CheckBox(self, label=initUnusedLangLabel),
3099-
)
3100-
self.bindHelpEvent("initWordSegForUnusedLang", self.initUnusedLangCheckBox)
3101-
31023095
# Translators: This is a label for the word segmentation standard in the document navigation dialog
31033096
WordNavigationUnitLabel = _("&Word Segmentation Standard:")
31043097
self.wordSegCombo: nvdaControls.FeatureFlagCombo = sHelper.addLabeledControl(
@@ -3120,9 +3113,6 @@ def makeSettings(self, settingsSizer: wx.BoxSizer) -> None:
31203113
self.bindHelpEvent("ParagraphStyle", self.paragraphStyleCombo)
31213114

31223115
def onSave(self):
3123-
config.conf["documentNavigation"]["initWordSegForUnusedLang"] = (
3124-
self.initUnusedLangCheckBox.IsChecked()
3125-
)
31263116
self.wordSegCombo.saveCurrentValueToConf()
31273117
self.paragraphStyleCombo.saveCurrentValueToConf()
31283118

0 commit comments

Comments
 (0)