Skip to content
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

Jump to bottom

Do not use native dialog for reset shortcuts #6493

Merged
merged 3 commits into from Dec 3, 2023
Merged

Do not use native dialog for reset shortcuts #6493

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
51b631d
do not use native dialog for reset shortcuts
Czaki Nov 23, 2023
7fd87d3
Don't use native for reset preferences
psobolewskiPhD Nov 23, 2023
11c4ce6
Merge pull request #28 from psobolewskiPhD/fix_reset_shortcuts
Czaki Nov 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 14 additions & 2 deletions napari/_qt/dialogs/preferences_dialog.py
View file
Open in desktop
Expand Up @@ -4,6 +4,7 @@

from qtpy.QtCore import QSize, Qt, Signal
from qtpy.QtWidgets import (
QApplication,
QDialog,
QHBoxLayout,
QListWidget,
Expand Down Expand Up @@ -209,12 +210,23 @@ def _get_page_dict(self, field: 'ModelField') -> Tuple[dict, dict]:

def _restore_default_dialog(self):
"""Launches dialog to confirm restore settings choice."""
prev = QApplication.instance().testAttribute(
Qt.ApplicationAttribute.AA_DontUseNativeDialogs
)
QApplication.instance().setAttribute(
Qt.ApplicationAttribute.AA_DontUseNativeDialogs, True
)

response = QMessageBox.question(
self,
trans._("Restore Settings"),
trans._("Are you sure you want to restore default settings?"),
QMessageBox.RestoreDefaults | QMessageBox.Cancel,
QMessageBox.RestoreDefaults,
QMessageBox.StandardButton.RestoreDefaults
| QMessageBox.StandardButton.Cancel,
QMessageBox.StandardButton.RestoreDefaults,
)
QApplication.instance().setAttribute(
Qt.ApplicationAttribute.AA_DontUseNativeDialogs, prev
)
if response == QMessageBox.RestoreDefaults:
self._settings.reset()
Expand Down
16 changes: 13 additions & 3 deletions napari/_qt/widgets/qt_keyboard_settings.py
View file
Open in desktop
Expand Up @@ -11,6 +11,7 @@
from qtpy.QtGui import QKeySequence
from qtpy.QtWidgets import (
QAbstractItemView,
QApplication,
QComboBox,
QHBoxLayout,
QItemDelegate,
Expand Down Expand Up @@ -132,13 +133,22 @@ def __init__(

def restore_defaults(self):
"""Launches dialog to confirm restore choice."""

prev = QApplication.instance().testAttribute(
Qt.ApplicationAttribute.AA_DontUseNativeDialogs
)
QApplication.instance().setAttribute(
Qt.ApplicationAttribute.AA_DontUseNativeDialogs, True
)
response = QMessageBox.question(
self,
trans._("Restore Shortcuts"),
trans._("Are you sure you want to restore default shortcuts?"),
QMessageBox.RestoreDefaults | QMessageBox.Cancel,
QMessageBox.RestoreDefaults,
QMessageBox.StandardButton.RestoreDefaults
| QMessageBox.StandardButton.Cancel,
QMessageBox.StandardButton.RestoreDefaults,
)
QApplication.instance().setAttribute(
Qt.ApplicationAttribute.AA_DontUseNativeDialogs, prev
)

if response == QMessageBox.RestoreDefaults:
Expand Down