Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-08 20:27:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Tweaked settings UX

Browse Source
This commit is contained in:
Niels Laute
2021-05-11 17:52:58 +02:00
parent 6617444f14
commit 7cf1c64575
2 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
View File

@@ -1186,8 +1186,11 @@ From there, simply click on a Markdown file or SVG icon in the File Explorer and
<data name="Espresso_TemporaryKeepAwakeDescription.Text" xml:space="preserve"> <data name="Espresso_TemporaryKeepAwakeDescription.Text" xml:space="preserve">
<value>Keeps the computer awake until the set time elapses.</value> <value>Keeps the computer awake until the set time elapses.</value>
</data> </data>
<data name="Espresso_EnableDisplayKeepAwake.Header" xml:space="preserve"> <data name="Espresso_EnableDisplayKeepAwake.Content" xml:space="preserve">
<value>Keep display on</value> <value>Keep screen on</value>
</data>
<data name="Espresso_Mode.Text" xml:space="preserve">
<value>Mode</value>
</data> </data>
<data name="Espresso_Behavior_GroupSettings.Text" xml:space="preserve"> <data name="Espresso_Behavior_GroupSettings.Text" xml:space="preserve">
<value>Behavior</value> <value>Behavior</value>
@@ -1201,15 +1204,8 @@ From there, simply click on a Markdown file or SVG icon in the File Explorer and
<data name="Espresso_ModuleAttributionLabel.Text" xml:space="preserve"> <data name="Espresso_ModuleAttributionLabel.Text" xml:space="preserve">
<value>Den Delimarsky's Espresso</value> <value>Den Delimarsky's Espresso</value>
</data> </data>
<data name="Espresso_UXAttributionLabel.Text" xml:space="preserve">
<value>Niels Laute's UX concept</value>
</data>
<data name="Espresso_UXAttributionHyperlink.NavigateUri" xml:space="preserve">
<value>https://medium.com/@Niels9001/a-fluent-color-meter-for-powertoys-20407ededf0c</value>
<comment>URL. Do not loc</comment>
</data>
<data name="Espresso_ModuleAttributionHyperlink.NavigateUri" xml:space="preserve"> <data name="Espresso_ModuleAttributionHyperlink.NavigateUri" xml:space="preserve">
<value>https://espresso.den.dev</value> <value>https://espresso.den.dev</value>
<comment>URL. Do not loc</comment> <comment>URL. Do not loc</comment>
</data> </data>
</root> </root>

38
src/settings-ui/Microsoft.PowerToys.Settings.UI/Views/EspressoPage.xaml
View File

