maxmustermann/PowerToys
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[Settings] Embed images (#5236)

Browse source 
* Added local images

* Margin fix

* Update Product.wxs

Added images to installer
This commit is contained in:
Niels Laute 2020-07-29 00:02:09 +02:00 committed by GitHub
parent 66ff661ff5
commit 8fb446ad47
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
20 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
installer/PowerToysSetup/Product.wxs
View file

@ -689,6 +689,9 @@
<?foreach File in Logo.scale-200.png;SplashScreen.png;StoreLogo.scale-100.png?>
<File Source="$(var.BinX64Dir)SettingsUIRunner\Assets\$(var.File)" />
<?endforeach?>
<?foreach File in ColorPicker.png;FancyZones.png;ImageResizer.png;KBM.png;PowerLauncher.png;PowerPreview.png;PowerRename.png;PT.png;ShortcutGuide.png?>
<File Source="$(var.BinX64Dir)SettingsUIRunner\Assets\Modules\$(var.File)" />
<?endforeach?>
<File Id="SettingsV2_StoreLogo" Source="$(var.BinX64Dir)SettingsUIRunner\Assets\StoreLogo.png" />
<File Id="Square150x150Logo" Source="$(var.BinX64Dir)SettingsUIRunner\Assets\Square150x150Logo.scale-200.png" />
<File Id="Square44x44Logo_targetsize_24_altform_unplated" Source="$(var.BinX64Dir)SettingsUIRunner\Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />

BIN
src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/ColorPicker.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 184 KiB

BIN
src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/FancyZones.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 53 KiB

BIN
src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/ImageResizer.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 87 KiB

BIN
src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/KBM.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 51 KiB

BIN
src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/PT.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 111 KiB

BIN
src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/PowerLauncher.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 68 KiB

BIN
src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/PowerPreview.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 87 KiB

BIN
src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/PowerRename.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 94 KiB

BIN
src/core/Microsoft.PowerToys.Settings.UI/Assets/Modules/ShortcutGuide.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 89 KiB

9
src/core/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
View file

@ -158,6 +158,15 @@
</ItemGroup>
<ItemGroup>
<Content Include="Assets\Logo.scale-200.png" />
<Content Include="Assets\Modules\ColorPicker.png" />
<Content Include="Assets\Modules\FancyZones.png" />
<Content Include="Assets\Modules\ImageResizer.png" />
<Content Include="Assets\Modules\KBM.png" />
<Content Include="Assets\Modules\PowerLauncher.png" />
<Content Include="Assets\Modules\PowerPreview.png" />
<Content Include="Assets\Modules\PowerRename.png" />
<Content Include="Assets\Modules\PT.png" />
<Content Include="Assets\Modules\ShortcutGuide.png" />
<Content Include="Assets\SplashScreen.png" />
<Content Include="Assets\Square150x150Logo.scale-200.png" />
<Content Include="Assets\Square44x44Logo.scale-200.png" />

2
src/core/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml
View file

@ -108,7 +108,7 @@
HorizontalAlignment="Left"
Margin="{StaticResource SmallTopBottomMargin}"
RelativePanel.Below="DescriptionPanel">
<Image Source="https://aka.ms/powerToysColorPickerSettingImage" />
<Image Source="ms-appx:///Assets/Modules/ColorPicker.png" />
</Border>
<StackPanel x:Name="LinksPanel"
RelativePanel.Below="AboutImage"

4
src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
View file

@ -303,13 +303,13 @@
HorizontalAlignment="Left"
Margin="{StaticResource SmallTopBottomMargin}"
RelativePanel.Below="DescriptionPanel">
<Image Source="https://aka.ms/powerToysFancyZoneSettingImage" />
<Image Source="ms-appx:///Assets/Modules/FancyZones.png" />
</Border>
<StackPanel x:Name="LinksPanel"
RelativePanel.Below="AboutImage"
Orientation="Vertical" >
<HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_FancyZones" Margin="0,-3,0,0">
<HyperlinkButton NavigateUri="https://aka.ms/PowerToysOverview_FancyZones">
<TextBlock x:Uid="Module_overview" />
</HyperlinkButton>
<HyperlinkButton NavigateUri="https://github.com/microsoft/PowerToys/issues">

2
src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
View file

@ -155,7 +155,7 @@
HorizontalAlignment="Left"
Margin="{StaticResource SmallTopBottomMargin}"
RelativePanel.Below="DescriptionPanel">
<Image Source="https://aka.ms/powerToysPTSettingImage" />
<Image Source="ms-appx:///Assets/Modules/PT.png" />
</Border>
<StackPanel x:Name="LinksPanel"
RelativePanel.Below="AboutImage"

2
src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
View file

@ -316,7 +316,7 @@
HorizontalAlignment="Left"
Margin="{StaticResource SmallTopBottomMargin}"
RelativePanel.Below="DescriptionPanel">
<Image Source="https://aka.ms/powerToysImageResizerSettingImage" />
<Image Source="ms-appx:///Assets/Modules/ImageResizer.png" />
</Border>
<StackPanel x:Name="LinksPanel"

2
src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
View file

@ -338,7 +338,7 @@
HorizontalAlignment="Left"
Margin="{StaticResource SmallTopBottomMargin}"
RelativePanel.Below="DescriptionPanel">
<Image Source="https://aka.ms/powerToysKBMSettingImage" />
<Image Source="ms-appx:///Assets/Modules/KBM.png" />
</Border>
<StackPanel x:Name="LinksPanel"

2
src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
View file

@ -178,7 +178,7 @@
HorizontalAlignment="Left"
Margin="{StaticResource SmallTopBottomMargin}"
RelativePanel.Below="DescriptionPanel">
<Image Source="https://aka.ms/powerToysPowerLauncherSettingImage" />
<Image Source="ms-appx:///Assets/Modules/PowerLauncher.png" />
</Border>
<StackPanel x:Name="LinksPanel"

2
src/core/Microsoft.PowerToys.Settings.UI/Views/PowerPreviewPage.xaml
View file

@ -82,7 +82,7 @@
HorizontalAlignment="Left"
Margin="{StaticResource SmallTopBottomMargin}"
RelativePanel.Below="DescriptionPanel">
<Image Source="https://aka.ms/powerToysPowerPreviewSettingImage" />
<Image Source="ms-appx:///Assets/Modules/PowerPreview.png" />
</Border>
<StackPanel x:Name="LinksPanel"

2
src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml
View file

@ -121,7 +121,7 @@
HorizontalAlignment="Left"
Margin="{StaticResource SmallTopBottomMargin}"
RelativePanel.Below="DescriptionPanel">
<Image Source="https://aka.ms/powerToysPowerRenameSettingImage" />
<Image Source="ms-appx:///Assets/Modules/PowerRename.png" />
</Border>
<StackPanel x:Name="LinksPanel"

2
src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
View file

@ -130,7 +130,7 @@
HorizontalAlignment="Left"
Margin="{StaticResource SmallTopBottomMargin}"
RelativePanel.Below="DescriptionPanel">
<Image Source="https://aka.ms/powerToysShortcutGuideSettingImage" />
<Image Source="ms-appx:///Assets/Modules/ShortcutGuide.png" />
</Border>
<StackPanel x:Name="LinksPanel"