Skip to content

Commit 2c13fa0

Browse files
ColdForeignColdForeign
authored
Merge pull request #21 from FolderPainter/feature/settings-page
Add settings page
2 parents 6ac8a05 + 930df7d commit 2c13fa0

58 files changed

Lines changed: 791 additions & 107 deletions

File tree

Some content is hidden

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

‎.gitignore‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,19 @@ bld/
1717
*.[Cc]ache
1818
# but keep track of directories ending in .cache
1919
!?*.[Cc]ache/
20+
21+
# User-specific files
22+
*.rsuser
23+
*.suo
24+
*.user
25+
*.userosscache
26+
*.sln.docstates
27+
28+
# Windows Store app package directories and files
29+
AppPackages/
30+
BundleArtifacts/
31+
Package.StoreAssociation.xml
32+
_pkginfo.txt
33+
*.appx
34+
*.appxbundle
35+
*.appxupload

‎FolderIconPainter.sln‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -79,22 +79,22 @@ Global
7979
{A96C7535-FB23-472C-AB4D-7CA2B52B8043}.Release|x86.ActiveCfg = Release|x86
8080
{A96C7535-FB23-472C-AB4D-7CA2B52B8043}.Release|x86.Build.0 = Release|x86
8181
{A96C7535-FB23-472C-AB4D-7CA2B52B8043}.Release|x86.Deploy.0 = Release|x86
82-
{79CBE5DC-9AE0-4182-882E-FC3D832C0156}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
83-
{79CBE5DC-9AE0-4182-882E-FC3D832C0156}.Debug|Any CPU.Build.0 = Debug|Any CPU
84-
{79CBE5DC-9AE0-4182-882E-FC3D832C0156}.Debug|ARM64.ActiveCfg = Debug|Any CPU
85-
{79CBE5DC-9AE0-4182-882E-FC3D832C0156}.Debug|ARM64.Build.0 = Debug|Any CPU
82+
{79CBE5DC-9AE0-4182-882E-FC3D832C0156}.Debug|Any CPU.ActiveCfg = Debug|x64
83+
{79CBE5DC-9AE0-4182-882E-FC3D832C0156}.Debug|Any CPU.Build.0 = Debug|x64
84+
{79CBE5DC-9AE0-4182-882E-FC3D832C0156}.Debug|ARM64.ActiveCfg = Debug|ARM64
85+
{79CBE5DC-9AE0-4182-882E-FC3D832C0156}.Debug|ARM64.Build.0 = Debug|ARM64
8686
{79CBE5DC-9AE0-4182-882E-FC3D832C0156}.Debug|x64.ActiveCfg = Debug|x64
8787
{79CBE5DC-9AE0-4182-882E-FC3D832C0156}.Debug|x64.Build.0 = Debug|x64
88-
{79CBE5DC-9AE0-4182-882E-FC3D832C0156}.Debug|x86.ActiveCfg = Debug|Any CPU
89-
{79CBE5DC-9AE0-4182-882E-FC3D832C0156}.Debug|x86.Build.0 = Debug|Any CPU
90-
{79CBE5DC-9AE0-4182-882E-FC3D832C0156}.Release|Any CPU.ActiveCfg = Release|Any CPU
91-
{79CBE5DC-9AE0-4182-882E-FC3D832C0156}.Release|Any CPU.Build.0 = Release|Any CPU
92-
{79CBE5DC-9AE0-4182-882E-FC3D832C0156}.Release|ARM64.ActiveCfg = Release|Any CPU
93-
{79CBE5DC-9AE0-4182-882E-FC3D832C0156}.Release|ARM64.Build.0 = Release|Any CPU
88+
{79CBE5DC-9AE0-4182-882E-FC3D832C0156}.Debug|x86.ActiveCfg = Debug|x86
89+
{79CBE5DC-9AE0-4182-882E-FC3D832C0156}.Debug|x86.Build.0 = Debug|x86
90+
{79CBE5DC-9AE0-4182-882E-FC3D832C0156}.Release|Any CPU.ActiveCfg = Release|x64
91+
{79CBE5DC-9AE0-4182-882E-FC3D832C0156}.Release|Any CPU.Build.0 = Release|x64
92+
{79CBE5DC-9AE0-4182-882E-FC3D832C0156}.Release|ARM64.ActiveCfg = Release|ARM64
93+
{79CBE5DC-9AE0-4182-882E-FC3D832C0156}.Release|ARM64.Build.0 = Release|ARM64
9494
{79CBE5DC-9AE0-4182-882E-FC3D832C0156}.Release|x64.ActiveCfg = Release|x64
9595
{79CBE5DC-9AE0-4182-882E-FC3D832C0156}.Release|x64.Build.0 = Release|x64
96-
{79CBE5DC-9AE0-4182-882E-FC3D832C0156}.Release|x86.ActiveCfg = Release|Any CPU
97-
{79CBE5DC-9AE0-4182-882E-FC3D832C0156}.Release|x86.Build.0 = Release|Any CPU
96+
{79CBE5DC-9AE0-4182-882E-FC3D832C0156}.Release|x86.ActiveCfg = Release|x86
97+
{79CBE5DC-9AE0-4182-882E-FC3D832C0156}.Release|x86.Build.0 = Release|x86
9898
{5A8F69B7-F888-8969-85EF-0AA22433D75A}.Debug|Any CPU.ActiveCfg = Debug|x64
9999
{5A8F69B7-F888-8969-85EF-0AA22433D75A}.Debug|Any CPU.Build.0 = Debug|x64
100100
{5A8F69B7-F888-8969-85EF-0AA22433D75A}.Debug|Any CPU.Deploy.0 = Debug|x64
@@ -103,7 +103,6 @@ Global
103103
{5A8F69B7-F888-8969-85EF-0AA22433D75A}.Debug|ARM64.Deploy.0 = Debug|ARM64
104104
{5A8F69B7-F888-8969-85EF-0AA22433D75A}.Debug|x64.ActiveCfg = Debug|x64
105105
{5A8F69B7-F888-8969-85EF-0AA22433D75A}.Debug|x64.Build.0 = Debug|x64
106-
{5A8F69B7-F888-8969-85EF-0AA22433D75A}.Debug|x64.Deploy.0 = Debug|x64
107106
{5A8F69B7-F888-8969-85EF-0AA22433D75A}.Debug|x86.ActiveCfg = Debug|x86
108107
{5A8F69B7-F888-8969-85EF-0AA22433D75A}.Debug|x86.Build.0 = Debug|x86
109108
{5A8F69B7-F888-8969-85EF-0AA22433D75A}.Debug|x86.Deploy.0 = Debug|x86

