Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
c30a6ce5
Commit
c30a6ce5
authored
May 26, 2015
by
Steve Dower
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #24293: Fixes installer colors to use system settings throughout.
parent
e328323c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
10 additions
and
10 deletions
+10
-10
Tools/msi/bundle/Default.thm
Tools/msi/bundle/Default.thm
+8
-8
Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
+2
-2
No files found.
Tools/msi/bundle/Default.thm
View file @
c30a6ce5
<?xml version="1.0" encoding="utf-8"?>
<Theme
xmlns=
"http://wixtoolset.org/schemas/thmutil/2010"
>
<Window
Width=
"640"
Height=
"382"
HexStyle=
"100a0000"
FontId=
"0"
>
#(loc.Caption)
</Window>
<Font
Id=
"0"
Height=
"-12"
Weight=
"500"
Foreground=
"000000"
Background=
"ffffff"
>
Segoe UI
</Font>
<Font
Id=
"1"
Height=
"-24"
Weight=
"500"
Foreground=
"000000"
Background=
"ffffff"
>
Segoe UI
</Font>
<Font
Id=
"2"
Height=
"-22"
Weight=
"500"
Foreground=
"666666"
Background=
"ffffff"
>
Segoe UI
</Font>
<Font
Id=
"3"
Height=
"-12"
Weight=
"500"
Foreground=
"000000"
Background=
"ffffff"
>
Segoe UI
</Font>
<Font
Id=
"4"
Height=
"-12"
Weight=
"500"
Foreground=
"ff0000"
Background=
"ffffff"
Underline=
"yes"
>
Segoe UI
</Font>
<Font
Id=
"5"
Height=
"-12"
Weight=
"500"
Foreground=
"666666"
Background=
"ffffff"
>
Segoe UI
</Font>
<Window
Background=
"ffff00"
Width=
"640"
Height=
"382"
HexStyle=
"100a0000"
FontId=
"0"
>
#(loc.Caption)
</Window>
<Font
Id=
"0"
Height=
"-12"
Weight=
"500"
>
Segoe UI
</Font>
<Font
Id=
"1"
Height=
"-24"
Weight=
"500"
>
Segoe UI
</Font>
<Font
Id=
"2"
Height=
"-22"
Weight=
"500"
Foreground=
"666666"
>
Segoe UI
</Font>
<Font
Id=
"3"
Height=
"-12"
Weight=
"500"
>
Segoe UI
</Font>
<Font
Id=
"4"
Height=
"-12"
Weight=
"500"
Foreground=
"ff0000"
Underline=
"yes"
>
Segoe UI
</Font>
<Font
Id=
"5"
Height=
"-12"
Weight=
"500"
Foreground=
"666666"
>
Segoe UI
</Font>
<Page
Name=
"Help"
>
<Text
X=
"185"
Y=
"11"
Width=
"-11"
Height=
"32"
FontId=
"1"
DisablePrefix=
"yes"
>
#(loc.HelpHeader)
</Text>
...
...
@@ -74,7 +74,7 @@
<Text
X=
"185"
Y=
"241"
Width=
"-11"
Height=
"17"
FontId=
"3"
>
#(loc.CustomLocationLabel)
</Text>
<Editbox
Name=
"TargetDir"
X=
"185"
Y=
"257"
Width=
"-91"
Height=
"21"
TabStop=
"yes"
FontId=
"3"
FileSystemAutoComplete=
"yes"
/>
<Button
Name=
"CustomBrowseButton"
X=
"-11"
Y=
"256"
Width=
"75"
Height=
"23"
TabStop=
"yes"
FontId=
"3"
>
#(loc.CustomBrowseButton)
</Button>
<Text
Name=
"CustomBrowseButtonLabel"
X=
"185"
Y=
"281"
Width=
"-91"
Height=
"35"
FontId=
"5"
Visible=
"no
"
>
#(loc.CustomLocationHelpLabel)
</Text>
<Text
Name=
"CustomBrowseButtonLabel"
X=
"185"
Y=
"281"
Width=
"-91"
Height=
"35"
FontId=
"5"
HideWhenDisabled=
"yes
"
>
#(loc.CustomLocationHelpLabel)
</Text>
<Button
Name=
"Custom2BackButton"
X=
"185"
Y=
"-11"
Width=
"75"
Height=
"23"
TabStop=
"yes"
FontId=
"0"
>
#(loc.CustomBackButton)
</Button>
<Button
Name=
"CustomInstallButton"
X=
"-91"
Y=
"-11"
Width=
"95"
Height=
"23"
TabStop=
"yes"
FontId=
"0"
>
#(loc.CustomInstallButton)
</Button>
...
...
Tools/msi/bundle/bootstrap/PythonBootstrapperApplication.cpp
View file @
c30a6ce5
...
...
@@ -371,7 +371,7 @@ class PythonBootstrapperApplication : public CBalBaseBootstrapperApplication {
hr
=
BalGetNumericVariable
(
L"WixBundleElevated"
,
&
elevated
);
checked
=
ThemeIsControlChecked
(
_theme
,
ID_CUSTOM_INSTALL_ALL_USERS_CHECKBOX
);
ThemeControlElevates
(
_theme
,
ID_CUSTOM_INSTALL_BUTTON
,
checked
&&
(
FAILED
(
hr
)
||
!
elevated
));
Theme
ShowControl
(
_theme
,
ID_CUSTOM_BROWSE_BUTTON_LABEL
,
checked
?
SW_HIDE
:
SW_SHOW
);
Theme
ControlEnable
(
_theme
,
ID_CUSTOM_BROWSE_BUTTON_LABEL
,
!
checked
);
ThemeGetTextControl
(
_theme
,
ID_TARGETDIR_EDITBOX
,
&
targetDir
);
if
(
targetDir
)
{
// Check the current value against the default to see
...
...
@@ -1489,7 +1489,7 @@ private:
wc
.
hInstance
=
_hModule
;
wc
.
hIcon
=
hIcon
;
wc
.
hCursor
=
::
LoadCursorW
(
nullptr
,
(
LPCWSTR
)
IDC_ARROW
);
wc
.
hbrBackground
=
_theme
->
rgFonts
[
_theme
->
dwFontId
].
hBackground
;
wc
.
hbrBackground
=
(
HBRUSH
)(
COLOR_WINDOW
+
1
)
;
wc
.
lpszMenuName
=
nullptr
;
wc
.
lpszClassName
=
PYBA_WINDOW_CLASS
;
if
(
!::
RegisterClassW
(
&
wc
))
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment