From c7d1cf4de95361e5d29422b63ae623919215fea4 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. --- Misc/NEWS | 5 ++++ 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 ++++++++++++++++++++++++++++++++++ PCbuild/pythonw.vcxproj | 2 +- Tools/msi/bundle/bundle.ico | Bin 19790 -> 0 bytes Tools/msi/bundle/bundle.wxs | 2 +- Tools/msi/common.wxs | 2 +- Tools/msi/exe/exe_files.wxs | 7 +++-- Tools/msi/launcher/launcher_en-US.wxl | 1 + Tools/msi/launcher/launcher_reg.wxs | 8 ++++-- 36 files changed, 84 insertions(+), 11 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 delete mode 100644 Tools/msi/bundle/bundle.ico diff --git a/Misc/NEWS b/Misc/NEWS index d3ef4d3..e503547 100644 --- a/Misc/NEWS +++ b/Misc/NEWS @@ -162,6 +162,11 @@ Build - Issue #25825: Update references to the $(LIBPL) installation path on AIX. This path was changed in 3.2a4. +Windows +------- + +- Issue #27756: Adds new icons for Python files and processes on Windows. + Designs by Cherry Wang. What's New in Python 3.6.0 alpha 4 ================================== diff --git a/PC/icons/launcher.icns b/PC/icons/launcher.icns new file mode 100644 index 0000000..59a917f 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 0000000..c4e3c69 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 0000000..0590b0d --- /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 0000000..2dc4e29 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 0000000..1d8a79b 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 0000000..0924e83 --- /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 0000000..50da9a1 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 0000000..74dde81 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 0000000..5c3e9e7 --- /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 0000000..5d3d24e 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 0000000..9f6cb60 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 0000000..17eff6a --- /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 0000000..fc53e02 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 0000000..b8a38ef 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 0000000..e23e5a3 --- /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 0000000..9354cf8 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 0000000..6195d43 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 0000000..7cb2607 --- /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 0000000..6f0e6b0 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 0000000..e54364b 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 0000000..0613856 --- /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 dad7d57..0000000 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 3357aef..0000000 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 f7bd2b1..0000000 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 1ab629e..0000000 Binary files a/PC/pycon.ico and /dev/null differ diff --git a/PC/pylauncher.rc b/PC/pylauncher.rc index a8db0a8..3da3445 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 91785a1..ae0b029 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 0000000..88bf359 --- /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 diff --git a/PCbuild/pythonw.vcxproj b/PCbuild/pythonw.vcxproj index caed1e8..e40f66c 100644 --- a/PCbuild/pythonw.vcxproj +++ b/PCbuild/pythonw.vcxproj @@ -62,7 +62,7 @@ - + diff --git a/Tools/msi/bundle/bundle.ico b/Tools/msi/bundle/bundle.ico deleted file mode 100644 index 1ab629e..0000000 Binary files a/Tools/msi/bundle/bundle.ico and /dev/null differ diff --git a/Tools/msi/bundle/bundle.wxs b/Tools/msi/bundle/bundle.wxs index 38307e0..c89e6ee 100644 --- a/Tools/msi/bundle/bundle.wxs +++ b/Tools/msi/bundle/bundle.wxs @@ -4,7 +4,7 @@ - + diff --git a/Tools/msi/exe/exe_files.wxs b/Tools/msi/exe/exe_files.wxs index c157f40..0138587 100644 --- a/Tools/msi/exe/exe_files.wxs +++ b/Tools/msi/exe/exe_files.wxs @@ -69,10 +69,13 @@ - + - + + + + diff --git a/Tools/msi/launcher/launcher_en-US.wxl b/Tools/msi/launcher/launcher_en-US.wxl index e4c1aaa..a7e3827 100644 --- a/Tools/msi/launcher/launcher_en-US.wxl +++ b/Tools/msi/launcher/launcher_en-US.wxl @@ -11,6 +11,7 @@ Python File Python File (no console) Compiled Python File + Python Extension Module Python Zip Application File Python Zip Application File (no console) diff --git a/Tools/msi/launcher/launcher_reg.wxs b/Tools/msi/launcher/launcher_reg.wxs index 981961a..dace97e 100644 --- a/Tools/msi/launcher/launcher_reg.wxs +++ b/Tools/msi/launcher/launcher_reg.wxs @@ -27,14 +27,18 @@ - + + + + + - + -- cgit v0.12