Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

xaml adjustments, including contributors #2118

Merged
merged 2 commits into from
Apr 14, 2020
Merged

xaml adjustments, including contributors #2118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dba902b
xaml adjustments
crutkas Apr 14, 2020
8e9f7b9
verbage change.
crutkas Apr 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 16 additions & 19 deletions src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,25 +121,22 @@

</StackPanel>

<StackPanel x:Name="SidePanel"
Orientation="Vertical"
HorizontalAlignment="Left"
Width="{StaticResource SidePanelWidth}"
Grid.Column="1">

<TextBlock Text="About this feature"
Style="{StaticResource SettingsGroupTitleStyle}"
Margin="{StaticResource XSmallBottomMargin}"/>
<Image Source="https://user-images.githubusercontent.com/9866362/77859136-f04ae880-7207-11ea-8a7f-4295342fe319.gif" />
<HyperlinkButton Content="Module overview" NavigateUri="https://github.com/microsoft/PowerToys/blob/master/src/modules/fancyzones/README.md"/>
<HyperlinkButton Content="Give feedback"/>

<TextBlock Text="Contributors"
Style="{StaticResource SettingsGroupTitleStyle}"/>

<HyperlinkButton Content="Contributor name"/>
<HyperlinkButton Content="Contributor name"/>
<HyperlinkButton Content="Contributor name"/>
<StackPanel
x:Name="SidePanel"
Orientation="Vertical"
HorizontalAlignment="Left"
Width="{StaticResource SidePanelWidth}"
Grid.Column="1">

<TextBlock
Text="About this feature"
Style="{StaticResource SettingsGroupTitleStyle}"
Margin="{StaticResource XSmallBottomMargin}"/>
<Image
Source="https://user-images.githubusercontent.com/9866362/77859136-f04ae880-7207-11ea-8a7f-4295342fe319.gif" />
<HyperlinkButton
Content="Module overview"
NavigateUri="https://github.com/microsoft/PowerToys/blob/master/src/modules/fancyzones/README.md"/>
</StackPanel>
</Grid>
</Page>
59 changes: 37 additions & 22 deletions src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,11 @@
<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"/>
Expand All @@ -70,29 +74,40 @@

</StackPanel>

<StackPanel x:Name="SidePanel"
Orientation="Vertical"
HorizontalAlignment="Left"
Width="{StaticResource SidePanelWidth}"
Grid.Column="1">
<StackPanel
x:Name="SidePanel"
Orientation="Vertical"
HorizontalAlignment="Left"
Width="{StaticResource SidePanelWidth}"
Grid.Column="1">

<TextBlock Text="About PowerToys"
Style="{StaticResource SettingsGroupTitleStyle}"
Margin="{StaticResource XSmallBottomMargin}"/>
<TextBlock Text="Version 0.15.2" FontWeight="Bold" Margin="{StaticResource SmallTopMargin}" />
<Button Content="Check for updates" Margin="{StaticResource SmallTopMargin}" Foreground="White" Style="{StaticResource AccentButtonStyle}" Click="CheckForUpdates_Click" />
<TextBlock
Text="About PowerToys"
Style="{StaticResource SettingsGroupTitleStyle}"
Margin="{StaticResource XSmallBottomMargin}"/>
<TextBlock
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 Content="Request a feature" NavigateUri="https://github.com/microsoft/PowerToys/issues"/>
<HyperlinkButton Content="Privacy statement" NavigateUri=" http://go.microsoft.com/fwlink/?LinkId=521839" />



<!--<TextBlock Text="Contributors" Style="{StaticResource SettingsGroupTitleStyle}"/>

<HyperlinkButton Content="Contributor name"/>
<HyperlinkButton Content="Contributor name"/>
<HyperlinkButton Content="Contributor name"/>-->
<HyperlinkButton
Content="Report a bug"
NavigateUri="https://github.com/microsoft/PowerToys/issues"
Margin="{StaticResource SmallTopMargin}" />
<HyperlinkButton
Content="Request a feature"
NavigateUri="https://github.com/microsoft/PowerToys/issues"/>
<HyperlinkButton
Content="Privacy statement"
NavigateUri="http://go.microsoft.com/fwlink/?LinkId=521839" />
<HyperlinkButton
Content="Open-source notice"
NavigateUri="https://github.com/microsoft/PowerToys/blob/master/NOTICE.md" />
</StackPanel>
</Grid>
</Page>
32 changes: 17 additions & 15 deletions src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,25 +171,27 @@
Margin="{StaticResource SmallTopMargin}"/>
</StackPanel>

<StackPanel x:Name="SidePanel"
Orientation="Vertical"
HorizontalAlignment="Left"
Width="{StaticResource SidePanelWidth}"
Grid.Column="1">

<TextBlock Text="About this feature"
Style="{StaticResource SettingsGroupTitleStyle}"
Margin="{StaticResource XSmallBottomMargin}"/>
<StackPanel
x:Name="SidePanel"
Orientation="Vertical"
HorizontalAlignment="Left"
Width="{StaticResource SidePanelWidth}"
Grid.Column="1">

<TextBlock
Text="About this feature"
Style="{StaticResource SettingsGroupTitleStyle}"
Margin="{StaticResource XSmallBottomMargin}"/>

<HyperlinkButton Content="Module overview"/>
<HyperlinkButton Content="Give feedback"/>

<TextBlock Text="Contributors"
Style="{StaticResource SettingsGroupTitleStyle}"/>
<TextBlock
Text="Attribution"
Style="{StaticResource SettingsGroupTitleStyle}" />

<HyperlinkButton Content="Contributor name"/>
<HyperlinkButton Content="Contributor name"/>
<HyperlinkButton Content="Contributor name"/>
<HyperlinkButton
Content="Brice Lams's Image Resizer"
NavigateUri="https://github.com/bricelam/ImageResizer/" />
</StackPanel>
</Grid>
</Page>
30 changes: 11 additions & 19 deletions src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,27 +159,19 @@

</StackPanel>

<StackPanel x:Name="SidePanel"
Orientation="Vertical"
HorizontalAlignment="Left"
Width="{StaticResource SidePanelWidth}"
Grid.Column="1">

<TextBlock Text="About this feature"
Style="{StaticResource SettingsGroupTitleStyle}"
Margin="{StaticResource XSmallBottomMargin}"/>
<StackPanel
x:Name="SidePanel"
Orientation="Vertical"
HorizontalAlignment="Left"
Width="{StaticResource SidePanelWidth}"
Grid.Column="1">

<TextBlock
Text="About this feature"
Style="{StaticResource SettingsGroupTitleStyle}"
Margin="{StaticResource XSmallBottomMargin}"/>

<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>


</Grid>
</Page>
Loading