Skip to content

gh-112898: Fix double close dialog with warning about unsafed files #113513

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

Open
wants to merge 18 commits into
base: main
Choose a base branch
from
+89 −41
Open

gh-112898: Fix double close dialog with warning about unsafed files #113513

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
a0bb7ab
gh-112898: Fix double close dialog with warning about unsafed files
ronaldoussoren Dec 27, 2023
eda5750
Actually work with various quit events (menu, shortcut, osascript)
ronaldoussoren Dec 27, 2023
3686a65
Remove comment that is no longer needed
ronaldoussoren Dec 27, 2023
b305b36
Restore working code path
ronaldoussoren Dec 27, 2023
a84a2d7
Crude hack to make sure the quit command is called
ronaldoussoren Dec 27, 2023
0ce7d86
Remove unnecesary key setup
ronaldoussoren Dec 27, 2023
ce08ba0
Remove unnecessary import
ronaldoussoren Dec 27, 2023
92c1206
typo
ronaldoussoren Dec 27, 2023
4cefbea
Getting lost ...
ronaldoussoren Dec 27, 2023
bbdee67
Restructure code to avoid creating a temporary ``tkinter.Tk``
ronaldoussoren Dec 28, 2023
ab7800a
Document why the close-all-windows keybinding is removed on macOS
ronaldoussoren Dec 28, 2023
63087e3
Fix test failure and lint warning
ronaldoussoren Dec 28, 2023
4c7ad17
Merge branch 'main' into gh-112898-double-dialog
ronaldoussoren Jan 9, 2024
4794ee7
The changes to macosx.py broke some of the tests
ronaldoussoren Jan 9, 2024
8d9a7f0
Fix copy&paste error
ronaldoussoren Jan 9, 2024
7ccc8fa
Merge branch 'main' into gh-112898-double-dialog
terryjreedy Feb 4, 2024
bf6f348
review comments
ronaldoussoren Feb 10, 2024
60ccabb
Merge branch 'gh-112898-double-dialog' of github.com:ronaldoussoren/c…
ronaldoussoren Feb 10, 2024
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
7 changes: 7 additions & 0 deletions Lib/idlelib/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@

from tkinter.font import Font
import idlelib
from idlelib import macosx

class InvalidConfigType(Exception): pass
class InvalidConfigSet(Exception): pass
Expand Down Expand Up @@ -660,6 +661,12 @@ def GetCoreKeys(self, keySetName=None):
'<<zoom-height>>': ['<Alt-Key-2>'],
}

if sys.platform == "darwin":
# XXX: ^^^ This test should be macosx.isAquaTk(),
# but that has some side effect that results in not
# calling the quit event handler.
del keyBindings['<<close-all-windows>>']

if keySetName:
if not (self.userCfg['keys'].has_section(keySetName) or
self.defaultCfg['keys'].has_section(keySetName)):
Expand Down
2 changes: 0 additions & 2 deletions Lib/idlelib/macosx.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,6 @@ def help_dialog(event=None):
root.bind('<<open-config-dialog>>', config_dialog)
root.createcommand('::tk::mac::ShowPreferences', config_dialog)
if flist:
root.bind('<<close-all-windows>>', flist.close_all_callback)

# The binding above doesn't reliably work on all versions of Tk
# on macOS. Adding command definition below does seem to do the
# right thing for now.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The comment “The binding above…” should likely also be adjusted so that it makes sense after removing the binding it refers to.

Expand Down