mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2024-12-01 01:49:06 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update control to make interaction responsive (#24977)

Browse Source
This commit is contained in:
Den 2023-03-23 14:21:05 -07:00 committed by GitHub
parent dcfc169240
commit ac8c0324e2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/settings-ui/Settings.UI/Strings/en-us/Resources.resw
View File

@ -1834,8 +1834,8 @@ From there, simply click on one of the supported files in the File Explorer and
<data name="Awake_DisplaySettingsCard.Description" xml:space="preserve">
<value>This setting is only available when keeping the PC awake</value>
</data>
<data name="Awake_ExpirationSettingsCard.Description" xml:space="preserve">
<value>Keep custom awakeness state until a specific date and time</value>
<data name="Awake_ExpirationSettingsExpander.Description" xml:space="preserve">
<value>Keep custom awake state until a specific date and time</value>
</data>
<data name="Awake_ModeSettingsCard.Header" xml:space="preserve">
<value>Mode</value>
@ -1849,6 +1849,12 @@ From there, simply click on one of the supported files in the File Explorer and
<data name="Awake_IntervalMinutesInput.Header" xml:space="preserve">
<value>Minutes</value>
</data>
<data name="Awake_ExpirationSettingsExpander_Date.Header" xml:space="preserve">
<value>End date</value>
</data>
<data name="Awake_ExpirationSettingsExpander_Time.Header" xml:space="preserve">
<value>End time</value>
</data>
<data name="Oobe_Awake.Title" xml:space="preserve">
<value>Awake</value>
<comment>Module name, do not loc</comment>
@ -2129,7 +2135,7 @@ From there, simply click on one of the supported files in the File Explorer and
<data name="Awake_IntervalSettingsCard.Header" xml:space="preserve">
<value>Interval before returning to the previous awakeness state</value>
</data>
<data name="Awake_ExpirationSettingsCard.Header" xml:space="preserve">
<data name="Awake_ExpirationSettingsExpander.Header" xml:space="preserve">
<value>End date and time</value>
</data>
<data name="MouseUtils.ModuleTitle" xml:space="preserve">

27
src/settings-ui/Settings.UI/Views/AwakePage.xaml
View File

@ -55,21 +55,28 @@
</ComboBox>
</labs:SettingsCard>
<labs:SettingsCard
x:Uid="Awake_ExpirationSettingsCard"
<labs:SettingsExpander
x:Uid="Awake_ExpirationSettingsExpander"
HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xEC92;}"
Visibility="{x:Bind ViewModel.IsExpirationConfigurationEnabled, Mode=OneWay}">
<StackPanel Orientation="Horizontal">
<DatePicker Date="{x:Bind ViewModel.ExpirationDateTime, Mode=TwoWay}"></DatePicker>
<TimePicker Margin="8,0,0,0" Time="{x:Bind ViewModel.ExpirationTime, Mode=TwoWay}" ClockIdentifier="24HourClock"></TimePicker>
</StackPanel>
</labs:SettingsCard>
Visibility="{x:Bind ViewModel.IsExpirationConfigurationEnabled, Mode=OneWay}" IsExpanded="True">
<labs:SettingsExpander.Items>
<labs:SettingsCard
x:Uid="Awake_ExpirationSettingsExpander_Date">
<DatePicker Date="{x:Bind ViewModel.ExpirationDateTime, Mode=TwoWay}"></DatePicker>
</labs:SettingsCard>
<labs:SettingsCard
x:Uid="Awake_ExpirationSettingsExpander_Time">
<TimePicker Time="{x:Bind ViewModel.ExpirationTime, Mode=TwoWay}" ClockIdentifier="24HourClock"></TimePicker>
</labs:SettingsCard>
</labs:SettingsExpander.Items>
</labs:SettingsExpander>
<labs:SettingsCard
x:Uid="Awake_IntervalSettingsCard"
HeaderIcon="{ui:FontIcon FontFamily={StaticResource SymbolThemeFontFamily}, Glyph=&#xE916;}"
Visibility="{x:Bind ViewModel.IsTimeConfigurationEnabled, Mode=OneWay}">
<StackPanel Orientation="Horizontal">
<StackPanel Orientation="Horizontal" MinWidth="{StaticResource SettingActionControlMinWidth}">
<NumberBox
x:Uid="Awake_IntervalHoursInput"
Width="96"