mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2025-06-07 17:42:45 +08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

xaml adjustments, including contributors (#2118)

Browse Source 
* xaml adjustments

* verbage change.
This commit is contained in:
Clint Rutkas 2020-04-14 10:42:27 -07:00 committed by GitHub
parent a88d66b48b
commit 95eb17bdb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 273 additions and 264 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
View File

@ -121,25 +121,22 @@
</StackPanel> </StackPanel>
<StackPanel x:Name="SidePanel" <StackPanel
x:Name="SidePanel"
Orientation="Vertical" Orientation="Vertical"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Width="{StaticResource SidePanelWidth}" Width="{StaticResource SidePanelWidth}"
Grid.Column="1"> Grid.Column="1">
<TextBlock Text="About this feature" <TextBlock
Text="About this feature"
Style="{StaticResource SettingsGroupTitleStyle}" Style="{StaticResource SettingsGroupTitleStyle}"
Margin="{StaticResource XSmallBottomMargin}"/> Margin="{StaticResource XSmallBottomMargin}"/>
<Image Source="https://user-images.githubusercontent.com/9866362/77859136-f04ae880-7207-11ea-8a7f-4295342fe319.gif" /> <Image
<HyperlinkButton Content="Module overview" NavigateUri="https://github.com/microsoft/PowerToys/blob/master/src/modules/fancyzones/README.md"/> Source="https://user-images.githubusercontent.com/9866362/77859136-f04ae880-7207-11ea-8a7f-4295342fe319.gif" />
<HyperlinkButton Content="Give feedback"/> <HyperlinkButton
Content="Module overview"
<TextBlock Text="Contributors" NavigateUri="https://github.com/microsoft/PowerToys/blob/master/src/modules/fancyzones/README.md"/>
Style="{StaticResource SettingsGroupTitleStyle}"/>
<HyperlinkButton Content="Contributor name"/>
<HyperlinkButton Content="Contributor name"/>
<HyperlinkButton Content="Contributor name"/>
</StackPanel> </StackPanel>
</Grid> </Grid>
</Page> </Page>

47
src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
View File

@ -56,7 +56,11 @@
<TextBlock Text="PowerToys currently respects the Windows data &amp; feedback setting" Opacity="0.8" Margin="0,0,0,0" /> <TextBlock Text="PowerToys currently respects the Windows data &amp; feedback setting" Opacity="0.8" Margin="0,0,0,0" />
--> -->
<Button Content="Restart as admin" Margin="{StaticResource SmallTopMargin}" Style="{StaticResource AccentButtonStyle}" Click="Restart_Elevated" /> <Button
Content="Restart as admin"
Margin="{StaticResource SmallTopMargin}"
Style="{StaticResource AccentButtonStyle}"
Click="Restart_Elevated" />
<!-- <!--
<TextBlock Text="Default apps" Style="{StaticResource SubtitleTextBlockStyle}" Margin="0,34,0,8"/> <TextBlock Text="Default apps" Style="{StaticResource SubtitleTextBlockStyle}" Margin="0,34,0,8"/>
@ -70,29 +74,40 @@
</StackPanel> </StackPanel>
<StackPanel x:Name="SidePanel" <StackPanel
x:Name="SidePanel"
Orientation="Vertical" Orientation="Vertical"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Width="{StaticResource SidePanelWidth}" Width="{StaticResource SidePanelWidth}"
Grid.Column="1"> Grid.Column="1">
<TextBlock Text="About PowerToys" <TextBlock
Text="About PowerToys"
Style="{StaticResource SettingsGroupTitleStyle}" Style="{StaticResource SettingsGroupTitleStyle}"
Margin="{StaticResource XSmallBottomMargin}"/> Margin="{StaticResource XSmallBottomMargin}"/>
<TextBlock Text="Version 0.15.2" FontWeight="Bold" Margin="{StaticResource SmallTopMargin}" /> <TextBlock
<Button Content="Check for updates" Margin="{StaticResource SmallTopMargin}" Foreground="White" Style="{StaticResource AccentButtonStyle}" Click="CheckForUpdates_Click" /> Text="Version 0.15.2"
FontWeight="Bold"
Margin="{StaticResource SmallTopMargin}" />
<Button
Content="Check for updates"
Margin="{StaticResource SmallTopMargin}"
Style="{StaticResource AccentButtonStyle}"
Click="CheckForUpdates_Click" />
<HyperlinkButton Content="Report a bug" NavigateUri="https://github.com/microsoft/PowerToys/issues" Margin="{StaticResource SmallTopMargin}" /> <HyperlinkButton
<HyperlinkButton Content="Request a feature" NavigateUri="https://github.com/microsoft/PowerToys/issues"/> Content="Report a bug"
<HyperlinkButton Content="Privacy statement" NavigateUri=" http://go.microsoft.com/fwlink/?LinkId=521839" /> NavigateUri="https://github.com/microsoft/PowerToys/issues"
Margin="{StaticResource SmallTopMargin}" />
<HyperlinkButton
Content="Request a feature"
<!--<TextBlock Text="Contributors" Style="{StaticResource SettingsGroupTitleStyle}"/> NavigateUri="https://github.com/microsoft/PowerToys/issues"/>
<HyperlinkButton
<HyperlinkButton Content="Contributor name"/> Content="Privacy statement"
<HyperlinkButton Content="Contributor name"/> NavigateUri="http://go.microsoft.com/fwlink/?LinkId=521839" />
<HyperlinkButton Content="Contributor name"/>--> <HyperlinkButton
Content="Open-source notice"
NavigateUri="https://github.com/microsoft/PowerToys/blob/master/NOTICE.md" />
</StackPanel> </StackPanel>
</Grid> </Grid>
</Page> </Page>

16
src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
View File

@ -171,25 +171,27 @@
Margin="{StaticResource SmallTopMargin}"/> Margin="{StaticResource SmallTopMargin}"/>
</StackPanel> </StackPanel>
<StackPanel x:Name="SidePanel" <StackPanel
x:Name="SidePanel"
Orientation="Vertical" Orientation="Vertical"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Width="{StaticResource SidePanelWidth}" Width="{StaticResource SidePanelWidth}"
Grid.Column="1"> Grid.Column="1">
<TextBlock Text="About this feature" <TextBlock
Text="About this feature"
Style="{StaticResource SettingsGroupTitleStyle}" Style="{StaticResource SettingsGroupTitleStyle}"
Margin="{StaticResource XSmallBottomMargin}"/> Margin="{StaticResource XSmallBottomMargin}"/>
<HyperlinkButton Content="Module overview"/> <HyperlinkButton Content="Module overview"/>
<HyperlinkButton Content="Give feedback"/>
<TextBlock Text="Contributors" <TextBlock
Text="Attribution"
Style="{StaticResource SettingsGroupTitleStyle}" /> Style="{StaticResource SettingsGroupTitleStyle}" />
<HyperlinkButton Content="Contributor name"/> <HyperlinkButton
<HyperlinkButton Content="Contributor name"/> Content="Brice Lams's Image Resizer"
<HyperlinkButton Content="Contributor name"/> NavigateUri="https://github.com/bricelam/ImageResizer/" />
</StackPanel> </StackPanel>
</Grid> </Grid>
</Page> </Page>

16
src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
View File

@ -161,27 +161,19 @@
</StackPanel> </StackPanel>
<StackPanel x:Name="SidePanel" <StackPanel
x:Name="SidePanel"
Orientation="Vertical" Orientation="Vertical"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Width="{StaticResource SidePanelWidth}" Width="{StaticResource SidePanelWidth}"
Grid.Column="1"> Grid.Column="1">
<TextBlock Text="About this feature" <TextBlock
Text="About this feature"
Style="{StaticResource SettingsGroupTitleStyle}" Style="{StaticResource SettingsGroupTitleStyle}"
Margin="{StaticResource XSmallBottomMargin}"/> Margin="{StaticResource XSmallBottomMargin}"/>
<HyperlinkButton Content="Module overview"/> <HyperlinkButton Content="Module overview"/>
<HyperlinkButton Content="Give feedback"/>
<TextBlock Text="Contributors"
Style="{StaticResource SettingsGroupTitleStyle}"/>
<HyperlinkButton Content="Contributor name"/>
<HyperlinkButton Content="Contributor name"/>
<HyperlinkButton Content="Contributor name"/>
</StackPanel> </StackPanel>
</Grid> </Grid>
</Page> </Page>

20
src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
View File

@ -120,25 +120,31 @@
</StackPanel> </StackPanel>
<StackPanel x:Name="SidePanel" <StackPanel
x:Name="SidePanel"
Orientation="Vertical" Orientation="Vertical"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Width="{StaticResource SidePanelWidth}" Width="{StaticResource SidePanelWidth}"
Grid.Column="1"> Grid.Column="1">
<TextBlock Text="About this feature" <TextBlock
Text="About this feature"
Style="{StaticResource SettingsGroupTitleStyle}" Style="{StaticResource SettingsGroupTitleStyle}"
Margin="{StaticResource XSmallBottomMargin}"/> Margin="{StaticResource XSmallBottomMargin}"/>
<HyperlinkButton Content="Module overview"/> <HyperlinkButton Content="Module overview"/>
<HyperlinkButton Content="Give feedback"/>
<TextBlock Text="Contributors" <TextBlock
Text="Attribution"
Style="{StaticResource SettingsGroupTitleStyle}" /> Style="{StaticResource SettingsGroupTitleStyle}" />
<HyperlinkButton Content="Contributor name"/> <HyperlinkButton
<HyperlinkButton Content="Contributor name"/> Content="Wox"
<HyperlinkButton Content="Contributor name"/> NavigateUri="https://github.com/Wox-launcher/Wox/" />
<HyperlinkButton
Content="Beta Tadele's Window Walker"
NavigateUri="https://github.com/betsegaw/windowwalker/" />
</StackPanel> </StackPanel>
</Grid> </Grid>
</Page> </Page>

22
src/core/Microsoft.PowerToys.Settings.UI/Views/PowerPreviewPage.xaml
View File

@ -54,26 +54,24 @@
Toggled="ToggleSwitch_Preview_MD_Toggled" /> Toggled="ToggleSwitch_Preview_MD_Toggled" />
</StackPanel> </StackPanel>
<StackPanel x:Name="SidePanel" <StackPanel
x:Name="SidePanel"
Orientation="Vertical" Orientation="Vertical"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Width="{StaticResource SidePanelWidth}" Width="{StaticResource SidePanelWidth}"
Grid.Column="1"> Grid.Column="1">
<TextBlock Text="About this feature" <TextBlock
Text="About this feature"
Style="{StaticResource SettingsGroupTitleStyle}" Style="{StaticResource SettingsGroupTitleStyle}"
Margin="{StaticResource XSmallBottomMargin}"/> Margin="{StaticResource XSmallBottomMargin}"/>
<HyperlinkButton Content="Module overview" NavigateUri="https://github.com/microsoft/PowerToys/tree/master/src/modules/previewpane"/> <HyperlinkButton
<HyperlinkButton Content="Give feedback" NavigateUri="https://github.com/microsoft/PowerToys/issues"/> Content="Module overview"
NavigateUri="https://github.com/microsoft/PowerToys/tree/master/src/modules/previewpane"/>
<!-- <TextBlock Text="Contributors" <HyperlinkButton
Style="{StaticResource SettingsGroupTitleStyle}"/> Content="Give feedback"
NavigateUri="https://github.com/microsoft/PowerToys/issues"/>
<HyperlinkButton Content="Contributor name"/>
<HyperlinkButton Content="Contributor name"/>
<HyperlinkButton Content="Contributor name"/>
-->
</StackPanel> </StackPanel>
</Grid> </Grid>
</Page> </Page>

23
src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml
View File

@ -83,27 +83,30 @@
</StackPanel> </StackPanel>
<StackPanel x:Name="SidePanel" <StackPanel
x:Name="SidePanel"
Orientation="Vertical" Orientation="Vertical"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Width="{StaticResource SidePanelWidth}" Width="{StaticResource SidePanelWidth}"
Grid.Column="1"> Grid.Column="1">
<TextBlock Text="About this feature" <TextBlock
Text="About this feature"
Style="{StaticResource SettingsGroupTitleStyle}" Style="{StaticResource SettingsGroupTitleStyle}"
Margin="{StaticResource XSmallBottomMargin}"/> Margin="{StaticResource XSmallBottomMargin}"/>
<HyperlinkButton Content="Module overview" NavigateUri="https://github.com/microsoft/PowerToys/tree/master/src/modules/powerrename"/> <HyperlinkButton
<HyperlinkButton Content="Give feedback"/> Content="Module overview"
NavigateUri="https://github.com/microsoft/PowerToys/tree/master/src/modules/powerrename"/>
<!-- <TextBlock
<TextBlock Text="Contributors" Text="Attribution"
Style="{StaticResource SettingsGroupTitleStyle}" /> Style="{StaticResource SettingsGroupTitleStyle}" />
<HyperlinkButton Content="Contributor name"/> <HyperlinkButton
<HyperlinkButton Content="Contributor name"/> Content="Chris Davis's SmartRenamer"
<HyperlinkButton Content="Contributor name"/> NavigateUri="https://github.com/chrdavis/SmartRename" />
-->
</StackPanel> </StackPanel>
</Grid> </Grid>
</Page> </Page>

18
src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
View File

@ -72,25 +72,21 @@
</muxc:RadioButtons> </muxc:RadioButtons>
</StackPanel> </StackPanel>
<StackPanel x:Name="SidePanel" <StackPanel
x:Name="SidePanel"
Orientation="Vertical" Orientation="Vertical"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Width="{StaticResource SidePanelWidth}" Width="{StaticResource SidePanelWidth}"
Grid.Column="1"> Grid.Column="1">
<TextBlock Text="About this feature" <TextBlock
Text="About this feature"
Style="{StaticResource SettingsGroupTitleStyle}" Style="{StaticResource SettingsGroupTitleStyle}"
Margin="{StaticResource XSmallBottomMargin}"/> Margin="{StaticResource XSmallBottomMargin}"/>
<HyperlinkButton Content="Module overview" NavigateUri="https://github.com/microsoft/PowerToys/blob/master/src/modules/shortcut_guide/README.md"/> <HyperlinkButton
<HyperlinkButton Content="Give feedback"/> Content="Module overview"
NavigateUri="https://github.com/microsoft/PowerToys/blob/master/src/modules/shortcut_guide/README.md"/>
<TextBlock Text="Contributors"
Style="{StaticResource SettingsGroupTitleStyle}"/>
<HyperlinkButton Content="Contributor name"/>
<HyperlinkButton Content="Contributor name"/>
<HyperlinkButton Content="Contributor name"/>
</StackPanel> </StackPanel>
</Grid> </Grid>
</Page> </Page>