Skip to content

Commit

Permalink
New default Immersive skin for Win10/11 (#538)
Browse files Browse the repository at this point in the history
Fixes #538
  • Loading branch information
bonzibudd authored and ge0rdi committed Jan 6, 2023
1 parent 134b414 commit ecd17cb
Show file tree
Hide file tree
Showing 165 changed files with 1,845 additions and 3 deletions.
30 changes: 30 additions & 0 deletions Src/OpenShell.sln
Expand Up @@ -68,6 +68,10 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Metallic7", "Skins\Metallic
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DesktopToasts", "Update\DesktopToasts\DesktopToasts.vcxproj", "{D94BD2A6-1872-4F01-B911-F406603AA2E1}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Immersive", "Skins\Immersive\Immersive.vcxproj", "{BD28B058-230E-42DF-9FB1-FFBB0153F498}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Immersive7", "Skins\Immersive7\Immersive7.vcxproj", "{75809D15-8403-420A-BBE6-05F478D88D8E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
Expand Down Expand Up @@ -388,6 +392,30 @@ Global
{D94BD2A6-1872-4F01-B911-F406603AA2E1}.Setup|Win32.ActiveCfg = Release|Win32
{D94BD2A6-1872-4F01-B911-F406603AA2E1}.Setup|Win32.Build.0 = Release|Win32
{D94BD2A6-1872-4F01-B911-F406603AA2E1}.Setup|x64.ActiveCfg = Release|Win32
{BD28B058-230E-42DF-9FB1-FFBB0153F498}.Debug|Win32.ActiveCfg = Resource|Win32
{BD28B058-230E-42DF-9FB1-FFBB0153F498}.Debug|Win32.Build.0 = Resource|Win32
{BD28B058-230E-42DF-9FB1-FFBB0153F498}.Debug|x64.ActiveCfg = Resource|Win32
{BD28B058-230E-42DF-9FB1-FFBB0153F498}.Debug|x64.Build.0 = Resource|Win32
{BD28B058-230E-42DF-9FB1-FFBB0153F498}.Release|Win32.ActiveCfg = Resource|Win32
{BD28B058-230E-42DF-9FB1-FFBB0153F498}.Release|Win32.Build.0 = Resource|Win32
{BD28B058-230E-42DF-9FB1-FFBB0153F498}.Release|x64.ActiveCfg = Resource|Win32
{BD28B058-230E-42DF-9FB1-FFBB0153F498}.Release|x64.Build.0 = Resource|Win32
{BD28B058-230E-42DF-9FB1-FFBB0153F498}.Setup|Win32.ActiveCfg = Resource|Win32
{BD28B058-230E-42DF-9FB1-FFBB0153F498}.Setup|Win32.Build.0 = Resource|Win32
{BD28B058-230E-42DF-9FB1-FFBB0153F498}.Setup|x64.ActiveCfg = Resource|Win32
{BD28B058-230E-42DF-9FB1-FFBB0153F498}.Setup|x64.Build.0 = Resource|Win32
{75809D15-8403-420A-BBE6-05F478D88D8E}.Debug|Win32.ActiveCfg = Resource|Win32
{75809D15-8403-420A-BBE6-05F478D88D8E}.Debug|Win32.Build.0 = Resource|Win32
{75809D15-8403-420A-BBE6-05F478D88D8E}.Debug|x64.ActiveCfg = Resource|Win32
{75809D15-8403-420A-BBE6-05F478D88D8E}.Debug|x64.Build.0 = Resource|Win32
{75809D15-8403-420A-BBE6-05F478D88D8E}.Release|Win32.ActiveCfg = Resource|Win32
{75809D15-8403-420A-BBE6-05F478D88D8E}.Release|Win32.Build.0 = Resource|Win32
{75809D15-8403-420A-BBE6-05F478D88D8E}.Release|x64.ActiveCfg = Resource|Win32
{75809D15-8403-420A-BBE6-05F478D88D8E}.Release|x64.Build.0 = Resource|Win32
{75809D15-8403-420A-BBE6-05F478D88D8E}.Setup|Win32.ActiveCfg = Resource|Win32
{75809D15-8403-420A-BBE6-05F478D88D8E}.Setup|Win32.Build.0 = Resource|Win32
{75809D15-8403-420A-BBE6-05F478D88D8E}.Setup|x64.ActiveCfg = Resource|Win32
{75809D15-8403-420A-BBE6-05F478D88D8E}.Setup|x64.Build.0 = Resource|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand All @@ -412,6 +440,8 @@ Global
{598AB4AC-008E-4501-90B3-C5213834C1DA} = {409484D8-C0DB-4991-AF03-124128EDEF98}
{63BAF573-170B-4FA0-AEE3-16E04F3E9DF5} = {409484D8-C0DB-4991-AF03-124128EDEF98}
{CA5BFC96-428D-42F5-9F7D-CDDE048A357C} = {409484D8-C0DB-4991-AF03-124128EDEF98}
{BD28B058-230E-42DF-9FB1-FFBB0153F498} = {409484D8-C0DB-4991-AF03-124128EDEF98}
{75809D15-8403-420A-BBE6-05F478D88D8E} = {409484D8-C0DB-4991-AF03-124128EDEF98}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {AF7D0AE8-B556-4840-92EF-CEADC95A5CD1}
Expand Down
2 changes: 2 additions & 0 deletions Src/Setup/BuildBinaries.bat
Expand Up @@ -63,6 +63,8 @@ copy /B "..\StartMenu\Skins\Windows 8.skin7" Output > nul
copy /B "..\StartMenu\Skins\Midnight.skin7" Output > nul
copy /B "..\StartMenu\Skins\Metro.skin7" Output > nul
copy /B "..\StartMenu\Skins\Metallic.skin7" Output > nul
copy /B "..\StartMenu\Skins\Immersive.skin" Output > nul
copy /B "..\StartMenu\Skins\Immersive.skin7" Output > nul


REM ********* Collect debug info
Expand Down
13 changes: 13 additions & 0 deletions Src/Setup/Setup.wxs
Expand Up @@ -90,6 +90,8 @@
<ComponentRef Id="Midnight.skin7" />
<ComponentRef Id="Metro.skin7" />
<ComponentRef Id="Metallic.skin7" />
<ComponentRef Id="Immersive.skin" />
<ComponentRef Id="Immersive.skin7" />
<ComponentRef Id="AutoRun" />
<ComponentRef Id="MenuSettingsLink" />
</Feature>
Expand Down Expand Up @@ -535,6 +537,14 @@
<Component Id="Metallic.skin7" Guid="2167BBCA-FD42-4285-AE00-9CDDDF436B30" Win64="$(var.CS_WIN64)">
<File Id="Metallic.skin7" KeyPath="yes" Checksum="yes" Source="Output\Metallic.skin7" Vital="yes" />
</Component>
<Component Id="Immersive.skin" Guid="045C48C3-FE11-4C66-AD7F-3F3EE35B4DEA" Win64="$(var.CS_WIN64)">
<File Id="Immersive.skin" KeyPath="yes" Checksum="yes" Source="Output\Immersive.skin" Vital="yes" />
<Condition>WINDOWSBUILDNUM&gt;10000</Condition>
</Component>
<Component Id="Immersive.skin7" Guid="FFECA17A-C005-4D84-9F7C-DBC8EA2E1B5A" Win64="$(var.CS_WIN64)">
<File Id="Immersive.skin7" KeyPath="yes" Checksum="yes" Source="Output\Immersive.skin7" Vital="yes" />
<Condition>WINDOWSBUILDNUM&gt;10000</Condition>
</Component>
</DirectoryRef>
<DirectoryRef Id="TARGETDIR">
<Component Id="OpenShell" Guid="19EC9EFC-B901-4EAB-B800-6E98D2261077" Win64="$(var.CS_WIN64)">
Expand Down Expand Up @@ -634,6 +644,9 @@
<Property Id="APPLICATIONFOLDER">
<RegistrySearch Id="Path" Root="HKLM" Key="Software\OpenShell\OpenShell" Name="Path" Type="raw" Win64="$(var.CS_WIN64)" />
</Property>
<Property Id="WINDOWSBUILDNUM" Secure="yes">
<RegistrySearch Id="WindowsBuild" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion" Name="CurrentBuild" Type="raw" />
</Property>
<CustomAction Id="LaunchStartMenu" Impersonate="yes" ExeCommand="" FileKey="StartMenu.exe" Return="asyncNoWait" />
<CustomAction Id="CloseStartMenu" Impersonate="yes" BinaryKey="SetupHelper.exe" Return="ignore" ExeCommand="exitSM" />
<WixVariable Id="WixUIBannerBmp" Value="..\Setup\banner.jpg" />
Expand Down
102 changes: 102 additions & 0 deletions Src/Skins/Immersive/Immersive.rc
@@ -0,0 +1,102 @@
/////////////////////////////////////////////////////////////////////////////
//
// Icon
//

// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
1 ICON "..\\..\\Setup\\OpenShell.ico"

/////////////////////////////////////////////////////////////////////////////
//
// SKIN
//

1 SKIN "SkinDescription.txt"

/////////////////////////////////////////////////////////////////////////////
//
// Image
//

1 IMAGE "fullglass1.png"
2 IMAGE "submenu.png"
3 IMAGE "submenu_vertsep.png"
4 IMAGE "fullglass_pager.png"
5 IMAGE "pager_arrows.png"
6 IMAGE "pager_arrows144.png"
7 IMAGE "separator.png"
8 IMAGE "arrow.png"
9 IMAGE "search.png"
10 IMAGE "twotone_pager.png"
11 IMAGE "pin.png"
12 IMAGE "user.png"
13 IMAGE "user144.png"
14 IMAGE "fullglass2.png"
15 IMAGE "fullglass3.png"
16 IMAGE "fullglass4.png"
17 IMAGE "fullglass_selector.png"
18 IMAGE "fullglass_splitsel.png"
19 IMAGE "newsel.png"
20 IMAGE "submenu_selector.png"
21 IMAGE "submenu_splitsel.png"
22 IMAGE "arrow144.png"
23 IMAGE "submenu_pager.png"
24 IMAGE "search_arrow.png"
25 IMAGE "search_arrow144.png"
26 IMAGE "pin144.png"
27 IMAGE "fullglass_vertsep.png"
28 IMAGE "separator144.png"
29 IMAGE "submenu_vertsep144.png"
30 IMAGE "pager_arrows120.png"
32 IMAGE "arrow120.png"
33 IMAGE "search120.png"
34 IMAGE "pin120.png"
36 IMAGE "search_arrow120.png"
37 IMAGE "user120.png"
38 IMAGE "arrow_mask.png"
39 IMAGE "arrow_mask120.png"
40 IMAGE "arrow_mask144.png"
41 IMAGE "twotone1.png"
42 IMAGE "twotone2.png"
43 IMAGE "twotone3.png"
44 IMAGE "twotone4.png"
45 IMAGE "twotone5.png"
46 IMAGE "twotone6.png"
47 IMAGE "twotone7.png"
48 IMAGE "twotone8.png"
49 IMAGE "twotone9.png"
50 IMAGE "twotone10.png"
51 IMAGE "twotone11.png"
52 IMAGE "twotone12.png"
53 IMAGE "twotone13.png"
54 IMAGE "twotone14.png"
55 IMAGE "twotone_selector.png"
56 IMAGE "twotone_splitsel.png"
57 IMAGE "twotone15.png"
58 IMAGE "twotone16.png"
59 IMAGE "twotone17.png"
60 IMAGE "twotone18.png"
61 IMAGE "twotone19.png"
62 IMAGE "twotone20.png"
63 IMAGE "twotone21.png"
64 IMAGE "twotone22.png"
65 IMAGE "twotone23.png"
66 IMAGE "twotone24.png"
67 IMAGE "twotone25.png"
68 IMAGE "twotone26.png"
69 IMAGE "twotone27.png"
70 IMAGE "twotone28.png"
71 IMAGE "twotone29.png"
72 IMAGE "twotone30.png"
73 IMAGE "twotone31.png"
74 IMAGE "twotone32.png"
75 IMAGE "twotone33.png"
76 IMAGE "twotone34.png"
77 IMAGE "twotone35.png"
78 IMAGE "pin192.png"
79 IMAGE "arrow192.png"
80 IMAGE "arrow_mask192.png"
81 IMAGE "pager_arrows192.png"
82 IMAGE "search_arrow192.png"
83 IMAGE "search192.png"
44 changes: 44 additions & 0 deletions Src/Skins/Immersive/Immersive.vcxproj
@@ -0,0 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Resource|Win32">
<Configuration>Resource</Configuration>
<Platform>Win32</Platform>
</ProjectConfiguration>
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{BD28B058-230E-42DF-9FB1-FFBB0153F498}</ProjectGuid>
<RootNamespace>Immersive</RootNamespace>
<Keyword>Win32Proj</Keyword>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="PropertySheets">
<Import Project="..\Skin.props" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<TargetExt>.skin</TargetExt>
<TargetName>Immersive</TargetName>
</PropertyGroup>
<ItemGroup>
<Text Include="SkinDescription.txt" />
</ItemGroup>
<ItemGroup>
<Image Include="*.png" />
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Immersive.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
28 changes: 28 additions & 0 deletions Src/Skins/Immersive/Immersive.vcxproj.filters
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="Source Files">
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
<Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
</Filter>
<Filter Include="Resource Files">
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<Text Include="SkinDescription.txt">
<Filter>Source Files</Filter>
</Text>
</ItemGroup>
<ItemGroup>
<Image Include="*.png">
<Filter>Resource Files</Filter>
</Image>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="Immersive.rc">
<Filter>Resource Files</Filter>
</ResourceCompile>
</ItemGroup>
</Project>

0 comments on commit ecd17cb

Please sign in to comment.