‎src/FIP.App/FIP.App (Package)/FIP.App (Package).assets.cache‎

-89.1 KB
Binary file not shown.

‎src/FIP.App/FIP.App (Package)/FIP.App (Package).wapproj‎

Lines changed: 74 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,31 @@
4343
<PropertyGroup>
4444
<WapProjPath Condition="'$(WapProjPath)'==''">$(MSBuildExtensionsPath)\Microsoft\DesktopBridge\</WapProjPath>
4545
<PathToXAMLWinRTImplementations>FIP.App\</PathToXAMLWinRTImplementations>
46+
<GenerateAppInstallerFile>False</GenerateAppInstallerFile>
47+
<AppxPackageSigningTimestampDigestAlgorithm>SHA256</AppxPackageSigningTimestampDigestAlgorithm>
48+
<AppxAutoIncrementPackageRevision>True</AppxAutoIncrementPackageRevision>
49+
<GenerateTestArtifacts>True</GenerateTestArtifacts>
50+
<AppxBundlePlatforms>x86|x64</AppxBundlePlatforms>
51+
<GenerateTemporaryStoreCertificate>True</GenerateTemporaryStoreCertificate>
52+
<HoursBetweenUpdateChecks>0</HoursBetweenUpdateChecks>
53+
</PropertyGroup>
54+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
55+
<AppxBundle>Always</AppxBundle>
56+
</PropertyGroup>
57+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
58+
<AppxBundle>Always</AppxBundle>
59+
</PropertyGroup>
60+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
61+
<AppxBundle>Always</AppxBundle>
62+
</PropertyGroup>
63+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
64+
<AppxBundle>Always</AppxBundle>
65+
</PropertyGroup>
66+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
67+
<AppxBundle>Always</AppxBundle>
68+
</PropertyGroup>
69+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
70+
<AppxBundle>Always</AppxBundle>
4671
</PropertyGroup>
4772
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.props" />
4873
<ItemGroup>
@@ -51,6 +76,31 @@
5176
</AppxManifest>
5277
</ItemGroup>
5378
<ItemGroup>
79+
<Content Include="Images\AppIcon.altform-lightunplated_targetsize-16.png" />
80+
<Content Include="Images\AppIcon.altform-lightunplated_targetsize-24.png" />
81+
<Content Include="Images\AppIcon.altform-lightunplated_targetsize-256.png" />
82+
<Content Include="Images\AppIcon.altform-lightunplated_targetsize-32.png" />
83+
<Content Include="Images\AppIcon.altform-lightunplated_targetsize-48.png" />
84+
<Content Include="Images\AppIcon.altform-unplated_targetsize-16.png" />
85+
<Content Include="Images\AppIcon.altform-unplated_targetsize-256.png" />
86+
<Content Include="Images\AppIcon.altform-unplated_targetsize-32.png" />
87+
<Content Include="Images\AppIcon.altform-unplated_targetsize-48.png" />
88+
<Content Include="Images\AppIcon.scale-100.png" />
89+
<Content Include="Images\AppIcon.scale-125.png" />
90+
<Content Include="Images\AppIcon.scale-150.png" />
91+
<Content Include="Images\AppIcon.scale-200.png" />
92+
<Content Include="Images\AppIcon.scale-400.png" />
93+
<Content Include="Images\AppIcon.targetsize-16.png" />
94+
<Content Include="Images\AppIcon.targetsize-24.png" />
95+
<Content Include="Images\AppIcon.targetsize-24_altform-unplated.png" />
96+
<Content Include="Images\AppIcon.targetsize-256.png" />
97+
<Content Include="Images\AppIcon.targetsize-32.png" />
98+
<Content Include="Images\AppIcon.targetsize-48.png" />
99+
<Content Include="Images\BadgeLogo.scale-100.png" />
100+
<Content Include="Images\BadgeLogo.scale-125.png" />
101+
<Content Include="Images\BadgeLogo.scale-150.png" />
102+
<Content Include="Images\BadgeLogo.scale-200.png" />
103+
<Content Include="Images\BadgeLogo.scale-400.png" />
54104
<Content Include="Images\LargeTile.scale-100.png" />
55105
<Content Include="Images\LargeTile.scale-125.png" />
56106
<Content Include="Images\LargeTile.scale-150.png" />
@@ -72,26 +122,26 @@
72122
<Content Include="Images\Square150x150Logo.scale-150.png" />
73123
<Content Include="Images\Square150x150Logo.scale-200.png" />
74124
<Content Include="Images\Square150x150Logo.scale-400.png" />
75-
<Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-16.png" />
76-
<Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-24.png" />
77-
<Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-256.png" />
78-
<Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-32.png" />
79-
<Content Include="Images\Square44x44Logo.altform-lightunplated_targetsize-48.png" />
80-
<Content Include="Images\Square44x44Logo.altform-unplated_targetsize-16.png" />
81-
<Content Include="Images\Square44x44Logo.altform-unplated_targetsize-256.png" />
82-
<Content Include="Images\Square44x44Logo.altform-unplated_targetsize-32.png" />
83-
<Content Include="Images\Square44x44Logo.altform-unplated_targetsize-48.png" />
84-
<Content Include="Images\Square44x44Logo.scale-100.png" />
85-
<Content Include="Images\Square44x44Logo.scale-125.png" />
86-
<Content Include="Images\Square44x44Logo.scale-150.png" />
87-
<Content Include="Images\Square44x44Logo.scale-200.png" />
88-
<Content Include="Images\Square44x44Logo.scale-400.png" />
89-
<Content Include="Images\Square44x44Logo.targetsize-16.png" />
90-
<Content Include="Images\Square44x44Logo.targetsize-24.png" />
91-
<Content Include="Images\Square44x44Logo.targetsize-24_altform-unplated.png" />
92-
<Content Include="Images\Square44x44Logo.targetsize-256.png" />
93-
<Content Include="Images\Square44x44Logo.targetsize-32.png" />
94-
<Content Include="Images\Square44x44Logo.targetsize-48.png" />
125+
<Content Include="Images\AppIcon.altform-lightunplated_targetsize-16.png" />
126+
<Content Include="Images\AppIcon.altform-lightunplated_targetsize-24.png" />
127+
<Content Include="Images\AppIcon.altform-lightunplated_targetsize-256.png" />
128+
<Content Include="Images\AppIcon.altform-lightunplated_targetsize-32.png" />
129+
<Content Include="Images\AppIcon.altform-lightunplated_targetsize-48.png" />
130+
<Content Include="Images\AppIcon.altform-unplated_targetsize-16.png" />
131+
<Content Include="Images\AppIcon.altform-unplated_targetsize-256.png" />
132+
<Content Include="Images\AppIcon.altform-unplated_targetsize-32.png" />
133+
<Content Include="Images\AppIcon.altform-unplated_targetsize-48.png" />
134+
<Content Include="Images\AppIcon.scale-100.png" />
135+
<Content Include="Images\AppIcon.scale-125.png" />
136+
<Content Include="Images\AppIcon.scale-150.png" />
137+
<Content Include="Images\AppIcon.scale-200.png" />
138+
<Content Include="Images\AppIcon.scale-400.png" />
139+
<Content Include="Images\AppIcon.targetsize-16.png" />
140+
<Content Include="Images\AppIcon.targetsize-24.png" />
141+
<Content Include="Images\AppIcon.targetsize-24_altform-unplated.png" />
142+
<Content Include="Images\AppIcon.targetsize-256.png" />
143+
<Content Include="Images\AppIcon.targetsize-32.png" />
144+
<Content Include="Images\AppIcon.targetsize-48.png" />
95145
<Content Include="Images\StoreLogo.scale-100.png" />
96146
<Content Include="Images\StoreLogo.scale-125.png" />
97147
<Content Include="Images\StoreLogo.scale-150.png" />
@@ -102,16 +152,17 @@
102152
<Content Include="Images\Wide310x150Logo.scale-150.png" />
103153
<Content Include="Images\Wide310x150Logo.scale-200.png" />
104154
<Content Include="Images\Wide310x150Logo.scale-400.png" />
155+
<None Include="Package.StoreAssociation.xml" />
105156
</ItemGroup>
106157
<ItemGroup>
107158
<ProjectReference Include="..\FIP.App\FIP.App.csproj">
108159
<SkipGetTargetFrameworkProperties>True</SkipGetTargetFrameworkProperties>
109-
<PublishProfile>Properties\PublishProfiles\win10-$(Platform).pubxml</PublishProfile>
160+
<PublishProfile>Properties\PublishProfiles\win-$(Platform).pubxml</PublishProfile>
110161
</ProjectReference>
111162
</ItemGroup>
112163
<ItemGroup>
113-
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.7175" />
114-
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.251106002" />
164+
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.26100.7705" />
165+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.8.260317003" />
115166
</ItemGroup>
116167
<Import Project="$(WapProjPath)\Microsoft.DesktopBridge.targets" />
117168
</Project>

