Skip to content

Make Yes the default button on the Qt macOS bugs warning dialogs #966

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eoyilmaz merged 2 commits into from
Jul 28, 2026
Merged

Make Yes the default button on the Qt macOS bugs warning dialogs #966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a714f12
[#964] Make Yes the default button on the Qt macOS bugs warning dialogs
eoyilmaz Jul 28, 2026
f343b9e
[#964] Bumped version number.
eoyilmaz Jul 28, 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
2 changes: 1 addition & 1 deletion DisplayCAL/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.10.0.dev79
3.10.0.dev80
4 changes: 2 additions & 2 deletions DisplayCAL/ui/main_window.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9324,7 +9324,7 @@ def _check_show_macos_bugs_warning(
APPNAME,
lang.getstr("macos.bugs.cal.warning"),
QMessageBox.Yes | QMessageBox.No | QMessageBox.Cancel,
QMessageBox.No,
QMessageBox.Yes,
)
if answer == QMessageBox.Cancel:
return False
Expand All @@ -9340,7 +9340,7 @@ def _check_show_macos_bugs_warning(
APPNAME,
lang.getstr("macos.bugs.profile.warning"),
QMessageBox.Yes | QMessageBox.No | QMessageBox.Cancel,
QMessageBox.No,
QMessageBox.Yes,
)
if answer == QMessageBox.Cancel:
return False
Expand Down
18 changes: 16 additions & 2 deletions tests/test_ui_main_window.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2886,7 +2886,13 @@ def test_macos_bugs_cal_warning_yes_resets_controls(window, monkeypatch):
mw.preflight_checks, "should_warn_calibration_bugs", lambda: True
)
monkeypatch.setattr(mw.preflight_checks, "should_warn_profile_bugs", lambda: False)
monkeypatch.setattr(mw.QMessageBox, "warning", lambda *a, **k: mw.QMessageBox.Yes)
calls = []

def _warning(*args, **kwargs):
calls.append(args)
return mw.QMessageBox.Yes

monkeypatch.setattr(mw.QMessageBox, "warning", _warning)
window.black_luminance_ctrl.setCurrentIndex(1)
window.black_point_correction_ctrl.setValue(50)
setcfg("calibration.black_point_correction.auto", 1)
Expand All @@ -2896,6 +2902,7 @@ def test_macos_bugs_cal_warning_yes_resets_controls(window, monkeypatch):
assert window.black_luminance_ctrl.currentIndex() == 0
assert window.black_point_correction_ctrl.value() == 0
assert getcfg("calibration.black_point_correction.auto") == 0
assert calls[0][-1] == mw.QMessageBox.Yes


def test_macos_bugs_cal_warning_cancel_aborts(window, monkeypatch):
Expand All @@ -2917,7 +2924,13 @@ def test_macos_bugs_profile_warning_yes_updates_profile_controls(window, monkeyp
mw.preflight_checks, "macos_bugs_warning_applicable", lambda: True
)
monkeypatch.setattr(mw.preflight_checks, "should_warn_profile_bugs", lambda: True)
monkeypatch.setattr(mw.QMessageBox, "warning", lambda *a, **k: mw.QMessageBox.Yes)
calls = []

def _warning(*args, **kwargs):
calls.append(args)
return mw.QMessageBox.Yes

monkeypatch.setattr(mw.QMessageBox, "warning", _warning)
setcfg("profile.type", "g")
setcfg("profile.black_point_compensation", 0)

Expand All @@ -2926,6 +2939,7 @@ def test_macos_bugs_profile_warning_yes_updates_profile_controls(window, monkeyp
assert getcfg("profile.type") == "S"
assert getcfg("profile.black_point_compensation") == 1
assert window.black_point_compensation_cb.isChecked() is True
assert calls[0][-1] == mw.QMessageBox.Yes


class _FakeCalChoiceDialog:
Expand Down