(original) (raw)

changeset: 103062:29815771f2ac user: Steve Dower steve.dower@microsoft.com date: Mon Sep 05 14:05:17 2016 -0700 files: Misc/NEWS PC/icons/launcher.icns PC/icons/launcher.ico PC/icons/launcher.svg PC/icons/py.icns PC/icons/py.ico PC/icons/py.svg PC/icons/pyc.icns PC/icons/pyc.ico PC/icons/pyc.svg PC/icons/pyd.icns PC/icons/pyd.ico PC/icons/pyd.svg PC/icons/python.icns PC/icons/python.ico PC/icons/python.svg PC/icons/pythonw.icns PC/icons/pythonw.ico PC/icons/pythonw.svg PC/icons/setup.icns PC/icons/setup.ico PC/icons/setup.svg PC/launcher.ico PC/py.ico PC/pyc.ico PC/pycon.ico PC/pylauncher.rc PC/python_exe.rc PC/pythonw_exe.rc PCbuild/pythonw.vcxproj Tools/msi/bundle/bundle.ico Tools/msi/bundle/bundle.wxs Tools/msi/common.wxs Tools/msi/exe/exe_files.wxs Tools/msi/launcher/launcher_en-US.wxl Tools/msi/launcher/launcher_reg.wxs description: Issue #27756: Adds new icons for Python files and processes on Windows. Designs by Cherry Wang. diff -r f8d9569900a9 -r 29815771f2ac Misc/NEWS --- a/Misc/NEWS Mon Sep 05 14:03:08 2016 -0700 +++ b/Misc/NEWS Mon Sep 05 14:05:17 2016 -0700 @@ -162,6 +162,11 @@ - 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 -r f8d9569900a9 -r 29815771f2ac PC/icons/launcher.icns Binary file PC/icons/launcher.icns has changed diff -r f8d9569900a9 -r 29815771f2ac PC/icons/launcher.ico Binary file PC/icons/launcher.ico has changed diff -r f8d9569900a9 -r 29815771f2ac PC/icons/launcher.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/PC/icons/launcher.svg Mon Sep 05 14:05:17 2016 -0700 @@ -0,0 +1,1 @@ +\ No newline at end of file diff -r f8d9569900a9 -r 29815771f2ac PC/icons/py.icns Binary file PC/icons/py.icns has changed diff -r f8d9569900a9 -r 29815771f2ac PC/icons/py.ico Binary file PC/icons/py.ico has changed diff -r f8d9569900a9 -r 29815771f2ac PC/icons/py.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/PC/icons/py.svg Mon Sep 05 14:05:17 2016 -0700 @@ -0,0 +1,1 @@ +\ No newline at end of file diff -r f8d9569900a9 -r 29815771f2ac PC/icons/pyc.icns Binary file PC/icons/pyc.icns has changed diff -r f8d9569900a9 -r 29815771f2ac PC/icons/pyc.ico Binary file PC/icons/pyc.ico has changed diff -r f8d9569900a9 -r 29815771f2ac PC/icons/pyc.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/PC/icons/pyc.svg Mon Sep 05 14:05:17 2016 -0700 @@ -0,0 +1,1 @@ +\ No newline at end of file diff -r f8d9569900a9 -r 29815771f2ac PC/icons/pyd.icns Binary file PC/icons/pyd.icns has changed diff -r f8d9569900a9 -r 29815771f2ac PC/icons/pyd.ico Binary file PC/icons/pyd.ico has changed diff -r f8d9569900a9 -r 29815771f2ac PC/icons/pyd.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/PC/icons/pyd.svg Mon Sep 05 14:05:17 2016 -0700 @@ -0,0 +1,1 @@ +\ No newline at end of file diff -r f8d9569900a9 -r 29815771f2ac PC/icons/python.icns Binary file PC/icons/python.icns has changed diff -r f8d9569900a9 -r 29815771f2ac PC/icons/python.ico Binary file PC/icons/python.ico has changed diff -r f8d9569900a9 -r 29815771f2ac PC/icons/python.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/PC/icons/python.svg Mon Sep 05 14:05:17 2016 -0700 @@ -0,0 +1,1 @@ +\ No newline at end of file diff -r f8d9569900a9 -r 29815771f2ac PC/icons/pythonw.icns Binary file PC/icons/pythonw.icns has changed diff -r f8d9569900a9 -r 29815771f2ac PC/icons/pythonw.ico Binary file PC/icons/pythonw.ico has changed diff -r f8d9569900a9 -r 29815771f2ac PC/icons/pythonw.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/PC/icons/pythonw.svg Mon Sep 05 14:05:17 2016 -0700 @@ -0,0 +1,1 @@ +\ No newline at end of file diff -r f8d9569900a9 -r 29815771f2ac PC/icons/setup.icns Binary file PC/icons/setup.icns has changed diff -r f8d9569900a9 -r 29815771f2ac PC/icons/setup.ico Binary file PC/icons/setup.ico has changed diff -r f8d9569900a9 -r 29815771f2ac PC/icons/setup.svg --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/PC/icons/setup.svg Mon Sep 05 14:05:17 2016 -0700 @@ -0,0 +1,1 @@ +\ No newline at end of file diff -r f8d9569900a9 -r 29815771f2ac PC/launcher.ico Binary file PC/launcher.ico has changed diff -r f8d9569900a9 -r 29815771f2ac PC/py.ico Binary file PC/py.ico has changed diff -r f8d9569900a9 -r 29815771f2ac PC/pyc.ico Binary file PC/pyc.ico has changed diff -r f8d9569900a9 -r 29815771f2ac PC/pycon.ico Binary file PC/pycon.ico has changed diff -r f8d9569900a9 -r 29815771f2ac PC/pylauncher.rc --- a/PC/pylauncher.rc Mon Sep 05 14:03:08 2016 -0700 +++ b/PC/pylauncher.rc Mon Sep 05 14:05:17 2016 -0700 @@ -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 -r f8d9569900a9 -r 29815771f2ac PC/python_exe.rc --- a/PC/python_exe.rc Mon Sep 05 14:03:08 2016 -0700 +++ b/PC/python_exe.rc Mon Sep 05 14:05:17 2016 -0700 @@ -7,7 +7,7 @@ #include 1 RT_MANIFEST "python.manifest" -1 ICON DISCARDABLE "pycon.ico" +1 ICON DISCARDABLE "icons\python.ico" ///////////////////////////////////////////////////////////////////////////// diff -r f8d9569900a9 -r 29815771f2ac PC/pythonw_exe.rc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/PC/pythonw_exe.rc Mon Sep 05 14:05:17 2016 -0700 @@ -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 -r f8d9569900a9 -r 29815771f2ac PCbuild/pythonw.vcxproj --- a/PCbuild/pythonw.vcxproj Mon Sep 05 14:03:08 2016 -0700 +++ b/PCbuild/pythonw.vcxproj Mon Sep 05 14:05:17 2016 -0700 @@ -62,7 +62,7 @@- + diff -r f8d9569900a9 -r 29815771f2ac Tools/msi/bundle/bundle.ico Binary file Tools/msi/bundle/bundle.ico has changed diff -r f8d9569900a9 -r 29815771f2ac Tools/msi/bundle/bundle.wxs --- a/Tools/msi/bundle/bundle.wxs Mon Sep 05 14:03:08 2016 -0700 +++ b/Tools/msi/bundle/bundle.wxs Mon Sep 05 14:05:17 2016 -0700 @@ -4,7 +4,7 @@ - + diff -r f8d9569900a9 -r 29815771f2ac Tools/msi/exe/exe_files.wxs --- a/Tools/msi/exe/exe_files.wxs Mon Sep 05 14:03:08 2016 -0700 +++ b/Tools/msi/exe/exe_files.wxs Mon Sep 05 14:05:17 2016 -0700 @@ -69,10 +69,13 @@ - + - + + + + diff -r f8d9569900a9 -r 29815771f2ac Tools/msi/launcher/launcher_en-US.wxl --- a/Tools/msi/launcher/launcher_en-US.wxl Mon Sep 05 14:03:08 2016 -0700 +++ b/Tools/msi/launcher/launcher_en-US.wxl Mon Sep 05 14:05:17 2016 -0700 @@ -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 -r f8d9569900a9 -r 29815771f2ac Tools/msi/launcher/launcher_reg.wxs --- a/Tools/msi/launcher/launcher_reg.wxs Mon Sep 05 14:03:08 2016 -0700 +++ b/Tools/msi/launcher/launcher_reg.wxs Mon Sep 05 14:05:17 2016 -0700 @@ -27,14 +27,18 @@- + + + + + - + /steve.dower@microsoft.com