mirror of
https://github.com/microsoft/PowerToys.git
synced 2025-12-15 19:27:56 +01:00
More changes to the Settings page
This commit is contained in:
@@ -2,6 +2,7 @@
|
|||||||
// The Microsoft Corporation licenses this file to you under the MIT license.
|
// The Microsoft Corporation licenses this file to you under the MIT license.
|
||||||
// See the LICENSE file in the project root for more information.
|
// See the LICENSE file in the project root for more information.
|
||||||
|
|
||||||
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Collections.ObjectModel;
|
using System.Collections.ObjectModel;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
@@ -71,6 +72,10 @@ namespace Microsoft.PowerToys.Settings.UI.Library
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public string MonitorIconGlyph => CommunicationMethod.Contains("WMI", StringComparison.OrdinalIgnoreCase) == true
|
||||||
|
? "\uE7F8" // Laptop icon for WMI
|
||||||
|
: "\uE7F4"; // External monitor icon for DDC/CI and others
|
||||||
|
|
||||||
[JsonPropertyName("internalName")]
|
[JsonPropertyName("internalName")]
|
||||||
public string InternalName
|
public string InternalName
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -46,65 +46,53 @@
|
|||||||
</controls:SettingsGroup>
|
</controls:SettingsGroup>
|
||||||
|
|
||||||
<controls:SettingsGroup x:Uid="PowerDisplay_Profiles_GroupSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
|
<controls:SettingsGroup x:Uid="PowerDisplay_Profiles_GroupSettings" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
|
||||||
<tkcontrols:SettingsCard x:Uid="PowerDisplay_QuickProfiles" HeaderIcon="{ui:FontIcon Glyph=}">
|
<tkcontrols:SettingsExpander
|
||||||
<StackPanel Spacing="8">
|
x:Uid="PowerDisplay_QuickProfiles"
|
||||||
<!-- Profile buttons row -->
|
HeaderIcon="{ui:FontIcon Glyph=}"
|
||||||
<ItemsRepeater ItemsSource="{x:Bind ViewModel.Profiles, Mode=OneWay}">
|
ItemsSource="{x:Bind ViewModel.Profiles, Mode=OneWay}">
|
||||||
<ItemsRepeater.Layout>
|
<tkcontrols:SettingsExpander.ItemTemplate>
|
||||||
<StackLayout Orientation="Horizontal" Spacing="8" />
|
<DataTemplate x:DataType="library:PowerDisplayProfile">
|
||||||
</ItemsRepeater.Layout>
|
<tkcontrols:SettingsCard Header="{x:Bind Name}">
|
||||||
<ItemsRepeater.ItemTemplate>
|
<StackPanel Orientation="Horizontal" Spacing="8">
|
||||||
<DataTemplate x:DataType="library:PowerDisplayProfile">
|
|
||||||
<Button
|
<Button
|
||||||
Click="ProfileButton_Click"
|
Click="ProfileButton_Click"
|
||||||
|
Content="Apply"
|
||||||
|
Tag="{x:Bind}" />
|
||||||
|
<Button
|
||||||
|
Content="{ui:FontIcon Glyph=,
|
||||||
|
FontSize=16}"
|
||||||
|
Style="{StaticResource SubtleButtonStyle}"
|
||||||
Tag="{x:Bind}"
|
Tag="{x:Bind}"
|
||||||
ToolTipService.ToolTip="Apply this profile">
|
ToolTipService.ToolTip="More settings">
|
||||||
<StackPanel Orientation="Horizontal" Spacing="6">
|
<Button.Flyout>
|
||||||
<FontIcon FontSize="14" Glyph="" />
|
|
||||||
<TextBlock Text="{x:Bind Name}" />
|
|
||||||
</StackPanel>
|
|
||||||
|
|
||||||
<Button.ContextFlyout>
|
|
||||||
<MenuFlyout>
|
<MenuFlyout>
|
||||||
<MenuFlyoutItem
|
<MenuFlyoutItem
|
||||||
Click="EditProfile_Click"
|
Click="EditProfile_Click"
|
||||||
|
Icon="{ui:FontIcon Glyph=}"
|
||||||
Tag="{x:Bind}"
|
Tag="{x:Bind}"
|
||||||
Text="Edit">
|
Text="Edit" />
|
||||||
<MenuFlyoutItem.Icon>
|
<MenuFlyoutSeparator />
|
||||||
<FontIcon Glyph="" />
|
|
||||||
</MenuFlyoutItem.Icon>
|
|
||||||
</MenuFlyoutItem>
|
|
||||||
<MenuFlyoutItem
|
<MenuFlyoutItem
|
||||||
Click="DeleteProfile_Click"
|
Click="DeleteProfile_Click"
|
||||||
|
Icon="{ui:FontIcon Glyph=}"
|
||||||
Tag="{x:Bind}"
|
Tag="{x:Bind}"
|
||||||
Text="Delete">
|
Text="Delete" />
|
||||||
<MenuFlyoutItem.Icon>
|
|
||||||
<FontIcon Glyph="" />
|
|
||||||
</MenuFlyoutItem.Icon>
|
|
||||||
</MenuFlyoutItem>
|
|
||||||
</MenuFlyout>
|
</MenuFlyout>
|
||||||
</Button.ContextFlyout>
|
</Button.Flyout>
|
||||||
</Button>
|
</Button>
|
||||||
</DataTemplate>
|
</StackPanel>
|
||||||
</ItemsRepeater.ItemTemplate>
|
</tkcontrols:SettingsCard>
|
||||||
</ItemsRepeater>
|
</DataTemplate>
|
||||||
|
</tkcontrols:SettingsExpander.ItemTemplate>
|
||||||
|
|
||||||
<!-- Add profile button -->
|
<!-- Add profile button -->
|
||||||
<Button Click="AddProfileButton_Click" ToolTipService.ToolTip="Save current settings as new profile">
|
<Button Click="AddProfileButton_Click" ToolTipService.ToolTip="Save current settings as new profile">
|
||||||
<StackPanel Orientation="Horizontal" Spacing="6">
|
<StackPanel Orientation="Horizontal" Spacing="6">
|
||||||
<FontIcon FontSize="14" Glyph="" />
|
<FontIcon FontSize="14" Glyph="" />
|
||||||
<TextBlock x:Uid="PowerDisplay_AddProfile_Text" />
|
<TextBlock x:Uid="PowerDisplay_AddProfile_Text" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</Button>
|
</Button>
|
||||||
|
</tkcontrols:SettingsExpander>
|
||||||
<!-- Help text -->
|
|
||||||
<TextBlock
|
|
||||||
x:Uid="PowerDisplay_ProfilesHelpText"
|
|
||||||
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
|
|
||||||
Style="{StaticResource CaptionTextBlockStyle}"
|
|
||||||
TextWrapping="Wrap" />
|
|
||||||
</StackPanel>
|
|
||||||
</tkcontrols:SettingsCard>
|
|
||||||
</controls:SettingsGroup>
|
</controls:SettingsGroup>
|
||||||
|
|
||||||
<controls:SettingsGroup x:Uid="PowerDisplay_Monitors" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
|
<controls:SettingsGroup x:Uid="PowerDisplay_Monitors" IsEnabled="{x:Bind ViewModel.IsEnabled, Mode=OneWay}">
|
||||||
@@ -126,8 +114,10 @@
|
|||||||
Margin="0,0,0,2"
|
Margin="0,0,0,2"
|
||||||
Description="{x:Bind InternalName, Mode=OneWay}"
|
Description="{x:Bind InternalName, Mode=OneWay}"
|
||||||
Header="{x:Bind Name}"
|
Header="{x:Bind Name}"
|
||||||
HeaderIcon="{ui:FontIcon Glyph=}"
|
|
||||||
IsExpanded="False">
|
IsExpanded="False">
|
||||||
|
<tkcontrols:SettingsExpander.HeaderIcon>
|
||||||
|
<FontIcon Glyph="{x:Bind MonitorIconGlyph, Mode=OneWay}" />
|
||||||
|
</tkcontrols:SettingsExpander.HeaderIcon>
|
||||||
<TextBlock Text="{x:Bind CommunicationMethod, Mode=OneWay}" />
|
<TextBlock Text="{x:Bind CommunicationMethod, Mode=OneWay}" />
|
||||||
<tkcontrols:SettingsExpander.ItemsHeader>
|
<tkcontrols:SettingsExpander.ItemsHeader>
|
||||||
<!-- Capabilities warning -->
|
<!-- Capabilities warning -->
|
||||||
@@ -203,14 +193,12 @@
|
|||||||
<RowDefinition Height="Auto" />
|
<RowDefinition Height="Auto" />
|
||||||
<RowDefinition Height="*" />
|
<RowDefinition Height="*" />
|
||||||
</Grid.RowDefinitions>
|
</Grid.RowDefinitions>
|
||||||
|
|
||||||
<!-- Header with Copy Button -->
|
<!-- Header with Copy Button -->
|
||||||
<Grid Grid.Row="0" Margin="0,0,0,12">
|
<Grid Margin="0,0,0,12">
|
||||||
<Grid.ColumnDefinitions>
|
<Grid.ColumnDefinitions>
|
||||||
<ColumnDefinition Width="*" />
|
<ColumnDefinition Width="*" />
|
||||||
<ColumnDefinition Width="Auto" />
|
<ColumnDefinition Width="Auto" />
|
||||||
</Grid.ColumnDefinitions>
|
</Grid.ColumnDefinitions>
|
||||||
|
|
||||||
<TextBlock
|
<TextBlock
|
||||||
Grid.Column="0"
|
Grid.Column="0"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
|
|||||||
@@ -4,18 +4,27 @@
|
|||||||
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
|
||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
|
||||||
|
xmlns:tkcontrols="using:CommunityToolkit.WinUI.Controls"
|
||||||
xmlns:ui="using:CommunityToolkit.WinUI"
|
xmlns:ui="using:CommunityToolkit.WinUI"
|
||||||
xmlns:viewmodels="using:Microsoft.PowerToys.Settings.UI.ViewModels"
|
xmlns:viewmodels="using:Microsoft.PowerToys.Settings.UI.ViewModels"
|
||||||
Title="Edit Profile"
|
Title="Edit Profile"
|
||||||
|
Width="486"
|
||||||
|
MinWidth="486"
|
||||||
CloseButtonClick="ContentDialog_CloseButtonClick"
|
CloseButtonClick="ContentDialog_CloseButtonClick"
|
||||||
CloseButtonText="Cancel"
|
CloseButtonText="Cancel"
|
||||||
DefaultButton="Primary"
|
DefaultButton="Primary"
|
||||||
IsPrimaryButtonEnabled="{x:Bind ViewModel.CanSave, Mode=OneWay}"
|
IsPrimaryButtonEnabled="{x:Bind ViewModel.CanSave, Mode=OneWay}"
|
||||||
PrimaryButtonClick="ContentDialog_PrimaryButtonClick"
|
PrimaryButtonClick="ContentDialog_PrimaryButtonClick"
|
||||||
PrimaryButtonText="Save"
|
PrimaryButtonText="Save"
|
||||||
|
Style="{StaticResource DefaultContentDialogStyle}"
|
||||||
mc:Ignorable="d">
|
mc:Ignorable="d">
|
||||||
|
|
||||||
<Grid>
|
<Grid MinWidth="486">
|
||||||
|
<Grid.Resources>
|
||||||
|
<x:Double x:Key="SettingsCardWrapThreshold">0</x:Double>
|
||||||
|
<x:Double x:Key="SettingsCardWrapNoIconThreshold">0</x:Double>
|
||||||
|
<Thickness x:Key="SettingsExpanderItemPadding">0,8,0,8</Thickness>
|
||||||
|
</Grid.Resources>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition Height="Auto" />
|
<RowDefinition Height="Auto" />
|
||||||
<RowDefinition Height="*" />
|
<RowDefinition Height="*" />
|
||||||
@@ -29,264 +38,92 @@
|
|||||||
Text="{x:Bind ViewModel.ProfileName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
|
Text="{x:Bind ViewModel.ProfileName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
|
||||||
|
|
||||||
<!-- Monitors List -->
|
<!-- Monitors List -->
|
||||||
<ScrollViewer
|
<ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Auto">
|
||||||
Grid.Row="1"
|
|
||||||
Padding="0,0,16,0"
|
|
||||||
VerticalScrollBarVisibility="Auto">
|
|
||||||
<StackPanel Spacing="16">
|
<StackPanel Spacing="16">
|
||||||
<TextBlock Style="{StaticResource BodyStrongTextBlockStyle}" Text="Select Monitors" />
|
<TextBlock Style="{StaticResource BodyStrongTextBlockStyle}" Text="Select what monitors and settings to include for this profile" />
|
||||||
|
|
||||||
<ItemsControl ItemsSource="{x:Bind ViewModel.Monitors, Mode=OneWay}">
|
<ItemsControl ItemsSource="{x:Bind ViewModel.Monitors, Mode=OneWay}">
|
||||||
<ItemsControl.ItemTemplate>
|
<ItemsControl.ItemTemplate>
|
||||||
<DataTemplate x:DataType="viewmodels:MonitorSelectionItem">
|
<DataTemplate x:DataType="viewmodels:MonitorSelectionItem">
|
||||||
<Grid Margin="0,0,0,12">
|
<tkcontrols:SettingsExpander
|
||||||
<!-- Unselected State -->
|
Margin="0,0,0,8"
|
||||||
<Border
|
Header="{x:Bind Monitor.Name}"
|
||||||
Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
|
HeaderIcon="{x:Bind Monitor.MonitorIconGlyph}">
|
||||||
BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
|
<ToggleSwitch IsOn="{x:Bind IsSelected, Mode=TwoWay}" />
|
||||||
BorderThickness="1"
|
<tkcontrols:SettingsExpander.Items>
|
||||||
CornerRadius="8"
|
<tkcontrols:SettingsCard Padding="16,8,16,8" Visibility="{x:Bind Monitor.SupportsBrightness, Converter={StaticResource BoolToVisibilityConverter}}">
|
||||||
Visibility="{x:Bind IsSelected, Mode=OneWay, Converter={StaticResource ReverseBoolToVisibilityConverter}}">
|
<tkcontrols:SettingsCard.Header>
|
||||||
<Grid Padding="16,12">
|
<CheckBox IsChecked="{x:Bind IncludeBrightness, Mode=TwoWay}">
|
||||||
<Grid.ColumnDefinitions>
|
<StackPanel Orientation="Horizontal" Spacing="8">
|
||||||
<ColumnDefinition Width="Auto" />
|
<FontIcon FontSize="16" Glyph="" />
|
||||||
<ColumnDefinition Width="*" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
<CheckBox
|
|
||||||
Margin="0,0,12,0"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
IsChecked="{x:Bind IsSelected, Mode=TwoWay}" />
|
|
||||||
<StackPanel Grid.Column="1" VerticalAlignment="Center">
|
|
||||||
<TextBlock
|
|
||||||
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
|
|
||||||
Style="{StaticResource BodyStrongTextBlockStyle}"
|
|
||||||
Text="{x:Bind Monitor.Name}" />
|
|
||||||
<TextBlock
|
|
||||||
Foreground="{ThemeResource TextFillColorTertiaryBrush}"
|
|
||||||
Style="{StaticResource CaptionTextBlockStyle}"
|
|
||||||
Text="{x:Bind Monitor.InternalName}" />
|
|
||||||
</StackPanel>
|
|
||||||
</Grid>
|
|
||||||
</Border>
|
|
||||||
|
|
||||||
<!-- Selected State -->
|
|
||||||
<Border
|
|
||||||
Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
|
|
||||||
BorderBrush="{ThemeResource AccentControlElevationBorderBrush}"
|
|
||||||
BorderThickness="1"
|
|
||||||
CornerRadius="8"
|
|
||||||
Visibility="{x:Bind IsSelected, Mode=OneWay, Converter={StaticResource BoolToVisibilityConverter}}">
|
|
||||||
<StackPanel>
|
|
||||||
<!-- Header: Monitor Selection -->
|
|
||||||
<Grid Padding="16,12">
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="Auto" />
|
|
||||||
<ColumnDefinition Width="*" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
<CheckBox
|
|
||||||
Margin="0,0,12,0"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
IsChecked="{x:Bind IsSelected, Mode=TwoWay}" />
|
|
||||||
<StackPanel Grid.Column="1" VerticalAlignment="Center">
|
|
||||||
<TextBlock Style="{StaticResource BodyStrongTextBlockStyle}" Text="{x:Bind Monitor.Name}" />
|
|
||||||
<TextBlock
|
|
||||||
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
|
|
||||||
Style="{StaticResource CaptionTextBlockStyle}"
|
|
||||||
Text="{x:Bind Monitor.InternalName}" />
|
|
||||||
</StackPanel>
|
|
||||||
</Grid>
|
|
||||||
|
|
||||||
<!-- Content: Settings -->
|
|
||||||
<StackPanel Padding="20,0,20,20" Spacing="0">
|
|
||||||
|
|
||||||
<MenuFlyoutSeparator Margin="-20,0,-20,16" />
|
|
||||||
|
|
||||||
<!-- Brightness Row -->
|
|
||||||
<Grid Margin="0,0,0,12" Visibility="{x:Bind Monitor.SupportsBrightness, Converter={StaticResource BoolToVisibilityConverter}}">
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="140" />
|
|
||||||
<ColumnDefinition Width="*" />
|
|
||||||
<ColumnDefinition Width="40" />
|
|
||||||
<ColumnDefinition Width="50" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
|
|
||||||
<StackPanel
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
Orientation="Horizontal"
|
|
||||||
Spacing="12">
|
|
||||||
<FontIcon
|
|
||||||
FontSize="16"
|
|
||||||
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
|
|
||||||
Glyph="" />
|
|
||||||
<TextBlock VerticalAlignment="Center" Text="Brightness" />
|
<TextBlock VerticalAlignment="Center" Text="Brightness" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
</CheckBox>
|
||||||
|
</tkcontrols:SettingsCard.Header>
|
||||||
|
<Slider
|
||||||
|
MinWidth="{StaticResource SettingActionControlMinWidth}"
|
||||||
|
VerticalAlignment="Center"
|
||||||
|
Maximum="100"
|
||||||
|
Minimum="0"
|
||||||
|
Value="{x:Bind Brightness, Mode=TwoWay}" />
|
||||||
|
<tkcontrols:SettingsCard.Resources>
|
||||||
|
<x:Double x:Key="SettingsCardLeftIndention">0</x:Double>
|
||||||
|
</tkcontrols:SettingsCard.Resources>
|
||||||
|
</tkcontrols:SettingsCard>
|
||||||
|
|
||||||
<Slider
|
<tkcontrols:SettingsCard Padding="16,8,16,8" Visibility="{x:Bind Monitor.SupportsContrast, Converter={StaticResource BoolToVisibilityConverter}}">
|
||||||
Grid.Column="1"
|
<tkcontrols:SettingsCard.Header>
|
||||||
Margin="12,0,12,0"
|
<CheckBox IsChecked="{x:Bind IncludeContrast, Mode=TwoWay}">
|
||||||
VerticalAlignment="Center"
|
<StackPanel Orientation="Horizontal" Spacing="8">
|
||||||
Maximum="100"
|
<FontIcon FontSize="16" Glyph="" />
|
||||||
Minimum="0"
|
|
||||||
Value="{x:Bind Brightness, Mode=TwoWay}" />
|
|
||||||
|
|
||||||
<TextBlock
|
|
||||||
Grid.Column="2"
|
|
||||||
Margin="0,0,8,0"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
Text="{x:Bind Brightness, Mode=OneWay}"
|
|
||||||
TextAlignment="Right" />
|
|
||||||
|
|
||||||
<ToggleSwitch
|
|
||||||
Grid.Column="3"
|
|
||||||
MinWidth="0"
|
|
||||||
HorizontalAlignment="Right"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
IsOn="{x:Bind IncludeBrightness, Mode=TwoWay}"
|
|
||||||
OffContent=""
|
|
||||||
OnContent="" />
|
|
||||||
</Grid>
|
|
||||||
|
|
||||||
<!-- Contrast Row -->
|
|
||||||
<Grid Margin="0,0,0,12" Visibility="{x:Bind Monitor.SupportsContrast, Converter={StaticResource BoolToVisibilityConverter}}">
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="140" />
|
|
||||||
<ColumnDefinition Width="*" />
|
|
||||||
<ColumnDefinition Width="40" />
|
|
||||||
<ColumnDefinition Width="50" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
|
|
||||||
<StackPanel
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
Orientation="Horizontal"
|
|
||||||
Spacing="12">
|
|
||||||
<FontIcon
|
|
||||||
FontSize="16"
|
|
||||||
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
|
|
||||||
Glyph="" />
|
|
||||||
<TextBlock VerticalAlignment="Center" Text="Contrast" />
|
<TextBlock VerticalAlignment="Center" Text="Contrast" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
</CheckBox>
|
||||||
<Slider
|
</tkcontrols:SettingsCard.Header>
|
||||||
Grid.Column="1"
|
<Slider
|
||||||
Margin="12,0,12,0"
|
MinWidth="{StaticResource SettingActionControlMinWidth}"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Maximum="100"
|
Maximum="100"
|
||||||
Minimum="0"
|
Minimum="0"
|
||||||
Value="{x:Bind Contrast, Mode=TwoWay}" />
|
Value="{x:Bind Contrast, Mode=TwoWay}" />
|
||||||
|
</tkcontrols:SettingsCard>
|
||||||
<TextBlock
|
<tkcontrols:SettingsCard Padding="16,8,16,8" Visibility="{x:Bind Monitor.SupportsVolume, Converter={StaticResource BoolToVisibilityConverter}}">
|
||||||
Grid.Column="2"
|
<tkcontrols:SettingsCard.Header>
|
||||||
Margin="0,0,8,0"
|
<CheckBox IsChecked="{x:Bind IncludeVolume, Mode=TwoWay}">
|
||||||
VerticalAlignment="Center"
|
<StackPanel Orientation="Horizontal" Spacing="8">
|
||||||
Text="{x:Bind Contrast, Mode=OneWay}"
|
<FontIcon FontSize="16" Glyph="" />
|
||||||
TextAlignment="Right" />
|
|
||||||
|
|
||||||
<ToggleSwitch
|
|
||||||
Grid.Column="3"
|
|
||||||
MinWidth="0"
|
|
||||||
HorizontalAlignment="Right"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
IsOn="{x:Bind IncludeContrast, Mode=TwoWay}"
|
|
||||||
OffContent=""
|
|
||||||
OnContent="" />
|
|
||||||
</Grid>
|
|
||||||
|
|
||||||
<!-- Volume Row -->
|
|
||||||
<Grid Margin="0,0,0,12" Visibility="{x:Bind Monitor.SupportsVolume, Converter={StaticResource BoolToVisibilityConverter}}">
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="140" />
|
|
||||||
<ColumnDefinition Width="*" />
|
|
||||||
<ColumnDefinition Width="40" />
|
|
||||||
<ColumnDefinition Width="50" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
|
|
||||||
<StackPanel
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
Orientation="Horizontal"
|
|
||||||
Spacing="12">
|
|
||||||
<FontIcon
|
|
||||||
FontSize="16"
|
|
||||||
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
|
|
||||||
Glyph="" />
|
|
||||||
<TextBlock VerticalAlignment="Center" Text="Volume" />
|
<TextBlock VerticalAlignment="Center" Text="Volume" />
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
</CheckBox>
|
||||||
<Slider
|
</tkcontrols:SettingsCard.Header>
|
||||||
Grid.Column="1"
|
<Slider
|
||||||
Margin="12,0,12,0"
|
MinWidth="{StaticResource SettingActionControlMinWidth}"
|
||||||
VerticalAlignment="Center"
|
VerticalAlignment="Center"
|
||||||
Maximum="100"
|
Maximum="100"
|
||||||
Minimum="0"
|
Minimum="0" />
|
||||||
Value="{x:Bind Volume, Mode=TwoWay}" />
|
</tkcontrols:SettingsCard>
|
||||||
|
<tkcontrols:SettingsCard Padding="16,8,16,8" Visibility="{x:Bind Monitor.SupportsColorTemperature, Converter={StaticResource BoolToVisibilityConverter}}">
|
||||||
<TextBlock
|
<tkcontrols:SettingsCard.Header>
|
||||||
Grid.Column="2"
|
<CheckBox IsChecked="{x:Bind IncludeColorTemperature, Mode=TwoWay}">
|
||||||
Margin="0,0,8,0"
|
<StackPanel Orientation="Horizontal" Spacing="8">
|
||||||
VerticalAlignment="Center"
|
<FontIcon FontSize="16" Glyph="" />
|
||||||
Text="{x:Bind Volume, Mode=OneWay}"
|
<TextBlock VerticalAlignment="Center" Text="Color temperature" />
|
||||||
TextAlignment="Right" />
|
|
||||||
|
|
||||||
<ToggleSwitch
|
|
||||||
Grid.Column="3"
|
|
||||||
MinWidth="0"
|
|
||||||
HorizontalAlignment="Right"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
IsOn="{x:Bind IncludeVolume, Mode=TwoWay}"
|
|
||||||
OffContent=""
|
|
||||||
OnContent="" />
|
|
||||||
</Grid>
|
|
||||||
|
|
||||||
<!-- Color Temperature Row -->
|
|
||||||
<Grid Margin="0,0,0,0" Visibility="{x:Bind Monitor.SupportsColorTemperature, Converter={StaticResource BoolToVisibilityConverter}}">
|
|
||||||
<Grid.ColumnDefinitions>
|
|
||||||
<ColumnDefinition Width="140" />
|
|
||||||
<ColumnDefinition Width="*" />
|
|
||||||
<ColumnDefinition Width="40" />
|
|
||||||
<ColumnDefinition Width="50" />
|
|
||||||
</Grid.ColumnDefinitions>
|
|
||||||
|
|
||||||
<StackPanel
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
Orientation="Horizontal"
|
|
||||||
Spacing="12">
|
|
||||||
<FontIcon
|
|
||||||
FontSize="16"
|
|
||||||
Foreground="{ThemeResource TextFillColorSecondaryBrush}"
|
|
||||||
Glyph="" />
|
|
||||||
<TextBlock VerticalAlignment="Center" Text="Color Temp" />
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
|
</CheckBox>
|
||||||
<ComboBox
|
</tkcontrols:SettingsCard.Header>
|
||||||
Grid.Column="1"
|
<ComboBox
|
||||||
MinWidth="160"
|
MinWidth="{StaticResource SettingActionControlMinWidth}"
|
||||||
Margin="12,0,12,0"
|
VerticalAlignment="Center"
|
||||||
HorizontalAlignment="Stretch"
|
DisplayMemberPath="DisplayName"
|
||||||
VerticalAlignment="Center"
|
ItemsSource="{x:Bind Monitor.ColorPresetsForDisplay, Mode=OneWay}"
|
||||||
DisplayMemberPath="DisplayName"
|
PlaceholderText="Select.."
|
||||||
ItemsSource="{x:Bind Monitor.ColorPresetsForDisplay, Mode=OneWay}"
|
SelectedValue="{x:Bind ColorTemperature, Mode=TwoWay}"
|
||||||
PlaceholderText="Select..."
|
SelectedValuePath="VcpValue" />
|
||||||
SelectedValue="{x:Bind ColorTemperature, Mode=TwoWay}"
|
</tkcontrols:SettingsCard>
|
||||||
SelectedValuePath="VcpValue" />
|
</tkcontrols:SettingsExpander.Items>
|
||||||
|
</tkcontrols:SettingsExpander>
|
||||||
<!-- Spacer to match layout -->
|
|
||||||
<Grid Grid.Column="2" />
|
|
||||||
|
|
||||||
<ToggleSwitch
|
|
||||||
Grid.Column="3"
|
|
||||||
MinWidth="0"
|
|
||||||
HorizontalAlignment="Right"
|
|
||||||
VerticalAlignment="Center"
|
|
||||||
IsOn="{x:Bind IncludeColorTemperature, Mode=TwoWay}"
|
|
||||||
OffContent=""
|
|
||||||
OnContent="" />
|
|
||||||
</Grid>
|
|
||||||
|
|
||||||
</StackPanel>
|
|
||||||
</StackPanel>
|
|
||||||
</Border>
|
|
||||||
</Grid>
|
|
||||||
</DataTemplate>
|
</DataTemplate>
|
||||||
</ItemsControl.ItemTemplate>
|
</ItemsControl.ItemTemplate>
|
||||||
|
|
||||||
</ItemsControl>
|
</ItemsControl>
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</ScrollViewer>
|
</ScrollViewer>
|
||||||
|
|||||||
@@ -5599,7 +5599,7 @@ To record a specific window, enter the hotkey with the Alt key in the opposite m
|
|||||||
<value>Click a profile button to quickly apply saved monitor settings</value>
|
<value>Click a profile button to quickly apply saved monitor settings</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="PowerDisplay_AddProfile_Text.Text" xml:space="preserve">
|
<data name="PowerDisplay_AddProfile_Text.Text" xml:space="preserve">
|
||||||
<value>Add Profile</value>
|
<value>Add profile</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="PowerDisplay_ProfilesHelpText.Text" xml:space="preserve">
|
<data name="PowerDisplay_ProfilesHelpText.Text" xml:space="preserve">
|
||||||
<value>Right-click a profile to rename or delete it</value>
|
<value>Right-click a profile to rename or delete it</value>
|
||||||
|
|||||||
Reference in New Issue
Block a user