‎src/FIP.App/FIP.App (Package)/FIP.App (Package).wapproj.user‎

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/FIP.App/FIP.App (Package)/Images/Square44x44Logo.altform-lightunplated_targetsize-16.png renamed to src/FIP.App/FIP.App (Package)/Images/AppIcon.altform-lightunplated_targetsize-16.png

File renamed without changes.

src/FIP.App/FIP.App (Package)/Images/Square44x44Logo.altform-lightunplated_targetsize-24.png renamed to src/FIP.App/FIP.App (Package)/Images/AppIcon.altform-lightunplated_targetsize-24.png

File renamed without changes.

src/FIP.App/FIP.App (Package)/Images/Square44x44Logo.altform-lightunplated_targetsize-256.png renamed to src/FIP.App/FIP.App (Package)/Images/AppIcon.altform-lightunplated_targetsize-256.png

File renamed without changes.

src/FIP.App/FIP.App (Package)/Images/Square44x44Logo.altform-lightunplated_targetsize-32.png renamed to src/FIP.App/FIP.App (Package)/Images/AppIcon.altform-lightunplated_targetsize-32.png

File renamed without changes.

src/FIP.App/FIP.App (Package)/Images/Square44x44Logo.altform-lightunplated_targetsize-48.png renamed to src/FIP.App/FIP.App (Package)/Images/AppIcon.altform-lightunplated_targetsize-48.png

File renamed without changes.

0 commit comments

Comments
 (0)