Skip to content

Commit ecd17cb

Browse files
bonzibuddge0rdi
bonzibudd
authored and
ge0rdi
committed
New default Immersive skin for Win10/11 (#538)
Fixes #538
1 parent 134b414 commit ecd17cb

File tree

165 files changed

+1845
-3
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

165 files changed

+1845
-3
lines changed

‎Src/OpenShell.sln

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Metallic7", "Skins\Metallic
6868
EndProject
6969
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DesktopToasts", "Update\DesktopToasts\DesktopToasts.vcxproj", "{D94BD2A6-1872-4F01-B911-F406603AA2E1}"
7070
EndProject
71+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Immersive", "Skins\Immersive\Immersive.vcxproj", "{BD28B058-230E-42DF-9FB1-FFBB0153F498}"
72+
EndProject
73+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Immersive7", "Skins\Immersive7\Immersive7.vcxproj", "{75809D15-8403-420A-BBE6-05F478D88D8E}"
74+
EndProject
7175
Global
7276
GlobalSection(SolutionConfigurationPlatforms) = preSolution
7377
Debug|Win32 = Debug|Win32
@@ -388,6 +392,30 @@ Global
388392
{D94BD2A6-1872-4F01-B911-F406603AA2E1}.Setup|Win32.ActiveCfg = Release|Win32
389393
{D94BD2A6-1872-4F01-B911-F406603AA2E1}.Setup|Win32.Build.0 = Release|Win32
390394
{D94BD2A6-1872-4F01-B911-F406603AA2E1}.Setup|x64.ActiveCfg = Release|Win32
395+
{BD28B058-230E-42DF-9FB1-FFBB0153F498}.Debug|Win32.ActiveCfg = Resource|Win32
396+
{BD28B058-230E-42DF-9FB1-FFBB0153F498}.Debug|Win32.Build.0 = Resource|Win32
397+
{BD28B058-230E-42DF-9FB1-FFBB0153F498}.Debug|x64.ActiveCfg = Resource|Win32
398+
{BD28B058-230E-42DF-9FB1-FFBB0153F498}.Debug|x64.Build.0 = Resource|Win32
399+
{BD28B058-230E-42DF-9FB1-FFBB0153F498}.Release|Win32.ActiveCfg = Resource|Win32
400+
{BD28B058-230E-42DF-9FB1-FFBB0153F498}.Release|Win32.Build.0 = Resource|Win32
401+
{BD28B058-230E-42DF-9FB1-FFBB0153F498}.Release|x64.ActiveCfg = Resource|Win32
402+
{BD28B058-230E-42DF-9FB1-FFBB0153F498}.Release|x64.Build.0 = Resource|Win32
403+
{BD28B058-230E-42DF-9FB1-FFBB0153F498}.Setup|Win32.ActiveCfg = Resource|Win32
404+
{BD28B058-230E-42DF-9FB1-FFBB0153F498}.Setup|Win32.Build.0 = Resource|Win32
405+
{BD28B058-230E-42DF-9FB1-FFBB0153F498}.Setup|x64.ActiveCfg = Resource|Win32
406+
{BD28B058-230E-42DF-9FB1-FFBB0153F498}.Setup|x64.Build.0 = Resource|Win32
407+
{75809D15-8403-420A-BBE6-05F478D88D8E}.Debug|Win32.ActiveCfg = Resource|Win32
408+
{75809D15-8403-420A-BBE6-05F478D88D8E}.Debug|Win32.Build.0 = Resource|Win32
409+
{75809D15-8403-420A-BBE6-05F478D88D8E}.Debug|x64.ActiveCfg = Resource|Win32
410+
{75809D15-8403-420A-BBE6-05F478D88D8E}.Debug|x64.Build.0 = Resource|Win32
411+
{75809D15-8403-420A-BBE6-05F478D88D8E}.Release|Win32.ActiveCfg = Resource|Win32
412+
{75809D15-8403-420A-BBE6-05F478D88D8E}.Release|Win32.Build.0 = Resource|Win32
413+
{75809D15-8403-420A-BBE6-05F478D88D8E}.Release|x64.ActiveCfg = Resource|Win32
414+
{75809D15-8403-420A-BBE6-05F478D88D8E}.Release|x64.Build.0 = Resource|Win32
415+
{75809D15-8403-420A-BBE6-05F478D88D8E}.Setup|Win32.ActiveCfg = Resource|Win32
416+
{75809D15-8403-420A-BBE6-05F478D88D8E}.Setup|Win32.Build.0 = Resource|Win32
417+
{75809D15-8403-420A-BBE6-05F478D88D8E}.Setup|x64.ActiveCfg = Resource|Win32
418+
{75809D15-8403-420A-BBE6-05F478D88D8E}.Setup|x64.Build.0 = Resource|Win32
391419
EndGlobalSection
392420
GlobalSection(SolutionProperties) = preSolution
393421
HideSolutionNode = FALSE
@@ -412,6 +440,8 @@ Global
412440
{598AB4AC-008E-4501-90B3-C5213834C1DA} = {409484D8-C0DB-4991-AF03-124128EDEF98}
413441
{63BAF573-170B-4FA0-AEE3-16E04F3E9DF5} = {409484D8-C0DB-4991-AF03-124128EDEF98}
414442
{CA5BFC96-428D-42F5-9F7D-CDDE048A357C} = {409484D8-C0DB-4991-AF03-124128EDEF98}
443+
{BD28B058-230E-42DF-9FB1-FFBB0153F498} = {409484D8-C0DB-4991-AF03-124128EDEF98}
444+
{75809D15-8403-420A-BBE6-05F478D88D8E} = {409484D8-C0DB-4991-AF03-124128EDEF98}
415445
EndGlobalSection
416446
GlobalSection(ExtensibilityGlobals) = postSolution
417447
SolutionGuid = {AF7D0AE8-B556-4840-92EF-CEADC95A5CD1}

‎Src/Setup/BuildBinaries.bat

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@ copy /B "..\StartMenu\Skins\Windows 8.skin7" Output > nul
6363
copy /B "..\StartMenu\Skins\Midnight.skin7" Output > nul
6464
copy /B "..\StartMenu\Skins\Metro.skin7" Output > nul
6565
copy /B "..\StartMenu\Skins\Metallic.skin7" Output > nul
66+
copy /B "..\StartMenu\Skins\Immersive.skin" Output > nul
67+
copy /B "..\StartMenu\Skins\Immersive.skin7" Output > nul
6668

6769

6870
REM ********* Collect debug info

‎Src/Setup/Setup.wxs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@
9090
<ComponentRef Id="Midnight.skin7" />
9191
<ComponentRef Id="Metro.skin7" />
9292
<ComponentRef Id="Metallic.skin7" />
93+
<ComponentRef Id="Immersive.skin" />
94+
<ComponentRef Id="Immersive.skin7" />
9395
<ComponentRef Id="AutoRun" />
9496
<ComponentRef Id="MenuSettingsLink" />
9597
</Feature>
@@ -535,6 +537,14 @@
535537
<Component Id="Metallic.skin7" Guid="2167BBCA-FD42-4285-AE00-9CDDDF436B30" Win64="$(var.CS_WIN64)">
536538
<File Id="Metallic.skin7" KeyPath="yes" Checksum="yes" Source="Output\Metallic.skin7" Vital="yes" />
537539
</Component>
540+
<Component Id="Immersive.skin" Guid="045C48C3-FE11-4C66-AD7F-3F3EE35B4DEA" Win64="$(var.CS_WIN64)">
541+
<File Id="Immersive.skin" KeyPath="yes" Checksum="yes" Source="Output\Immersive.skin" Vital="yes" />
542+
<Condition>WINDOWSBUILDNUM&gt;10000</Condition>
543+
</Component>
544+
<Component Id="Immersive.skin7" Guid="FFECA17A-C005-4D84-9F7C-DBC8EA2E1B5A" Win64="$(var.CS_WIN64)">
545+
<File Id="Immersive.skin7" KeyPath="yes" Checksum="yes" Source="Output\Immersive.skin7" Vital="yes" />
546+
<Condition>WINDOWSBUILDNUM&gt;10000</Condition>
547+
</Component>
538548
</DirectoryRef>
539549
<DirectoryRef Id="TARGETDIR">
540550
<Component Id="OpenShell" Guid="19EC9EFC-B901-4EAB-B800-6E98D2261077" Win64="$(var.CS_WIN64)">
@@ -634,6 +644,9 @@
634644
<Property Id="APPLICATIONFOLDER">
635645
<RegistrySearch Id="Path" Root="HKLM" Key="Software\OpenShell\OpenShell" Name="Path" Type="raw" Win64="$(var.CS_WIN64)" />
636646
</Property>
647+
<Property Id="WINDOWSBUILDNUM" Secure="yes">
648+
<RegistrySearch Id="WindowsBuild" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion" Name="CurrentBuild" Type="raw" />
649+
</Property>
637650
<CustomAction Id="LaunchStartMenu" Impersonate="yes" ExeCommand="" FileKey="StartMenu.exe" Return="asyncNoWait" />
638651
<CustomAction Id="CloseStartMenu" Impersonate="yes" BinaryKey="SetupHelper.exe" Return="ignore" ExeCommand="exitSM" />
639652
<WixVariable Id="WixUIBannerBmp" Value="..\Setup\banner.jpg" />

‎Src/Skins/Immersive/Immersive.rc

Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
/////////////////////////////////////////////////////////////////////////////
2+
//
3+
// Icon
4+
//
5+
6+
// Icon with lowest ID value placed first to ensure application icon
7+
// remains consistent on all systems.
8+
1 ICON "..\\..\\Setup\\OpenShell.ico"
9+
10+
/////////////////////////////////////////////////////////////////////////////
11+
//
12+
// SKIN
13+
//
14+
15+
1 SKIN "SkinDescription.txt"
16+
17+
/////////////////////////////////////////////////////////////////////////////
18+
//
19+
// Image
20+
//
21+
22+
1 IMAGE "fullglass1.png"
23+
2 IMAGE "submenu.png"
24+
3 IMAGE "submenu_vertsep.png"
25+
4 IMAGE "fullglass_pager.png"
26+
5 IMAGE "pager_arrows.png"
27+
6 IMAGE "pager_arrows144.png"
28+
7 IMAGE "separator.png"
29+
8 IMAGE "arrow.png"
30+
9 IMAGE "search.png"
31+
10 IMAGE "twotone_pager.png"
32+
11 IMAGE "pin.png"
33+
12 IMAGE "user.png"
34+
13 IMAGE "user144.png"
35+
14 IMAGE "fullglass2.png"
36+
15 IMAGE "fullglass3.png"
37+
16 IMAGE "fullglass4.png"
38+
17 IMAGE "fullglass_selector.png"
39+
18 IMAGE "fullglass_splitsel.png"
40+
19 IMAGE "newsel.png"
41+
20 IMAGE "submenu_selector.png"
42+
21 IMAGE "submenu_splitsel.png"
43+
22 IMAGE "arrow144.png"
44+
23 IMAGE "submenu_pager.png"
45+
24 IMAGE "search_arrow.png"
46+
25 IMAGE "search_arrow144.png"
47+
26 IMAGE "pin144.png"
48+
27 IMAGE "fullglass_vertsep.png"
49+
28 IMAGE "separator144.png"
50+
29 IMAGE "submenu_vertsep144.png"
51+
30 IMAGE "pager_arrows120.png"
52+
32 IMAGE "arrow120.png"
53+
33 IMAGE "search120.png"
54+
34 IMAGE "pin120.png"
55+
36 IMAGE "search_arrow120.png"
56+
37 IMAGE "user120.png"
57+
38 IMAGE "arrow_mask.png"
58+
39 IMAGE "arrow_mask120.png"
59+
40 IMAGE "arrow_mask144.png"
60+
41 IMAGE "twotone1.png"
61+
42 IMAGE "twotone2.png"
62+
43 IMAGE "twotone3.png"
63+
44 IMAGE "twotone4.png"
64+
45 IMAGE "twotone5.png"
65+
46 IMAGE "twotone6.png"
66+
47 IMAGE "twotone7.png"
67+
48 IMAGE "twotone8.png"
68+
49 IMAGE "twotone9.png"
69+
50 IMAGE "twotone10.png"
70+
51 IMAGE "twotone11.png"
71+
52 IMAGE "twotone12.png"
72+
53 IMAGE "twotone13.png"
73+
54 IMAGE "twotone14.png"
74+
55 IMAGE "twotone_selector.png"
75+
56 IMAGE "twotone_splitsel.png"
76+
57 IMAGE "twotone15.png"
77+
58 IMAGE "twotone16.png"
78+
59 IMAGE "twotone17.png"
79+
60 IMAGE "twotone18.png"
80+
61 IMAGE "twotone19.png"
81+
62 IMAGE "twotone20.png"
82+
63 IMAGE "twotone21.png"
83+
64 IMAGE "twotone22.png"
84+
65 IMAGE "twotone23.png"
85+
66 IMAGE "twotone24.png"
86+
67 IMAGE "twotone25.png"
87+
68 IMAGE "twotone26.png"
88+
69 IMAGE "twotone27.png"
89+
70 IMAGE "twotone28.png"
90+
71 IMAGE "twotone29.png"
91+
72 IMAGE "twotone30.png"
92+
73 IMAGE "twotone31.png"
93+
74 IMAGE "twotone32.png"
94+
75 IMAGE "twotone33.png"
95+
76 IMAGE "twotone34.png"
96+
77 IMAGE "twotone35.png"
97+
78 IMAGE "pin192.png"
98+
79 IMAGE "arrow192.png"
99+
80 IMAGE "arrow_mask192.png"
100+
81 IMAGE "pager_arrows192.png"
101+
82 IMAGE "search_arrow192.png"
102+
83 IMAGE "search192.png"

‎Src/Skins/Immersive/Immersive.vcxproj

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup Label="ProjectConfigurations">
4+
<ProjectConfiguration Include="Resource|Win32">
5+
<Configuration>Resource</Configuration>
6+
<Platform>Win32</Platform>
7+
</ProjectConfiguration>
8+
</ItemGroup>
9+
<PropertyGroup Label="Globals">
10+
<ProjectGuid>{BD28B058-230E-42DF-9FB1-FFBB0153F498}</ProjectGuid>
11+
<RootNamespace>Immersive</RootNamespace>
12+
<Keyword>Win32Proj</Keyword>
13+
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
14+
</PropertyGroup>
15+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
16+
<PropertyGroup Label="Configuration">
17+
<ConfigurationType>DynamicLibrary</ConfigurationType>
18+
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
19+
<CharacterSet>Unicode</CharacterSet>
20+
</PropertyGroup>
21+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
22+
<ImportGroup Label="ExtensionSettings">
23+
</ImportGroup>
24+
<ImportGroup Label="PropertySheets">
25+
<Import Project="..\Skin.props" />
26+
</ImportGroup>
27+
<PropertyGroup Label="UserMacros" />
28+
<PropertyGroup>
29+
<TargetExt>.skin</TargetExt>
30+
<TargetName>Immersive</TargetName>
31+
</PropertyGroup>
32+
<ItemGroup>
33+
<Text Include="SkinDescription.txt" />
34+
</ItemGroup>
35+
<ItemGroup>
36+
<Image Include="*.png" />
37+
</ItemGroup>
38+
<ItemGroup>
39+
<ResourceCompile Include="Immersive.rc" />
40+
</ItemGroup>
41+
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
42+
<ImportGroup Label="ExtensionTargets">
43+
</ImportGroup>
44+
</Project>

‎Src/Skins/Immersive/Immersive.vcxproj.filters

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<ItemGroup>
4+
<Filter Include="Source Files">
5+
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
6+
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
7+
</Filter>
8+
<Filter Include="Resource Files">
9+
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
10+
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
11+
</Filter>
12+
</ItemGroup>
13+
<ItemGroup>
14+
<Text Include="SkinDescription.txt">
15+
<Filter>Source Files</Filter>
16+
</Text>
17+
</ItemGroup>
18+
<ItemGroup>
19+
<Image Include="*.png">
20+
<Filter>Resource Files</Filter>
21+
</Image>
22+
</ItemGroup>
23+
<ItemGroup>
24+
<ResourceCompile Include="Immersive.rc">
25+
<Filter>Resource Files</Filter>
26+
</ResourceCompile>
27+
</ItemGroup>
28+
</Project>

0 commit comments

Comments
 (0)