From 2f282a9d6cc91b5ac86326a9ee2fedb42596516e Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Mon, 5 Sep 2016 14:05:17 -0700 Subject: Issue #27756: Adds new icons for Python files and processes on Windows. Designs by Cherry Wang. --- PC/icons/launcher.icns | Bin 0 -> 264476 bytes PC/icons/launcher.ico | Bin 0 -> 87263 bytes PC/icons/launcher.svg | 1 + PC/icons/py.icns | Bin 0 -> 195977 bytes PC/icons/py.ico | Bin 0 -> 75809 bytes PC/icons/py.svg | 1 + PC/icons/pyc.icns | Bin 0 -> 212125 bytes PC/icons/pyc.ico | Bin 0 -> 78396 bytes PC/icons/pyc.svg | 1 + PC/icons/pyd.icns | Bin 0 -> 223199 bytes PC/icons/pyd.ico | Bin 0 -> 83351 bytes PC/icons/pyd.svg | 1 + PC/icons/python.icns | Bin 0 -> 201868 bytes PC/icons/python.ico | Bin 0 -> 77671 bytes PC/icons/python.svg | 1 + PC/icons/pythonw.icns | Bin 0 -> 193222 bytes PC/icons/pythonw.ico | Bin 0 -> 76102 bytes PC/icons/pythonw.svg | 1 + PC/icons/setup.icns | Bin 0 -> 220699 bytes PC/icons/setup.ico | Bin 0 -> 78328 bytes PC/icons/setup.svg | 1 + PC/launcher.ico | Bin 19790 -> 0 bytes PC/py.ico | Bin 19790 -> 0 bytes PC/pyc.ico | Bin 19790 -> 0 bytes PC/pycon.ico | Bin 19790 -> 0 bytes PC/pylauncher.rc | 10 +++++++--- PC/python_exe.rc | 2 +- PC/pythonw_exe.rc | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 28 files changed, 64 insertions(+), 4 deletions(-) create mode 100644 PC/icons/launcher.icns create mode 100644 PC/icons/launcher.ico create mode 100644 PC/icons/launcher.svg create mode 100644 PC/icons/py.icns create mode 100644 PC/icons/py.ico create mode 100644 PC/icons/py.svg create mode 100644 PC/icons/pyc.icns create mode 100644 PC/icons/pyc.ico create mode 100644 PC/icons/pyc.svg create mode 100644 PC/icons/pyd.icns create mode 100644 PC/icons/pyd.ico create mode 100644 PC/icons/pyd.svg create mode 100644 PC/icons/python.icns create mode 100644 PC/icons/python.ico create mode 100644 PC/icons/python.svg create mode 100644 PC/icons/pythonw.icns create mode 100644 PC/icons/pythonw.ico create mode 100644 PC/icons/pythonw.svg create mode 100644 PC/icons/setup.icns create mode 100644 PC/icons/setup.ico create mode 100644 PC/icons/setup.svg delete mode 100644 PC/launcher.ico delete mode 100644 PC/py.ico delete mode 100644 PC/pyc.ico delete mode 100644 PC/pycon.ico create mode 100644 PC/pythonw_exe.rc (limited to 'PC') diff --git a/PC/icons/launcher.icns b/PC/icons/launcher.icns new file mode 100644 index 0000000000..59a917f20d Binary files /dev/null and b/PC/icons/launcher.icns differ diff --git a/PC/icons/launcher.ico b/PC/icons/launcher.ico new file mode 100644 index 0000000000..c4e3c693dc Binary files /dev/null and b/PC/icons/launcher.ico differ diff --git a/PC/icons/launcher.svg b/PC/icons/launcher.svg new file mode 100644 index 0000000000..0590b0d2d0 --- /dev/null +++ b/PC/icons/launcher.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/PC/icons/py.icns b/PC/icons/py.icns new file mode 100644 index 0000000000..2dc4e296f8 Binary files /dev/null and b/PC/icons/py.icns differ diff --git a/PC/icons/py.ico b/PC/icons/py.ico new file mode 100644 index 0000000000..1d8a79bfb3 Binary files /dev/null and b/PC/icons/py.ico differ diff --git a/PC/icons/py.svg b/PC/icons/py.svg new file mode 100644 index 0000000000..0924e83fbc --- /dev/null +++ b/PC/icons/py.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/PC/icons/pyc.icns b/PC/icons/pyc.icns new file mode 100644 index 0000000000..50da9a1615 Binary files /dev/null and b/PC/icons/pyc.icns differ diff --git a/PC/icons/pyc.ico b/PC/icons/pyc.ico new file mode 100644 index 0000000000..74dde81b64 Binary files /dev/null and b/PC/icons/pyc.ico differ diff --git a/PC/icons/pyc.svg b/PC/icons/pyc.svg new file mode 100644 index 0000000000..5c3e9e7920 --- /dev/null +++ b/PC/icons/pyc.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/PC/icons/pyd.icns b/PC/icons/pyd.icns new file mode 100644 index 0000000000..5d3d24ee25 Binary files /dev/null and b/PC/icons/pyd.icns differ diff --git a/PC/icons/pyd.ico b/PC/icons/pyd.ico new file mode 100644 index 0000000000..9f6cb601af Binary files /dev/null and b/PC/icons/pyd.ico differ diff --git a/PC/icons/pyd.svg b/PC/icons/pyd.svg new file mode 100644 index 0000000000..17eff6a307 --- /dev/null +++ b/PC/icons/pyd.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/PC/icons/python.icns b/PC/icons/python.icns new file mode 100644 index 0000000000..fc53e02f4a Binary files /dev/null and b/PC/icons/python.icns differ diff --git a/PC/icons/python.ico b/PC/icons/python.ico new file mode 100644 index 0000000000..b8a38ef159 Binary files /dev/null and b/PC/icons/python.ico differ diff --git a/PC/icons/python.svg b/PC/icons/python.svg new file mode 100644 index 0000000000..e23e5a3f63 --- /dev/null +++ b/PC/icons/python.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/PC/icons/pythonw.icns b/PC/icons/pythonw.icns new file mode 100644 index 0000000000..9354cf870a Binary files /dev/null and b/PC/icons/pythonw.icns differ diff --git a/PC/icons/pythonw.ico b/PC/icons/pythonw.ico new file mode 100644 index 0000000000..6195d43347 Binary files /dev/null and b/PC/icons/pythonw.ico differ diff --git a/PC/icons/pythonw.svg b/PC/icons/pythonw.svg new file mode 100644 index 0000000000..7cb2607474 --- /dev/null +++ b/PC/icons/pythonw.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/PC/icons/setup.icns b/PC/icons/setup.icns new file mode 100644 index 0000000000..6f0e6b01a0 Binary files /dev/null and b/PC/icons/setup.icns differ diff --git a/PC/icons/setup.ico b/PC/icons/setup.ico new file mode 100644 index 0000000000..e54364b3af Binary files /dev/null and b/PC/icons/setup.ico differ diff --git a/PC/icons/setup.svg b/PC/icons/setup.svg new file mode 100644 index 0000000000..06138568f2 --- /dev/null +++ b/PC/icons/setup.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/PC/launcher.ico b/PC/launcher.ico deleted file mode 100644 index dad7d572ce..0000000000 Binary files a/PC/launcher.ico and /dev/null differ diff --git a/PC/py.ico b/PC/py.ico deleted file mode 100644 index 3357aef148..0000000000 Binary files a/PC/py.ico and /dev/null differ diff --git a/PC/pyc.ico b/PC/pyc.ico deleted file mode 100644 index f7bd2b1cc2..0000000000 Binary files a/PC/pyc.ico and /dev/null differ diff --git a/PC/pycon.ico b/PC/pycon.ico deleted file mode 100644 index 1ab629eff2..0000000000 Binary files a/PC/pycon.ico and /dev/null differ diff --git a/PC/pylauncher.rc b/PC/pylauncher.rc index a8db0a842f..3da3445f5f 100644 --- a/PC/pylauncher.rc +++ b/PC/pylauncher.rc @@ -7,9 +7,13 @@ #include 1 RT_MANIFEST "python.manifest" -1 ICON DISCARDABLE "launcher.ico" -2 ICON DISCARDABLE "py.ico" -3 ICON DISCARDABLE "pyc.ico" +1 ICON DISCARDABLE "icons\launcher.ico" +2 ICON DISCARDABLE "icons\py.ico" +3 ICON DISCARDABLE "icons\pyc.ico" +4 ICON DISCARDABLE "icons\pyd.ico" +5 ICON DISCARDABLE "icons\python.ico" +6 ICON DISCARDABLE "icons\pythonw.ico" +7 ICON DISCARDABLE "icons\setup.ico" ///////////////////////////////////////////////////////////////////////////// // diff --git a/PC/python_exe.rc b/PC/python_exe.rc index 91785a1e06..ae0b029b80 100644 --- a/PC/python_exe.rc +++ b/PC/python_exe.rc @@ -7,7 +7,7 @@ #include 1 RT_MANIFEST "python.manifest" -1 ICON DISCARDABLE "pycon.ico" +1 ICON DISCARDABLE "icons\python.ico" ///////////////////////////////////////////////////////////////////////////// diff --git a/PC/pythonw_exe.rc b/PC/pythonw_exe.rc new file mode 100644 index 0000000000..88bf3592e1 --- /dev/null +++ b/PC/pythonw_exe.rc @@ -0,0 +1,49 @@ +// Resource script for Python console EXEs. + +#include "python_ver_rc.h" + +// Include the manifest file that indicates we support all +// current versions of Windows. +#include +1 RT_MANIFEST "python.manifest" + +1 ICON DISCARDABLE "icons\pythonw.ico" + + +///////////////////////////////////////////////////////////////////////////// +// +// Version +// + +VS_VERSION_INFO VERSIONINFO + FILEVERSION PYVERSION64 + PRODUCTVERSION PYVERSION64 + FILEFLAGSMASK 0x3fL +#ifdef _DEBUG + FILEFLAGS VS_FF_DEBUG +#else + FILEFLAGS 0x0L +#endif + FILEOS VOS__WINDOWS32 + FILETYPE VFT_APP + FILESUBTYPE 0x0L +BEGIN + BLOCK "StringFileInfo" + BEGIN + BLOCK "000004b0" + BEGIN + VALUE "CompanyName", PYTHON_COMPANY "\0" + VALUE "FileDescription", "Python\0" + VALUE "FileVersion", PYTHON_VERSION + VALUE "InternalName", "Python Application\0" + VALUE "LegalCopyright", PYTHON_COPYRIGHT "\0" + VALUE "OriginalFilename", "pythonw" PYTHON_DEBUG_EXT ".exe\0" + VALUE "ProductName", "Python\0" + VALUE "ProductVersion", PYTHON_VERSION + END + END + BLOCK "VarFileInfo" + BEGIN + VALUE "Translation", 0x0, 1200 + END +END -- cgit v1.2.1