@@ -69,13 +69,21 @@
<TextBlock x:Uid="Espresso_Behavior_GroupSettings" <TextBlock x:Uid="Espresso_Behavior_GroupSettings"
Style="{StaticResource SettingsGroupTitleStyle}"/> Style="{StaticResource SettingsGroupTitleStyle}"/>
<ToggleSwitch x:Uid="Espresso_EnableDisplayKeepAwake"
IsEnabled="{Binding IsEnabled}"
IsOn="{Binding KeepDisplayOn, Mode=TwoWay}" />
<!--Foreground="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled, Converter={StaticResource ModuleEnabledToForegroundConverter}}"-->
<StackPanel Margin="{StaticResource MediumTopMargin}"> <CheckBox x:Uid="Espresso_EnableDisplayKeepAwake"
IsEnabled="{Binding IsEnabled}"
IsChecked="{Binding KeepDisplayOn, Mode=TwoWay}"
Margin="{StaticResource XSmallTopMargin}" />
<TextBlock x:Uid="Espresso_Mode"
Margin="{StaticResource SmallTopMargin}"
x:Name="ModeTitleLabel"
Foreground="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled, Converter={StaticResource ModuleEnabledToForegroundConverter}}" />
<StackPanel AutomationProperties.LabeledBy="{Binding ElementName=ModeTitleLabel}"
Margin="0,-4,0,0">
<RadioButton x:Uid="Espresso_IndefiniteKeepAwake" <RadioButton x:Uid="Espresso_IndefiniteKeepAwake"
Margin="{StaticResource SmallTopMargin}"
IsEnabled="{Binding IsEnabled}" IsEnabled="{Binding IsEnabled}"
IsChecked="{Binding Mode, Mode=TwoWay, Converter={StaticResource EspressoModeToBoolConverter}}"> IsChecked="{Binding Mode, Mode=TwoWay, Converter={StaticResource EspressoModeToBoolConverter}}">
<RadioButton.Content> <RadioButton.Content>
@@ -88,6 +96,7 @@
</RadioButton.Content> </RadioButton.Content>
</RadioButton> </RadioButton>
<RadioButton x:Uid="Espresso_TemporaryKeepAwake" <RadioButton x:Uid="Espresso_TemporaryKeepAwake"
Margin="{StaticResource SmallTopMargin}"
IsEnabled="{Binding IsEnabled}" IsEnabled="{Binding IsEnabled}"
IsChecked="{Binding Mode, Mode=TwoWay, Converter={StaticResource EspressoModeToReverseBoolConverter}}"> IsChecked="{Binding Mode, Mode=TwoWay, Converter={StaticResource EspressoModeToReverseBoolConverter}}">
<RadioButton.Content> <RadioButton.Content>
@@ -100,13 +109,12 @@
</RadioButton.Content> </RadioButton.Content>
</RadioButton> </RadioButton>
<StackPanel Margin="28,0,0,0" Orientation="Horizontal"> <StackPanel Margin="28,8,0,0" Orientation="Horizontal">
<muxc:NumberBox x:Uid="Espresso_TemporaryKeepAwake_Hours" <muxc:NumberBox x:Uid="Espresso_TemporaryKeepAwake_Hours"
Value="{Binding Hours, Mode=TwoWay}" Value="{Binding Hours, Mode=TwoWay}"
Minimum="0" Minimum="0"
SpinButtonPlacementMode="Compact" SpinButtonPlacementMode="Compact"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Margin="{StaticResource SmallTopMargin}"
MinWidth="90" MinWidth="90"
IsEnabled="{Binding Mode, Converter={StaticResource EspressoModeToReverseBoolConverter}}" IsEnabled="{Binding Mode, Converter={StaticResource EspressoModeToReverseBoolConverter}}"
SmallChange="1" SmallChange="1"
@@ -115,14 +123,17 @@
Value="{Binding Minutes, Mode=TwoWay}" Value="{Binding Minutes, Mode=TwoWay}"
Minimum="0" Minimum="0"
SpinButtonPlacementMode="Compact" SpinButtonPlacementMode="Compact"
Margin="8,0,0,0"
HorizontalAlignment="Left" HorizontalAlignment="Left"
Margin="{StaticResource SmallLeftTopRightBottomMargin}"
MinWidth="90" MinWidth="90"
IsEnabled="{Binding Mode, Converter={StaticResource EspressoModeToReverseBoolConverter}}" IsEnabled="{Binding Mode, Converter={StaticResource EspressoModeToReverseBoolConverter}}"
SmallChange="1" SmallChange="1"
LargeChange="5"/> LargeChange="5"/>
</StackPanel> </StackPanel>
</StackPanel> </StackPanel>
<!--Foreground="{x:Bind Mode=OneWay, Path=ViewModel.IsEnabled, Converter={StaticResource ModuleEnabledToForegroundConverter}}"-->
</StackPanel> </StackPanel>
<RelativePanel x:Name="SidePanel" <RelativePanel x:Name="SidePanel"
@@ -167,15 +178,10 @@
Style="{StaticResource SettingsGroupTitleStyle}" /> Style="{StaticResource SettingsGroupTitleStyle}" />
<HyperlinkButton Margin="0,-3,0,0" <HyperlinkButton Margin="0,-3,0,0"
x:Uid="Espresso_ModuleAttributionHyperlink"> x:Uid="Espresso_ModuleAttributionHyperlink">
<TextBlock x:Uid="Espresso_ModuleAttributionLabel" TextWrapping="Wrap" /> <TextBlock x:Uid="Espresso_ModuleAttributionLabel"
TextWrapping="Wrap" />
</HyperlinkButton> </HyperlinkButton>
<HyperlinkButton Margin="0,-3,0,0"
x:Uid="Espresso_UXAttributionHyperlink">
<TextBlock x:Uid="Espresso_UXAttributionLabel" TextWrapping="Wrap" />
</HyperlinkButton>
</StackPanel> </StackPanel>
</RelativePanel> </RelativePanel>
</Grid> </Grid>