From 3a69f3caeeaea57048ed3bc3051e16854b9a4cd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
Date: Wed, 22 Apr 2020 09:21:44 +0200
Subject: bpo-38439: Add 256px IDLE icon (GH-17473)

Icon author: Andrew Clover, bpo-1490384
---
 Lib/idlelib/Icons/README.txt                            |   9 +++++++++
 Lib/idlelib/Icons/idle.icns                             | Bin 57435 -> 0 bytes
 Lib/idlelib/Icons/idle_256.png                          | Bin 0 -> 42839 bytes
 Lib/idlelib/pyshell.py                                  |   9 +++++++--
 .../next/IDLE/2019-12-05-14-20-53.bpo-38439.j_L2PI.rst  |   2 ++
 PCbuild/lib.pyproj                                      |   1 +
 6 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 Lib/idlelib/Icons/README.txt
 delete mode 100644 Lib/idlelib/Icons/idle.icns
 create mode 100644 Lib/idlelib/Icons/idle_256.png
 create mode 100644 Misc/NEWS.d/next/IDLE/2019-12-05-14-20-53.bpo-38439.j_L2PI.rst

diff --git a/Lib/idlelib/Icons/README.txt b/Lib/idlelib/Icons/README.txt
new file mode 100644
index 0000000..8b47162
--- /dev/null
+++ b/Lib/idlelib/Icons/README.txt
@@ -0,0 +1,9 @@
+The IDLE icons are from https://bugs.python.org/issue1490384
+
+Created by Andrew Clover.
+
+The original sources are available from Andrew's website:
+https://www.doxdesk.com/software/py/pyicons.html
+
+Various different formats and sizes are available at this GitHub Pull Request:
+https://github.com/python/cpython/pull/17473
diff --git a/Lib/idlelib/Icons/idle.icns b/Lib/idlelib/Icons/idle.icns
deleted file mode 100644
index f65e313..0000000
Binary files a/Lib/idlelib/Icons/idle.icns and /dev/null differ
diff --git a/Lib/idlelib/Icons/idle_256.png b/Lib/idlelib/Icons/idle_256.png
new file mode 100644
index 0000000..99ffa6f
Binary files /dev/null and b/Lib/idlelib/Icons/idle_256.png differ
diff --git a/Lib/idlelib/pyshell.py b/Lib/idlelib/pyshell.py
index 43fb597..66ae0f7 100755
--- a/Lib/idlelib/pyshell.py
+++ b/Lib/idlelib/pyshell.py
@@ -1485,9 +1485,14 @@ def main():
         iconfile = os.path.join(icondir, 'idle.ico')
         root.wm_iconbitmap(default=iconfile)
     elif not macosx.isAquaTk():
-        ext = '.png' if TkVersion >= 8.6 else '.gif'
+        if TkVersion >= 8.6:
+            ext = '.png'
+            sizes = (16, 32, 48, 256)
+        else:
+            ext = '.gif'
+            sizes = (16, 32, 48)
         iconfiles = [os.path.join(icondir, 'idle_%d%s' % (size, ext))
-                     for size in (16, 32, 48)]
+                     for size in sizes]
         icons = [PhotoImage(master=root, file=iconfile)
                  for iconfile in iconfiles]
         root.wm_iconphoto(True, *icons)
diff --git a/Misc/NEWS.d/next/IDLE/2019-12-05-14-20-53.bpo-38439.j_L2PI.rst b/Misc/NEWS.d/next/IDLE/2019-12-05-14-20-53.bpo-38439.j_L2PI.rst
new file mode 100644
index 0000000..de048d0
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2019-12-05-14-20-53.bpo-38439.j_L2PI.rst
@@ -0,0 +1,2 @@
+Add a 256×256 pixel IDLE icon to support more modern environments. Created by Andrew Clover.
+Delete the unused macOS idle.icns icon file.
diff --git a/PCbuild/lib.pyproj b/PCbuild/lib.pyproj
index d4351de..0237b8c 100644
--- a/PCbuild/lib.pyproj
+++ b/PCbuild/lib.pyproj
@@ -1585,6 +1585,7 @@
     <Content Include="idlelib\Icons\idle_32.png" />
     <Content Include="idlelib\Icons\idle_48.gif" />
     <Content Include="idlelib\Icons\idle_48.png" />
+    <Content Include="idlelib\Icons\idle_256.png" />
     <Content Include="idlelib\Icons\minusnode.gif" />
     <Content Include="idlelib\Icons\openfolder.gif" />
     <Content Include="idlelib\Icons\plusnode.gif" />
-- 
cgit v0.12