Skip to content
Merged
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
90b51c3
fix version comparisons
seanbudd Feb 17, 2026
3ef6cb2
import fileUtils
seanbudd Feb 17, 2026
cfa8ef7
fix up parsing logic
seanbudd Feb 17, 2026
a0b01d5
fix up parsing logic
seanbudd Feb 17, 2026
b1b487d
minor fixes
seanbudd Feb 17, 2026
49bc979
Update source/fileUtils.py
seanbudd Feb 17, 2026
ab82529
change default arg for startOnLogon param of doInstall
seanbudd Feb 17, 2026
3b677a6
add better back compat handling
seanbudd Feb 17, 2026
9aec218
don't show warning dialog on reinstall, it should be safe
seanbudd Feb 17, 2026
40a9f8d
add unit tests
seanbudd Feb 17, 2026
6655f7f
Merge branch 'beta' into fixCompareVersion
seanbudd Feb 17, 2026
6795c7c
fixup unit tests
seanbudd Feb 17, 2026
cd3a790
Update source/installer.py
seanbudd Feb 17, 2026
ec89563
Update source/installer.py
seanbudd Feb 17, 2026
d35fd73
polish up
seanbudd Feb 18, 2026
8f77aff
Pre-commit auto-fix
pre-commit-ci[bot] Feb 18, 2026
760a19c
Add warning text
seanbudd Feb 18, 2026
8fd79ff
Merge remote-tracking branch 'origin/fixCompareVersion' into fixCompa…
seanbudd Feb 18, 2026
a994392
fix import
seanbudd Feb 18, 2026
4d21e2b
fix up issues
seanbudd Feb 18, 2026
a09370a
use lambda
seanbudd Feb 18, 2026
f809b0d
fix portable copies
seanbudd Feb 18, 2026
8145d15
use diff messages
seanbudd Feb 18, 2026
c814204
Pre-commit auto-fix
pre-commit-ci[bot] Feb 18, 2026
f585227
fix prevcopyexists
seanbudd Feb 19, 2026
90daa69
Merge remote-tracking branch 'origin/fixCompareVersion' into fixCompa…
seanbudd Feb 19, 2026
4202fa8
pass in state
seanbudd Feb 19, 2026
b25022b
Update user_docs/en/changes.md
seanbudd Feb 19, 2026
26c95a0
Apply suggestions from code review
seanbudd Feb 19, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
use diff messages
  • Loading branch information
seanbudd committed Feb 18, 2026
commit 8145d159927d32839ac071b0e323f6d3a38d08e0
21 changes: 20 additions & 1 deletion source/gui/installerGui.py
Original file line number Diff line number Diff line change
Expand Up @@ -416,6 +416,25 @@ def _warningText(self) -> str:
raise ValueError("Invalid install state for warning dialog")


class PortableCopyOverNewerVersionDialog(InstallingOverNewerVersionDialog):
helpId = "CreatingAPortableCopy"

_DOWNGRADE_WARNING = _(
# Translators: A warning presented when the user attempts to downgrade NVDA
# to an older version.
"You are attempting to replace a portable copy with an earlier version of NVDA. "
Comment thread
seanbudd marked this conversation as resolved.
Outdated
"Downgrading NVDA is not recommended. "
"Instead you should cancel this and create a new portable copy. "
)

_UNKNOWN_WARNING = _(
# Translators: A warning presented when the installer is unable to determine
# the state of the current NVDA installation.
"NVDA is unable to determine the version of the portable copy. "
Comment thread
seanbudd marked this conversation as resolved.
Outdated
"If you are attempting to downgrade to an earlier version of NVDA "
"you should cancel this installation and create a new portable copy. "
)

def showInstallGui():
gui.mainFrame.prePopup()
installState = installer._comparePreviousInstall()
Expand Down Expand Up @@ -462,7 +481,7 @@ def _warnAndConfirmForNonEmptyDirectory(portableDirectory: str) -> bool:
return False
installState = installer._comparePreviousCopy(portableDirectory)
if installState in (ComparisonState.DOWNGRADE, ComparisonState.UNKNOWN):
d = InstallingOverNewerVersionDialog()
d = PortableCopyOverNewerVersionDialog()
with d:
if d.ShowModal() == wx.ID_CANCEL:
gui.mainFrame.postPopup()
Expand Down
Loading