Skip to content

armgit / Filee

Public Imported from GitHub
0

Free, open-source file converter. Convert 263 formats offline by drag & drop — images, PDF, Word, Excel, PowerPoint, HWP/HWPX, video, audio, e-books and archives. No upload, no Office needed.

Merge branch 'main' of https://github.com/KnifeLemon/Filee into fix/524-a11y-labels

cre8ive-marketing6386bdec7a8e
diff --cc src/Filee.App/Views/Pages/EnginesPage.axaml
index f9aab756,6121feba..e9b72449
--- a/src/Filee.App/Views/Pages/EnginesPage.axaml
+++ b/src/Filee.App/Views/Pages/EnginesPage.axaml
@@@ -46,45 -105,42 +105,42 @@@
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
- <DataTemplate x:DataType="svc:EnginePackageState">
- <Border Classes="card" Padding="16,12">
- <DockPanel>
- <StackPanel DockPanel.Dock="Right" Orientation="Horizontal" Spacing="6" VerticalAlignment="Center" Margin="12,0,0,0">
- <Button IsVisible="{Binding HasSettings}" Click="OnPackageSettings" ToolTip.Tip="{DynamicResource engines.lo_title}">
- <StackPanel Orientation="Horizontal" Spacing="6">
- <PathIcon Width="13" Height="13" Data="{StaticResource Icon.Settings}" />
- <TextBlock Text="{DynamicResource engines.settings}" />
- </StackPanel>
- </Button>
- <Button Classes="accent" Content="{DynamicResource engines.install}" IsVisible="{Binding CanInstall}"
- Command="{Binding $parent[ItemsControl].((vm:EnginesPageViewModel)DataContext).InstallCommand}" CommandParameter="{Binding}" />
- <Button Classes="accent" Content="{DynamicResource engines.update}" IsVisible="{Binding CanUpdate}"
- Command="{Binding $parent[ItemsControl].((vm:EnginesPageViewModel)DataContext).InstallCommand}" CommandParameter="{Binding}" />
- <Button Content="{DynamicResource engines.cancel}" IsVisible="{Binding IsBusy}"
- Command="{Binding $parent[ItemsControl].((vm:EnginesPageViewModel)DataContext).CancelCommand}" CommandParameter="{Binding}" />
- <Button Content="{DynamicResource engines.use_own}" IsVisible="{Binding CanUseOwnCopy}" Click="OnUseOwnCopy"
- ToolTip.Tip="{DynamicResource engines.use_own_hint}" />
- <Button Content="{DynamicResource engines.stop_own}" IsVisible="{Binding UsesOwnCopy}" Click="OnStopOwnCopy" />
- <Button Content="{DynamicResource engines.remove}" IsVisible="{Binding CanRemove}" Click="OnRemove" />
- </StackPanel>
- <StackPanel Spacing="4">
- <StackPanel Orientation="Horizontal" Spacing="10">
- <TextBlock FontWeight="SemiBold" Text="{Binding Name}" />
- <Border Classes="badge">
- <TextBlock Classes="caption" Text="{Binding StatusText}" />
- </Border>
+ <DataTemplate x:DataType="vm:EngineItemViewModel">
+ <Border Classes="card engine" Classes.dragging="{Binding IsDragging}" Padding="16,12" Cursor="SizeNorthSouth"
+ PointerPressed="OnEnginePressed">
+ <StackPanel Spacing="10">
+ <DockPanel>
+ <StackPanel DockPanel.Dock="Right" Orientation="Horizontal" Spacing="4">
- <Button Classes="icon" ToolTip.Tip="{DynamicResource engines.move_up}"
++ <Button Classes="icon" ToolTip.Tip="{DynamicResource engines.move_up}" AutomationProperties.Name="{DynamicResource engines.move_up}"
+ Command="{Binding $parent[ItemsControl].((vm:EnginesPageViewModel)DataContext).MoveUpCommand}" CommandParameter="{Binding}">
+ <PathIcon Width="14" Height="14" Data="{StaticResource Icon.ArrowUp}" />
+ </Button>
- <Button Classes="icon" ToolTip.Tip="{DynamicResource engines.move_down}"
++ <Button Classes="icon" ToolTip.Tip="{DynamicResource engines.move_down}" AutomationProperties.Name="{DynamicResource engines.move_down}"
+ Command="{Binding $parent[ItemsControl].((vm:EnginesPageViewModel)DataContext).MoveDownCommand}" CommandParameter="{Binding}">
+ <PathIcon Width="14" Height="14" Data="{StaticResource Icon.ArrowDown}" />
+ </Button>
+ </StackPanel>
+ <PathIcon DockPanel.Dock="Left" Width="16" Height="16" Margin="0,0,8,0" Opacity="0.4" VerticalAlignment="Center"
+ Data="{StaticResource Icon.DragVertical}" />
+ <Border DockPanel.Dock="Left" Width="10" Height="10" CornerRadius="999" Margin="2,0,12,0" VerticalAlignment="Center"
+ Background="{DynamicResource SuccessBrush}" IsVisible="{Binding IsAvailable}" />
+ <Border DockPanel.Dock="Left" Width="10" Height="10" CornerRadius="999" Margin="2,0,12,0" VerticalAlignment="Center"
+ Background="{DynamicResource TextSecondaryBrush}" IsVisible="{Binding !IsAvailable}" />
+ <StackPanel Spacing="3" ToolTip.Tip="{Binding Detail}">
+ <WrapPanel Orientation="Horizontal">
+ <TextBlock FontWeight="SemiBold" Text="{Binding Name}" Margin="0,0,10,0" VerticalAlignment="Center" />
+ <Border Classes="badge" Margin="0,0,8,0">
+ <TextBlock Classes="caption" Text="{Binding StatusText}" />
+ </Border>
+ <TextBlock Classes="caption" VerticalAlignment="Center" Margin="0,0,8,0" Text="{Binding Version}"
+ IsVisible="{Binding Version, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" />
+ <TextBlock Classes="caption" VerticalAlignment="Center" Text="{Binding Conversions}" />
+ </WrapPanel>
+ <TextBlock Classes="caption" TextWrapping="Wrap" Text="{Binding Description}"
+ IsVisible="{Binding Description, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" />
</StackPanel>
- <TextBlock Classes="caption" TextWrapping="Wrap" Text="{Binding Description}" />
- <TextBlock Classes="caption" Text="{Binding Sizes}" IsVisible="{Binding !UsesOwnCopy}" />
- <TextBlock Classes="caption" TextWrapping="Wrap" Text="{Binding InstallGuidance}"
- IsVisible="{Binding InstallGuidance, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" />
- <TextBlock Classes="caption" Text="{Binding OwnCopyFolder}" IsVisible="{Binding ShowsCopyFolder}" TextTrimming="CharacterEllipsis" />
- <TextBlock Classes="caption" Foreground="{DynamicResource WarningBrush}" TextWrapping="Wrap" Text="{Binding UpdateNote}"
- IsVisible="{Binding UpdateNote, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" />
- <ProgressBar Classes="soft" Maximum="100" Value="{Binding Progress}" IsVisible="{Binding IsBusy}" Margin="0,4,0,0" />
- <TextBlock Classes="caption" Text="{Binding ProgressDetail}" IsVisible="{Binding ProgressDetail, Converter={x:Static StringConverters.IsNotNullOrEmpty}}" />
- </StackPanel>
- </DockPanel>
+ </DockPanel>
+ </StackPanel>
</Border>
</DataTemplate>
</ItemsControl.ItemTemplate>
diff --cc src/Filee.App/Views/Pages/ThemePage.axaml
index 1e63e852,cfb2df56..d26ac5bb
--- a/src/Filee.App/Views/Pages/ThemePage.axaml
+++ b/src/Filee.App/Views/Pages/ThemePage.axaml
@@@ -82,235 -82,236 +82,236 @@@
</Style>
</UserControl.Styles>
- <Grid ColumnDefinitions="*,20,340" RowDefinitions="Auto,*">
- <TextBlock Grid.ColumnSpan="3" Classes="h1" Text="{DynamicResource theme.title}" Margin="0,0,0,18" />
+ <ScrollViewer x:Name="EditorScroller" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Disabled">
+ <Grid ColumnDefinitions="*,20,340" RowDefinitions="Auto,*" MinWidth="700" Width="{Binding #EditorScroller.Viewport.Width}" HorizontalAlignment="Left">
+ <TextBlock Grid.ColumnSpan="3" Classes="h1" Text="{DynamicResource theme.title}" Margin="0,0,0,18" />
- <StackPanel Grid.Row="1" Spacing="16">
- <!-- Theme Style: Filee Soft vs Material You -->
- <Border Classes="card">
- <StackPanel Spacing="12">
- <DockPanel>
- <Border DockPanel.Dock="Right" CornerRadius="{DynamicResource SoftRadiusPill}" Background="{DynamicResource AccentSoftBrush}" Padding="8,2"
- IsVisible="{Binding IsMaterialYou}">
- <TextBlock Text="{DynamicResource theme.style.m3_badge}" FontSize="11" FontWeight="SemiBold" Foreground="{DynamicResource AccentStrongBrush}" />
- </Border>
- <TextBlock Classes="label" Text="{DynamicResource theme.style}" VerticalAlignment="Center" Margin="0" />
- </DockPanel>
+ <StackPanel Grid.Row="1" Spacing="16">
+ <!-- Theme Style: Filee Soft vs Material You -->
+ <Border Classes="card">
+ <StackPanel Spacing="12">
+ <DockPanel>
+ <Border DockPanel.Dock="Right" CornerRadius="{DynamicResource SoftRadiusPill}" Background="{DynamicResource AccentSoftBrush}" Padding="8,2"
+ IsVisible="{Binding IsMaterialYou}">
+ <TextBlock Text="{DynamicResource theme.style.m3_badge}" FontSize="11" FontWeight="SemiBold" Foreground="{DynamicResource AccentStrongBrush}" />
+ </Border>
+ <TextBlock Classes="label" Text="{DynamicResource theme.style}" VerticalAlignment="Center" Margin="0" />
+ </DockPanel>
- <Grid ColumnDefinitions="*,12,*" RowDefinitions="Auto">
- <Button Classes="choice-card"
- Classes.selected="{Binding !IsMaterialYou}"
- Command="{Binding SetStyleCommand}"
- CommandParameter="{x:Static settings:ThemeStyle.Soft}"
- HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch"
- VerticalAlignment="Stretch" VerticalContentAlignment="Stretch">
- <StackPanel Spacing="6" VerticalAlignment="Top">
- <TextBlock Classes="choice-title" Text="{DynamicResource theme.style.Soft}" />
- <TextBlock Classes="choice-desc" Text="{DynamicResource theme.style.soft_hint}" TextWrapping="Wrap" />
- </StackPanel>
- </Button>
-
- <Button Grid.Column="2"
- Classes="choice-card"
- Classes.selected="{Binding IsMaterialYou}"
- Command="{Binding SetStyleCommand}"
- CommandParameter="{x:Static settings:ThemeStyle.MaterialYou}"
- HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch"
- VerticalAlignment="Stretch" VerticalContentAlignment="Stretch">
- <StackPanel Spacing="6" VerticalAlignment="Top">
- <StackPanel Orientation="Horizontal" Spacing="6" VerticalAlignment="Center">
- <TextBlock Classes="choice-title" Text="{DynamicResource theme.style.MaterialYou}" />
- <Border CornerRadius="{DynamicResource SoftRadiusPill}" Background="{DynamicResource AccentBrush}" Padding="6,1">
- <TextBlock Text="{DynamicResource theme.style.m3_tag}" FontSize="10" FontWeight="Bold" Foreground="{DynamicResource OnAccentBrush}" />
- </Border>
+ <Grid ColumnDefinitions="*,12,*" RowDefinitions="Auto">
+ <Button Classes="choice-card"
+ Classes.selected="{Binding !IsMaterialYou}"
+ Command="{Binding SetStyleCommand}"
+ CommandParameter="{x:Static settings:ThemeStyle.Soft}"
+ HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch"
+ VerticalAlignment="Stretch" VerticalContentAlignment="Stretch">
+ <StackPanel Spacing="6" VerticalAlignment="Top">
+ <TextBlock Classes="choice-title" Text="{DynamicResource theme.style.Soft}" />
+ <TextBlock Classes="choice-desc" Text="{DynamicResource theme.style.soft_hint}" TextWrapping="Wrap" />
</StackPanel>
- <TextBlock Classes="choice-desc" Text="{DynamicResource theme.style.material_you_hint}" TextWrapping="Wrap" />
- </StackPanel>
- </Button>
- </Grid>
- </StackPanel>
- </Border>
-
- <!-- Appearance Mode: System / Light / Dark -->
- <Border Classes="card">
- <StackPanel Spacing="8">
- <TextBlock Classes="label" Text="{DynamicResource theme.mode}" />
- <ComboBox ItemsSource="{Binding Modes}" SelectedItem="{Binding Mode}" MinWidth="220" AutomationProperties.Name="{DynamicResource theme.mode}" />
- </StackPanel>
- </Border>
-
- <!-- Accent Colour & Curated Presets -->
- <Border Classes="card">
- <StackPanel Spacing="12">
- <TextBlock Classes="label" Text="{DynamicResource theme.accent}" />
+ </Button>
- <!-- Vibrant / Classic Swatches -->
- <TextBlock Classes="caption" Text="{DynamicResource theme.presets_vibrant}" FontWeight="SemiBold" Margin="0,2,0,0" />
- <ListBox x:Name="AccentSwatches" ItemsSource="{Binding Swatches}" SelectedItem="{Binding Accent, Mode=TwoWay}"
- Background="Transparent" BorderThickness="0" Padding="0"
- AutomationProperties.Name="{DynamicResource theme.accent}">
- <ListBox.Styles>
- <Style Selector="ListBoxItem">
- <Setter Property="Padding" Value="4" />
- <Setter Property="Margin" Value="0,0,4,4" />
- <Setter Property="Template">
- <ControlTemplate>
- <Border x:Name="SelectionRing" CornerRadius="999" BorderThickness="2" BorderBrush="Transparent" Padding="3">
- <ContentPresenter Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
+ <Button Grid.Column="2"
+ Classes="choice-card"
+ Classes.selected="{Binding IsMaterialYou}"
+ Command="{Binding SetStyleCommand}"
+ CommandParameter="{x:Static settings:ThemeStyle.MaterialYou}"
+ HorizontalAlignment="Stretch" HorizontalContentAlignment="Stretch"
+ VerticalAlignment="Stretch" VerticalContentAlignment="Stretch">
+ <StackPanel Spacing="6" VerticalAlignment="Top">
+ <StackPanel Orientation="Horizontal" Spacing="6" VerticalAlignment="Center">
+ <TextBlock Classes="choice-title" Text="{DynamicResource theme.style.MaterialYou}" />
+ <Border CornerRadius="{DynamicResource SoftRadiusPill}" Background="{DynamicResource AccentBrush}" Padding="6,1">
+ <TextBlock Text="{DynamicResource theme.style.m3_tag}" FontSize="10" FontWeight="Bold" Foreground="{DynamicResource OnAccentBrush}" />
</Border>
- </ControlTemplate>
- </Setter>
- </Style>
- <Style Selector="ListBoxItem:selected /template/ Border#SelectionRing">
- <Setter Property="BorderBrush" Value="{DynamicResource TextPrimaryBrush}" />
- </Style>
- <Style Selector="ListBoxItem:focus-visible /template/ Border#SelectionRing">
- <Setter Property="BorderBrush" Value="{DynamicResource AccentBrush}" />
- </Style>
- </ListBox.Styles>
- <ListBox.ItemsPanel>
- <ItemsPanelTemplate>
- <WrapPanel />
- </ItemsPanelTemplate>
- </ListBox.ItemsPanel>
- <ListBox.ItemTemplate>
- <DataTemplate x:DataType="Color">
- <Border Width="34" Height="34" CornerRadius="999" ToolTip.Tip="{Binding}" AutomationProperties.Name="{Binding}">
- <Border.Background>
- <SolidColorBrush Color="{Binding}" />
- </Border.Background>
- <PathIcon Data="{StaticResource Icon.Check}" Width="16" Height="16"
- Foreground="{DynamicResource OnAccentBrush}"
- IsVisible="{Binding $parent[ListBoxItem].IsSelected}" />
- </Border>
- </DataTemplate>
- </ListBox.ItemTemplate>
- </ListBox>
+ </StackPanel>
+ <TextBlock Classes="choice-desc" Text="{DynamicResource theme.style.material_you_hint}" TextWrapping="Wrap" />
+ </StackPanel>
+ </Button>
+ </Grid>
+ </StackPanel>
+ </Border>
- <!-- Custom Colour Picker & Hex -->
- <StackPanel Orientation="Horizontal" Spacing="10" Margin="0,2,0,0">
- <TextBlock Classes="label" VerticalAlignment="Center" Text="{DynamicResource theme.custom_color}" Margin="0" />
- <ColorPicker x:Name="AccentPicker" Color="{Binding Accent, Mode=TwoWay}" IsAlphaEnabled="False"
- MinHeight="40" MinWidth="90"
- IsAlphaVisible="False" IsColorSpectrumVisible="True" IsColorPaletteVisible="False"
- IsColorComponentsVisible="False" IsColorModelVisible="False" IsColorPreviewVisible="True"
- FlowDirection="LeftToRight" AutomationProperties.Name="{DynamicResource theme.custom_color}" />
- <TextBox Text="{Binding AccentHex}" Width="120" PlaceholderText="#7F77DD" FlowDirection="LeftToRight"
- AutomationProperties.Name="{DynamicResource theme.custom_color}" />
+ <!-- Appearance Mode: System / Light / Dark -->
+ <Border Classes="card">
+ <StackPanel Spacing="8">
+ <TextBlock Classes="label" Text="{DynamicResource theme.mode}" />
- <ComboBox ItemsSource="{Binding Modes}" SelectedItem="{Binding Mode}" MinWidth="220" />
++ <ComboBox ItemsSource="{Binding Modes}" SelectedItem="{Binding Mode}" MinWidth="220" AutomationProperties.Name="{DynamicResource theme.mode}" />
</StackPanel>
+ </Border>
- <!-- Curated Pastel Presets -->
- <TextBlock Classes="caption" Text="{DynamicResource theme.presets_pastel}" FontWeight="SemiBold" Margin="0,4,0,0" />
- <ItemsControl ItemsSource="{Binding PastelPresets}">
- <ItemsControl.ItemsPanel>
- <ItemsPanelTemplate>
- <UniformGrid Columns="2" />
- </ItemsPanelTemplate>
- </ItemsControl.ItemsPanel>
- <ItemsControl.ItemTemplate>
- <DataTemplate x:DataType="vm:ThemePageViewModel+PresetItem">
- <Button Classes="preset-pill" Margin="0,0,6,6"
- Command="{Binding $parent[ItemsControl].((vm:ThemePageViewModel)DataContext).PickPresetCommand}"
- CommandParameter="{Binding}">
- <DockPanel>
- <Border DockPanel.Dock="Left" Width="18" Height="18" CornerRadius="999" Margin="0,0,8,0"
- BorderBrush="{DynamicResource SubtleBorderBrush}" BorderThickness="1">
- <Border.Background>
- <SolidColorBrush Color="{Binding Color}" />
- </Border.Background>
- </Border>
- <TextBlock Text="{Binding Name}" VerticalAlignment="Center" FontSize="12" FontWeight="Medium"
- TextTrimming="CharacterEllipsis" />
- </DockPanel>
- </Button>
- </DataTemplate>
- </ItemsControl.ItemTemplate>
- </ItemsControl>
- </StackPanel>
- </Border>
+ <!-- Accent Colour & Curated Presets -->
+ <Border Classes="card">
+ <StackPanel Spacing="12">
+ <TextBlock Classes="label" Text="{DynamicResource theme.accent}" />
- <!-- Softness / Corner Radius -->
- <Border Classes="card">
- <StackPanel Spacing="8">
- <DockPanel>
- <TextBlock DockPanel.Dock="Right" FontWeight="SemiBold" Text="{Binding CornerRadius, StringFormat={}{0:0}}" />
- <TextBlock Classes="label" Text="{DynamicResource theme.corner_radius}" />
- </DockPanel>
- <Slider Minimum="0" Maximum="28" Value="{Binding CornerRadius}" TickFrequency="1" IsSnapToTickEnabled="True" AutomationProperties.Name="{DynamicResource theme.corner_radius}" />
- </StackPanel>
- </Border>
+ <!-- Vibrant / Classic Swatches -->
+ <TextBlock Classes="caption" Text="{DynamicResource theme.presets_vibrant}" FontWeight="SemiBold" Margin="0,2,0,0" />
+ <ListBox x:Name="AccentSwatches" ItemsSource="{Binding Swatches}" SelectedItem="{Binding Accent, Mode=TwoWay}"
+ Background="Transparent" BorderThickness="0" Padding="0"
+ AutomationProperties.Name="{DynamicResource theme.accent}">
+ <ListBox.Styles>
+ <Style Selector="ListBoxItem">
+ <Setter Property="Padding" Value="4" />
+ <Setter Property="Margin" Value="0,0,4,4" />
+ <Setter Property="Template">
+ <ControlTemplate>
+ <Border x:Name="SelectionRing" CornerRadius="999" BorderThickness="2" BorderBrush="Transparent" Padding="3">
+ <ContentPresenter Content="{TemplateBinding Content}" ContentTemplate="{TemplateBinding ContentTemplate}" />
+ </Border>
+ </ControlTemplate>
+ </Setter>
+ </Style>
+ <Style Selector="ListBoxItem:selected /template/ Border#SelectionRing">
+ <Setter Property="BorderBrush" Value="{DynamicResource TextPrimaryBrush}" />
+ </Style>
+ <Style Selector="ListBoxItem:focus-visible /template/ Border#SelectionRing">
+ <Setter Property="BorderBrush" Value="{DynamicResource AccentBrush}" />
+ </Style>
+ </ListBox.Styles>
+ <ListBox.ItemsPanel>
+ <ItemsPanelTemplate>
+ <WrapPanel />
+ </ItemsPanelTemplate>
+ </ListBox.ItemsPanel>
+ <ListBox.ItemTemplate>
+ <DataTemplate x:DataType="Color">
+ <Border Width="34" Height="34" CornerRadius="999" ToolTip.Tip="{Binding}" AutomationProperties.Name="{Binding}">
+ <Border.Background>
+ <SolidColorBrush Color="{Binding}" />
+ </Border.Background>
+ <PathIcon Data="{StaticResource Icon.Check}" Width="16" Height="16"
+ Foreground="{DynamicResource OnAccentBrush}"
+ IsVisible="{Binding $parent[ListBoxItem].IsSelected}" />
+ </Border>
+ </DataTemplate>
+ </ListBox.ItemTemplate>
+ </ListBox>
- <!-- The donut toolbar's opacity: the same setting as Donut toolbar → Appearance → Opacity. -->
- <Border Classes="card">
- <StackPanel Spacing="8">
- <DockPanel>
- <TextBlock DockPanel.Dock="Right" FontWeight="SemiBold" Text="{Binding DonutOpacity, StringFormat={}{0:0}%}" />
- <TextBlock Classes="label" Text="{DynamicResource theme.donut_opacity}" />
- </DockPanel>
- <Slider x:Name="DonutOpacitySlider" Minimum="10" Maximum="100" Value="{Binding DonutOpacity}"
- TickFrequency="1" IsSnapToTickEnabled="True" AutomationProperties.Name="{DynamicResource theme.donut_opacity}" />
- </StackPanel>
- </Border>
+ <!-- Custom Colour Picker & Hex -->
+ <StackPanel Orientation="Horizontal" Spacing="10" Margin="0,2,0,0">
+ <TextBlock Classes="label" VerticalAlignment="Center" Text="{DynamicResource theme.custom_color}" Margin="0" />
+ <ColorPicker x:Name="AccentPicker" Color="{Binding Accent, Mode=TwoWay}" IsAlphaEnabled="False"
+ MinHeight="40" MinWidth="90"
+ IsAlphaVisible="False" IsColorSpectrumVisible="True" IsColorPaletteVisible="False"
+ IsColorComponentsVisible="False" IsColorModelVisible="False" IsColorPreviewVisible="True"
+ FlowDirection="LeftToRight" AutomationProperties.Name="{DynamicResource theme.custom_color}" />
+ <TextBox Text="{Binding AccentHex}" Width="120" PlaceholderText="#7F77DD" FlowDirection="LeftToRight"
+ AutomationProperties.Name="{DynamicResource theme.custom_color}" />
+ </StackPanel>
- <!-- Reduced Motion -->
- <Border Classes="card">
- <StackPanel Spacing="4">
- <CheckBox Content="{DynamicResource theme.reduce_motion}" IsChecked="{Binding ReduceMotion}" FontWeight="SemiBold" />
- <TextBlock Classes="caption" TextWrapping="Wrap" Text="{DynamicResource theme.reduce_motion_hint}" Margin="28,0,0,0" />
- </StackPanel>
- </Border>
+ <!-- Curated Pastel Presets -->
+ <TextBlock Classes="caption" Text="{DynamicResource theme.presets_pastel}" FontWeight="SemiBold" Margin="0,4,0,0" />
+ <ItemsControl ItemsSource="{Binding PastelPresets}">
+ <ItemsControl.ItemsPanel>
+ <ItemsPanelTemplate>
+ <UniformGrid Columns="2" />
+ </ItemsPanelTemplate>
+ </ItemsControl.ItemsPanel>
+ <ItemsControl.ItemTemplate>
+ <DataTemplate x:DataType="vm:ThemePageViewModel+PresetItem">
+ <Button Classes="preset-pill" Margin="0,0,6,6"
+ Command="{Binding $parent[ItemsControl].((vm:ThemePageViewModel)DataContext).PickPresetCommand}"
+ CommandParameter="{Binding}">
+ <DockPanel>
+ <Border DockPanel.Dock="Left" Width="18" Height="18" CornerRadius="999" Margin="0,0,8,0"
+ BorderBrush="{DynamicResource SubtleBorderBrush}" BorderThickness="1">
+ <Border.Background>
+ <SolidColorBrush Color="{Binding Color}" />
+ </Border.Background>
+ </Border>
+ <TextBlock Text="{Binding Name}" VerticalAlignment="Center" FontSize="12" FontWeight="Medium"
+ TextTrimming="CharacterEllipsis" />
+ </DockPanel>
+ </Button>
+ </DataTemplate>
+ </ItemsControl.ItemTemplate>
+ </ItemsControl>
+ </StackPanel>
+ </Border>
- <!-- Window size: the zoom of every Filee window (UiZoom), saved by itself. Ctrl + wheel and the keys change it too. -->
- <Border Classes="card">
- <StackPanel Spacing="8">
- <TextBlock Classes="label" Text="{DynamicResource theme.window_size}" />
- <StackPanel Orientation="Horizontal" Spacing="6">
- <Button x:Name="ZoomOutButton" Classes="icon" Command="{Binding ZoomOutCommand}"
- ToolTip.Tip="{DynamicResource theme.window_size_smaller}"
- AutomationProperties.Name="{DynamicResource theme.window_size_smaller}">
- <PathIcon Width="14" Height="14" Data="{StaticResource Icon.Minus}" />
- </Button>
- <TextBlock x:Name="WindowSizeText" MinWidth="52" TextAlignment="Center" VerticalAlignment="Center" FontWeight="SemiBold"
- FlowDirection="LeftToRight" Text="{Binding WindowSize, StringFormat={}{0:0}%}" />
- <Button x:Name="ZoomInButton" Classes="icon" Command="{Binding ZoomInCommand}"
- ToolTip.Tip="{DynamicResource theme.window_size_larger}"
- AutomationProperties.Name="{DynamicResource theme.window_size_larger}">
- <PathIcon Width="14" Height="14" Data="{StaticResource Icon.Plus}" />
- </Button>
- <Button x:Name="ResetZoomButton" Margin="8,0,0,0" Command="{Binding ResetZoomCommand}"
- Content="{DynamicResource theme.window_size_reset}" />
+ <!-- Softness / Corner Radius -->
+ <Border Classes="card">
+ <StackPanel Spacing="8">
+ <DockPanel>
+ <TextBlock DockPanel.Dock="Right" FontWeight="SemiBold" Text="{Binding CornerRadius, StringFormat={}{0:0}}" />
+ <TextBlock Classes="label" Text="{DynamicResource theme.corner_radius}" />
+ </DockPanel>
- <Slider Minimum="0" Maximum="28" Value="{Binding CornerRadius}" TickFrequency="1" IsSnapToTickEnabled="True" />
++ <Slider Minimum="0" Maximum="28" Value="{Binding CornerRadius}" TickFrequency="1" IsSnapToTickEnabled="True" AutomationProperties.Name="{DynamicResource theme.corner_radius}" />
</StackPanel>
- <TextBlock Classes="caption" TextWrapping="Wrap" Text="{Binding WindowSizeHint}" />
- </StackPanel>
- </Border>
- </StackPanel>
+ </Border>
+
+ <!-- The donut toolbar's opacity: the same setting as Donut toolbar → Appearance → Opacity. -->
+ <Border Classes="card">
+ <StackPanel Spacing="8">
+ <DockPanel>
+ <TextBlock DockPanel.Dock="Right" FontWeight="SemiBold" Text="{Binding DonutOpacity, StringFormat={}{0:0}%}" />
+ <TextBlock Classes="label" Text="{DynamicResource theme.donut_opacity}" />
+ </DockPanel>
+ <Slider x:Name="DonutOpacitySlider" Minimum="10" Maximum="100" Value="{Binding DonutOpacity}"
- TickFrequency="1" IsSnapToTickEnabled="True" />
++ TickFrequency="1" IsSnapToTickEnabled="True" AutomationProperties.Name="{DynamicResource theme.donut_opacity}" />
+ </StackPanel>
+ </Border>
- <!-- Live preview -->
- <Border Grid.Row="1" Grid.Column="2" Classes="card" VerticalAlignment="Top">
- <StackPanel Spacing="14">
- <TextBlock Classes="label" Text="{DynamicResource theme.preview}" />
- <!-- The donut over a stand-in for the desktop, so its opacity shows. -->
- <Border Background="{Binding PreviewBackdrop}" CornerRadius="{DynamicResource SoftRadiusLarge}" Padding="0,10" ClipToBounds="True">
- <c:DonutMenu x:Name="PreviewDonut" Items="{Binding PreviewItems}" OuterRadius="120" CenterTitle="JPG × 3" HorizontalAlignment="Center"
- SliceOpacity="{Binding DonutOpacity, Converter={x:Static vm:ToolbarConverters.Percent}}" />
+ <!-- Reduced Motion -->
+ <Border Classes="card">
+ <StackPanel Spacing="4">
+ <CheckBox Content="{DynamicResource theme.reduce_motion}" IsChecked="{Binding ReduceMotion}" FontWeight="SemiBold" />
+ <TextBlock Classes="caption" TextWrapping="Wrap" Text="{DynamicResource theme.reduce_motion_hint}" Margin="28,0,0,0" />
+ </StackPanel>
+ </Border>
+ <!-- Window size: the zoom of every Filee window (UiZoom), saved by itself. Ctrl + wheel and the keys change it too. -->
+ <Border Classes="card">
+ <StackPanel Spacing="8">
+ <TextBlock Classes="label" Text="{DynamicResource theme.window_size}" />
+ <StackPanel Orientation="Horizontal" Spacing="6">
+ <Button x:Name="ZoomOutButton" Classes="icon" Command="{Binding ZoomOutCommand}"
+ ToolTip.Tip="{DynamicResource theme.window_size_smaller}"
+ AutomationProperties.Name="{DynamicResource theme.window_size_smaller}">
+ <PathIcon Width="14" Height="14" Data="{StaticResource Icon.Minus}" />
+ </Button>
+ <TextBlock x:Name="WindowSizeText" MinWidth="52" TextAlignment="Center" VerticalAlignment="Center" FontWeight="SemiBold"
+ FlowDirection="LeftToRight" Text="{Binding WindowSize, StringFormat={}{0:0}%}" />
+ <Button x:Name="ZoomInButton" Classes="icon" Command="{Binding ZoomInCommand}"
+ ToolTip.Tip="{DynamicResource theme.window_size_larger}"
+ AutomationProperties.Name="{DynamicResource theme.window_size_larger}">
+ <PathIcon Width="14" Height="14" Data="{StaticResource Icon.Plus}" />
+ </Button>
+ <Button x:Name="ResetZoomButton" Margin="8,0,0,0" Command="{Binding ResetZoomCommand}"
+ Content="{DynamicResource theme.window_size_reset}" />
+ </StackPanel>
+ <TextBlock Classes="caption" TextWrapping="Wrap" Text="{Binding WindowSizeHint}" />
+ </StackPanel>
</Border>
- <!-- Sample buttons are decorative; the switch below is an isolated interactive demo. -->
+ </StackPanel>
+
+ <!-- Live preview -->
+ <Border Grid.Row="1" Grid.Column="2" Classes="card" VerticalAlignment="Top">
<StackPanel Spacing="14">
- <StackPanel Orientation="Horizontal" Spacing="8" HorizontalAlignment="Center"
- IsHitTestVisible="False" Focusable="False">
- <Button x:Name="PreviewPrimaryButton" Classes="accent" Content="{DynamicResource common.save}"
- Focusable="False" IsTabStop="False" />
- <Button x:Name="PreviewSecondaryButton" Content="{DynamicResource common.cancel}"
- Focusable="False" IsTabStop="False" />
+ <TextBlock Classes="label" Text="{DynamicResource theme.preview}" />
+ <!-- The donut over a stand-in for the desktop, so its opacity shows. -->
+ <Border Background="{Binding PreviewBackdrop}" CornerRadius="{DynamicResource SoftRadiusLarge}" Padding="0,10" ClipToBounds="True">
+ <c:DonutMenu x:Name="PreviewDonut" Items="{Binding PreviewItems}" OuterRadius="120" CenterTitle="JPG × 3" HorizontalAlignment="Center"
+ SliceOpacity="{Binding DonutOpacity, Converter={x:Static vm:ToolbarConverters.Percent}}" />
+ </Border>
+ <!-- Sample buttons are decorative; the switch below is an isolated interactive demo. -->
+ <StackPanel Spacing="14">
+ <StackPanel Orientation="Horizontal" Spacing="8" HorizontalAlignment="Center"
+ IsHitTestVisible="False" Focusable="False">
+ <Button x:Name="PreviewPrimaryButton" Classes="accent" Content="{DynamicResource common.save}"
+ Focusable="False" IsTabStop="False" />
+ <Button x:Name="PreviewSecondaryButton" Content="{DynamicResource common.cancel}"
+ Focusable="False" IsTabStop="False" />
+ </StackPanel>
+ <!-- On / Off come from the ToggleSwitch style, in the user's language. -->
+ <ToggleSwitch x:Name="PreviewToggle"
+ IsChecked="False"
+ HorizontalAlignment="Center"
+ AutomationProperties.Name="{DynamicResource theme.preview_toggle}"
+ AutomationProperties.HelpText="{DynamicResource theme.preview_toggle_hint}" />
</StackPanel>
- <!-- On / Off come from the ToggleSwitch style, in the user's language. -->
- <ToggleSwitch x:Name="PreviewToggle"
- IsChecked="False"
- HorizontalAlignment="Center"
- AutomationProperties.Name="{DynamicResource theme.preview_toggle}"
- AutomationProperties.HelpText="{DynamicResource theme.preview_toggle_hint}" />
</StackPanel>
- </StackPanel>
- </Border>
- </Grid>
+ </Border>
+ </Grid>
+ </ScrollViewer>
</UserControl>
diff --cc src/Filee.App/Views/Pages/ToolbarPage.axaml
index 491cd93e,268eba08..431e1887
--- a/src/Filee.App/Views/Pages/ToolbarPage.axaml
+++ b/src/Filee.App/Views/Pages/ToolbarPage.axaml
@@@ -168,247 -168,234 +168,234 @@@
</Style>
</UserControl.Styles>
- <Grid x:Name="Root" RowDefinitions="Auto,*">
- <StackPanel Spacing="4" Margin="0,0,0,18">
- <TextBlock Classes="h1" Text="{DynamicResource toolbar.title}" />
- </StackPanel>
-
- <Grid Grid.Row="1" ColumnDefinitions="200,20,*,20,230">
- <!-- 1. Profiles -->
- <StackPanel Spacing="8">
- <TextBlock Classes="label" Text="{DynamicResource toolbar.step_profile}" />
- <TextBox Classes="search clearButton" Text="{Binding ProfileSearch}" Watermark="{DynamicResource common.search}">
- <TextBox.InnerLeftContent>
- <PathIcon Width="14" Height="14" Margin="10,0,0,0" Data="{StaticResource Icon.Search}" Foreground="{DynamicResource TextSecondaryBrush}" />
- </TextBox.InnerLeftContent>
- </TextBox>
- <ListBox Classes="soft" ItemsSource="{Binding VisibleProfiles}" SelectedItem="{Binding SelectedProfile}">
- <ListBox.ItemTemplate>
- <DataTemplate x:DataType="vm:ProfileItemViewModel">
- <DockPanel>
- <Border DockPanel.Dock="Right" Classes="badge" ToolTip.Tip="{Binding CountTip}">
- <TextBlock Classes="caption" Text="{Binding Count}" />
- </Border>
- <PathIcon DockPanel.Dock="Right" Width="13" Height="13" Margin="0,0,8,0" Data="{StaticResource Icon.Shapes}"
- Foreground="{DynamicResource TextSecondaryBrush}" IsVisible="{Binding IsMixed}"
- ToolTip.Tip="{DynamicResource toolbar.mixed_badge}" />
- <TextBlock Text="{Binding Name}" VerticalAlignment="Center" TextTrimming="CharacterEllipsis" />
- </DockPanel>
- </DataTemplate>
- </ListBox.ItemTemplate>
- </ListBox>
- <Button HorizontalAlignment="Stretch" Command="{Binding AddProfileCommand}">
- <StackPanel Orientation="Horizontal" Spacing="6">
- <PathIcon Width="12" Height="12" Data="{StaticResource Icon.Plus}" />
- <TextBlock Text="{DynamicResource toolbar.add_profile}" />
- </StackPanel>
- </Button>
+ <ScrollViewer x:Name="EditorScroller" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Disabled">
+ <Grid x:Name="Root" RowDefinitions="Auto,*" MinWidth="786" Width="{Binding #EditorScroller.Viewport.Width}" HorizontalAlignment="Left">
+ <StackPanel Spacing="4" Margin="0,0,0,18">
+ <TextBlock Classes="h1" Text="{DynamicResource toolbar.title}" />
</StackPanel>
- <!-- 2. Donut -->
- <StackPanel Grid.Column="2" Spacing="12">
- <TextBlock Classes="label" Text="{DynamicResource toolbar.step_arrange}" />
- <Border Classes="card" Padding="8">
- <StackPanel>
- <!-- Which face of the donut the slices below are: the front, or the back Tab flips the open donut to. -->
- <Border x:Name="FaceSwitch" Classes="faces" HorizontalAlignment="Center" Margin="0,6,0,0">
- <StackPanel Orientation="Horizontal">
- <RadioButton Classes="face" IsChecked="{Binding EditingFront}">
- <StackPanel Orientation="Horizontal" Spacing="6">
- <TextBlock Text="{DynamicResource toolbar.face_front}" />
- <TextBlock Classes="count" Text="{Binding FrontCount}" />
- </StackPanel>
- </RadioButton>
- <RadioButton Classes="face" IsChecked="{Binding EditingBack}">
- <StackPanel Orientation="Horizontal" Spacing="6">
- <TextBlock Text="{DynamicResource toolbar.face_back}" />
- <TextBlock Classes="count" Text="{Binding BackCount}" />
- </StackPanel>
- </RadioButton>
- </StackPanel>
- </Border>
- <TextBlock Classes="caption" HorizontalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap"
- Margin="12,6,12,0" Text="{Binding FaceHint}" />
- <c:DonutMenu x:Name="Donut" IsEditMode="True" HorizontalAlignment="Center"
- Items="{Binding DonutItems}"
- CenterTitle="{Binding CenterTitle}"
- CenterSubtitle="{Binding CenterSubtitle}"
- OuterRadius="{Binding OuterRadius}"
- HoleRatio="{Binding HoleRatio, Converter={x:Static vm:ToolbarConverters.Percent}}"
- SliceOpacity="{Binding SliceOpacity, Converter={x:Static vm:ToolbarConverters.Percent}}" />
- </StackPanel>
- </Border>
- <TextBlock Classes="caption danger" Text="{Binding Message}" HorizontalAlignment="Center" />
+ <Grid Grid.Row="1" ColumnDefinitions="200,20,*,20,230">
+ <!-- 1. Profiles -->
+ <StackPanel Spacing="8">
+ <TextBlock Classes="label" Text="{DynamicResource toolbar.step_profile}" />
+ <TextBox Classes="search clearButton" Text="{Binding ProfileSearch}" Watermark="{DynamicResource common.search}">
+ <TextBox.InnerLeftContent>
+ <PathIcon Width="14" Height="14" Margin="10,0,0,0" Data="{StaticResource Icon.Search}" Foreground="{DynamicResource TextSecondaryBrush}" />
+ </TextBox.InnerLeftContent>
+ </TextBox>
+ <ListBox Classes="soft" ItemsSource="{Binding VisibleProfiles}" SelectedItem="{Binding SelectedProfile}">
+ <ListBox.ItemTemplate>
+ <DataTemplate x:DataType="vm:ProfileItemViewModel">
+ <DockPanel>
+ <Border DockPanel.Dock="Right" Classes="badge" ToolTip.Tip="{Binding CountTip}">
+ <TextBlock Classes="caption" Text="{Binding Count}" />
+ </Border>
+ <PathIcon DockPanel.Dock="Right" Width="13" Height="13" Margin="0,0,8,0" Data="{StaticResource Icon.Shapes}"
+ Foreground="{DynamicResource TextSecondaryBrush}" IsVisible="{Binding IsMixed}"
+ ToolTip.Tip="{DynamicResource toolbar.mixed_badge}" />
+ <TextBlock Text="{Binding Name}" VerticalAlignment="Center" TextTrimming="CharacterEllipsis" />
+ </DockPanel>
+ </DataTemplate>
+ </ListBox.ItemTemplate>
+ </ListBox>
+ <Button HorizontalAlignment="Stretch" Command="{Binding AddProfileCommand}">
+ <StackPanel Orientation="Horizontal" Spacing="6">
+ <PathIcon Width="12" Height="12" Data="{StaticResource Icon.Plus}" />
+ <TextBlock Text="{DynamicResource toolbar.add_profile}" />
+ </StackPanel>
+ </Button>
+ </StackPanel>
- <Border x:Name="ProfileCard" Classes="card">
- <StackPanel Spacing="12">
+ <!-- 2. Donut -->
+ <StackPanel Grid.Column="2" Spacing="12">
+ <TextBlock Classes="label" Text="{DynamicResource toolbar.step_arrange}" />
+ <Border Classes="card" Padding="8">
<StackPanel>
- <TextBlock Classes="label" Text="{DynamicResource toolbar.name}" />
- <TextBox Text="{Binding ProfileName}" AutomationProperties.Name="{DynamicResource toolbar.name}" />
+ <!-- Which face of the donut the slices below are: the front, or the back Tab flips the open donut to. -->
+ <Border x:Name="FaceSwitch" Classes="faces" HorizontalAlignment="Center" Margin="0,6,0,0">
+ <StackPanel Orientation="Horizontal">
+ <RadioButton Classes="face" IsChecked="{Binding EditingFront}">
+ <StackPanel Orientation="Horizontal" Spacing="6">
+ <TextBlock Text="{DynamicResource toolbar.face_front}" />
+ <TextBlock Classes="count" Text="{Binding FrontCount}" />
+ </StackPanel>
+ </RadioButton>
+ <RadioButton Classes="face" IsChecked="{Binding EditingBack}">
+ <StackPanel Orientation="Horizontal" Spacing="6">
+ <TextBlock Text="{DynamicResource toolbar.face_back}" />
+ <TextBlock Classes="count" Text="{Binding BackCount}" />
+ </StackPanel>
+ </RadioButton>
+ </StackPanel>
+ </Border>
+ <TextBlock Classes="caption" HorizontalAlignment="Center" TextAlignment="Center" TextWrapping="Wrap"
+ Margin="12,6,12,0" Text="{Binding FaceHint}" />
+ <c:DonutMenu x:Name="Donut" IsEditMode="True" HorizontalAlignment="Center"
+ Items="{Binding DonutItems}"
+ CenterTitle="{Binding CenterTitle}"
+ CenterSubtitle="{Binding CenterSubtitle}"
+ OuterRadius="{Binding OuterRadius}"
+ HoleRatio="{Binding HoleRatio, Converter={x:Static vm:ToolbarConverters.Percent}}"
+ SliceOpacity="{Binding SliceOpacity, Converter={x:Static vm:ToolbarConverters.Percent}}" />
</StackPanel>
+ </Border>
+ <TextBlock Classes="caption danger" Text="{Binding Message}" HorizontalAlignment="Center" />
- <!-- The label wraps (a ToggleSwitch header doesn't), so it sits next to a bare switch. -->
- <StackPanel Spacing="2">
- <DockPanel>
- <ToggleSwitch x:Name="MixedToggle" DockPanel.Dock="Right" OnContent="{x:Null}" OffContent="{x:Null}" MinWidth="0"
- Margin="12,0,0,0" VerticalAlignment="Center"
- IsChecked="{Binding IsMixed}" IsEnabled="{Binding CanChangeMixed}"
- AutomationProperties.Name="{DynamicResource toolbar.mixed_toggle}" />
- <TextBlock Text="{DynamicResource toolbar.mixed_toggle}" TextWrapping="Wrap" VerticalAlignment="Center" />
- </DockPanel>
- <TextBlock Classes="caption" Text="{DynamicResource toolbar.mixed_locked}" TextWrapping="Wrap"
- IsVisible="{Binding !CanChangeMixed}" />
- </StackPanel>
+ <Border x:Name="ProfileCard" Classes="card">
+ <StackPanel Spacing="12">
+ <StackPanel>
+ <TextBlock Classes="label" Text="{DynamicResource toolbar.name}" />
- <TextBox Text="{Binding ProfileName}" />
++ <TextBox Text="{Binding ProfileName}" AutomationProperties.Name="{DynamicResource toolbar.name}" />
+ </StackPanel>
- <!-- Normal profile: extension chips -->
- <ContentControl Content="{Binding ExtensionTags}" IsVisible="{Binding ExtensionTags, Converter={x:Static ObjectConverters.IsNotNull}}">
- <ContentControl.ContentTemplate>
- <DataTemplate x:DataType="vm:ExtensionTagsViewModel">
- <StackPanel Spacing="6">
- <TextBlock Classes="label" Text="{DynamicResource toolbar.extensions}" />
- <c:TagEditor x:Name="ExtensionEditor"
- Tags="{Binding Tags}" Suggestions="{Binding Suggestions}" Text="{Binding Text}"
- AddCommand="{Binding AddCommand}" RemoveCommand="{Binding RemoveCommand}"
- PlaceholderText="{DynamicResource toolbar.extensions_hint}" />
- <TextBlock Classes="caption danger" Text="{Binding InputError}" TextWrapping="Wrap"
- IsVisible="{Binding InputError, Converter={x:Static ObjectConverters.IsNotNull}}" />
- <ItemsControl ItemsSource="{Binding Notes}">
- <ItemsControl.ItemTemplate>
- <DataTemplate x:DataType="vm:ExtensionNote">
- <DockPanel Margin="0,2">
- <PathIcon Classes="note" Classes.warning="{Binding IsWarning}" Data="{StaticResource Icon.Alert}" />
- <TextBlock Classes="caption" Classes.warning="{Binding IsWarning}" Text="{Binding Text}" TextWrapping="Wrap" />
- </DockPanel>
- </DataTemplate>
- </ItemsControl.ItemTemplate>
- </ItemsControl>
- </StackPanel>
- </DataTemplate>
- </ContentControl.ContentTemplate>
- </ContentControl>
+ <!-- The label wraps (a ToggleSwitch header doesn't), so it sits next to a bare switch. -->
+ <StackPanel Spacing="2">
+ <DockPanel>
+ <ToggleSwitch x:Name="MixedToggle" DockPanel.Dock="Right" OnContent="{x:Null}" OffContent="{x:Null}" MinWidth="0"
+ Margin="12,0,0,0" VerticalAlignment="Center"
+ IsChecked="{Binding IsMixed}" IsEnabled="{Binding CanChangeMixed}"
+ AutomationProperties.Name="{DynamicResource toolbar.mixed_toggle}" />
+ <TextBlock Text="{DynamicResource toolbar.mixed_toggle}" TextWrapping="Wrap" VerticalAlignment="Center" />
+ </DockPanel>
+ <TextBlock Classes="caption" Text="{DynamicResource toolbar.mixed_locked}" TextWrapping="Wrap"
+ IsVisible="{Binding !CanChangeMixed}" />
+ </StackPanel>
- <!-- Mixed-selection profile: which extensions a mix may contain -->
- <ContentControl Content="{Binding MixedExtensions}" IsVisible="{Binding MixedExtensions, Converter={x:Static ObjectConverters.IsNotNull}}">
- <ContentControl.ContentTemplate>
- <DataTemplate x:DataType="vm:MixedExtensionsViewModel">
- <StackPanel Spacing="6">
- <TextBlock Classes="label" Text="{DynamicResource toolbar.mixed_title}" TextWrapping="Wrap" />
- <Border Classes="ext-groups">
- <ItemsControl ItemsSource="{Binding Groups}">
+ <!-- Normal profile: extension chips -->
+ <ContentControl Content="{Binding ExtensionTags}" IsVisible="{Binding ExtensionTags, Converter={x:Static ObjectConverters.IsNotNull}}">
+ <ContentControl.ContentTemplate>
+ <DataTemplate x:DataType="vm:ExtensionTagsViewModel">
+ <StackPanel Spacing="6">
+ <TextBlock Classes="label" Text="{DynamicResource toolbar.extensions}" />
+ <c:TagEditor x:Name="ExtensionEditor"
+ Tags="{Binding Tags}" Suggestions="{Binding Suggestions}" Text="{Binding Text}"
+ AddCommand="{Binding AddCommand}" RemoveCommand="{Binding RemoveCommand}"
+ PlaceholderText="{DynamicResource toolbar.extensions_hint}" />
+ <TextBlock Classes="caption danger" Text="{Binding InputError}" TextWrapping="Wrap"
+ IsVisible="{Binding InputError, Converter={x:Static ObjectConverters.IsNotNull}}" />
+ <ItemsControl ItemsSource="{Binding Notes}">
<ItemsControl.ItemTemplate>
- <DataTemplate x:DataType="vm:ExtensionGroupViewModel">
- <StackPanel>
- <DockPanel>
- <ToggleButton DockPanel.Dock="Left" Classes="expander" IsChecked="{Binding IsExpanded}"
- ToolTip.Tip="{DynamicResource toolbar.mixed_expand}"
- AutomationProperties.Name="{Binding Name}">
- <PathIcon Classes="reading" Data="{StaticResource Icon.ChevronRight}" />
- </ToggleButton>
- <TextBlock DockPanel.Dock="Right" Classes="caption" Text="{Binding Count}" VerticalAlignment="Center" />
- <CheckBox Content="{Binding Name}" IsChecked="{Binding State, Mode=OneWay}"
- Command="{Binding ToggleAllCommand}" Margin="2,0,8,0" MinHeight="30" />
- </DockPanel>
- <ItemsControl ItemsSource="{Binding Extensions}" IsVisible="{Binding IsExpanded}" Margin="32,0,0,8">
- <ItemsControl.ItemsPanel>
- <ItemsPanelTemplate>
- <WrapPanel />
- </ItemsPanelTemplate>
- </ItemsControl.ItemsPanel>
- <ItemsControl.ItemTemplate>
- <DataTemplate x:DataType="vm:ExtensionToggleViewModel">
- <ToggleButton Classes="extchip" Content="{Binding Text}" IsChecked="{Binding IsChecked}"
- ToolTip.Tip="{Binding ToolTip}" />
- </DataTemplate>
- </ItemsControl.ItemTemplate>
- </ItemsControl>
- </StackPanel>
+ <DataTemplate x:DataType="vm:ExtensionNote">
+ <DockPanel Margin="0,2">
+ <PathIcon Classes="note" Classes.warning="{Binding IsWarning}" Data="{StaticResource Icon.Alert}" />
+ <TextBlock Classes="caption" Classes.warning="{Binding IsWarning}" Text="{Binding Text}" TextWrapping="Wrap" />
+ </DockPanel>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
- </Border>
- <DockPanel Margin="0,2">
- <PathIcon Classes="note" Classes.warning="{Binding HintIsWarning}" Data="{StaticResource Icon.Info}" />
- <TextBlock Classes="caption" Classes.warning="{Binding HintIsWarning}" Text="{Binding Hint}" TextWrapping="Wrap" />
- </DockPanel>
- </StackPanel>
- </DataTemplate>
- </ContentControl.ContentTemplate>
- </ContentControl>
+ </StackPanel>
+ </DataTemplate>
+ </ContentControl.ContentTemplate>
+ </ContentControl>
- <!-- Only a built-in profile has a default to go back to; the last mixed one can't be deleted. -->
- <StackPanel x:Name="ProfileActions" Orientation="Horizontal" HorizontalAlignment="Right" Spacing="8">
- <Button Content="{DynamicResource toolbar.reset_profile}" Command="{Binding ResetProfileCommand}"
- IsVisible="{Binding CanReset}" />
- <Button Content="{DynamicResource toolbar.delete_profile}" Command="{Binding DeleteProfileCommand}"
- IsVisible="{Binding CanDelete}" />
- </StackPanel>
- </StackPanel>
- </Border>
-
- <Border Classes="card">
- <StackPanel Spacing="6">
- <TextBlock Classes="h2" Text="{DynamicResource toolbar.appearance}" />
- <Grid ColumnDefinitions="90,*">
- <TextBlock Classes="label" VerticalAlignment="Center" Text="{DynamicResource toolbar.size}" />
- <Slider Grid.Column="1" Minimum="110" Maximum="220" Value="{Binding OuterRadius}" AutomationProperties.Name="{DynamicResource toolbar.size}" />
- </Grid>
- <Grid ColumnDefinitions="90,*">
- <TextBlock Classes="label" VerticalAlignment="Center" Text="{DynamicResource toolbar.hole}" />
- <Slider Grid.Column="1" Minimum="25" Maximum="65" Value="{Binding HoleRatio}" AutomationProperties.Name="{DynamicResource toolbar.hole}" />
- </Grid>
- <Grid ColumnDefinitions="90,*">
- <TextBlock Classes="label" VerticalAlignment="Center" Text="{DynamicResource toolbar.opacity}" />
- <Slider Grid.Column="1" Minimum="10" Maximum="100" Value="{Binding SliceOpacity}" AutomationProperties.Name="{DynamicResource toolbar.opacity}" />
- </Grid>
- </StackPanel>
- </Border>
- </StackPanel>
+ <!-- Mixed-selection profile: which extensions a mix may contain -->
+ <ContentControl Content="{Binding MixedExtensions}" IsVisible="{Binding MixedExtensions, Converter={x:Static ObjectConverters.IsNotNull}}">
+ <ContentControl.ContentTemplate>
+ <DataTemplate x:DataType="vm:MixedExtensionsViewModel">
+ <StackPanel Spacing="6">
+ <TextBlock Classes="label" Text="{DynamicResource toolbar.mixed_title}" TextWrapping="Wrap" />
+ <Border Classes="ext-groups">
+ <ItemsControl ItemsSource="{Binding Groups}">
+ <ItemsControl.ItemTemplate>
+ <DataTemplate x:DataType="vm:ExtensionGroupViewModel">
+ <StackPanel>
+ <DockPanel>
+ <ToggleButton DockPanel.Dock="Left" Classes="expander" IsChecked="{Binding IsExpanded}"
+ ToolTip.Tip="{DynamicResource toolbar.mixed_expand}"
+ AutomationProperties.Name="{Binding Name}">
+ <PathIcon Classes="reading" Data="{StaticResource Icon.ChevronRight}" />
+ </ToggleButton>
+ <TextBlock DockPanel.Dock="Right" Classes="caption" Text="{Binding Count}" VerticalAlignment="Center" />
+ <CheckBox Content="{Binding Name}" IsChecked="{Binding State, Mode=OneWay}"
+ Command="{Binding ToggleAllCommand}" Margin="2,0,8,0" MinHeight="30" />
+ </DockPanel>
+ <ItemsControl ItemsSource="{Binding Extensions}" IsVisible="{Binding IsExpanded}" Margin="32,0,0,8">
+ <ItemsControl.ItemsPanel>
+ <ItemsPanelTemplate>
+ <WrapPanel />
+ </ItemsPanelTemplate>
+ </ItemsControl.ItemsPanel>
+ <ItemsControl.ItemTemplate>
+ <DataTemplate x:DataType="vm:ExtensionToggleViewModel">
+ <ToggleButton Classes="extchip" Content="{Binding Text}" IsChecked="{Binding IsChecked}"
+ ToolTip.Tip="{Binding ToolTip}" />
+ </DataTemplate>
+ </ItemsControl.ItemTemplate>
+ </ItemsControl>
+ </StackPanel>
+ </DataTemplate>
+ </ItemsControl.ItemTemplate>
+ </ItemsControl>
+ </Border>
+ <DockPanel Margin="0,2">
+ <PathIcon Classes="note" Classes.warning="{Binding HintIsWarning}" Data="{StaticResource Icon.Info}" />
+ <TextBlock Classes="caption" Classes.warning="{Binding HintIsWarning}" Text="{Binding Hint}" TextWrapping="Wrap" />
+ </DockPanel>
+ </StackPanel>
+ </DataTemplate>
+ </ContentControl.ContentTemplate>
+ </ContentControl>
- <!-- Palette -->
- <StackPanel x:Name="PaletteColumn" Grid.Column="4" Spacing="8">
- <TextBlock Classes="label" Text="{DynamicResource toolbar.available}" />
- <!-- Two to a row in a narrow column: little padding, centred, and an ellipsis rather than text past the edge. -->
- <Grid ColumnDefinitions="*,6,*">
- <Button HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" Padding="6,6"
- Command="{Binding NewPresetCommand}" ToolTip.Tip="{DynamicResource toolbar.new_preset}">
- <StackPanel Orientation="Horizontal" Spacing="5">
- <PathIcon Width="12" Height="12" Data="{StaticResource Icon.Plus}" />
- <TextBlock Text="{DynamicResource toolbar.new_preset}" TextTrimming="CharacterEllipsis" />
+ <!-- Only a built-in profile has a default to go back to; the last mixed one can't be deleted. -->
+ <StackPanel x:Name="ProfileActions" Orientation="Horizontal" HorizontalAlignment="Right" Spacing="8">
+ <Button Content="{DynamicResource toolbar.reset_profile}" Command="{Binding ResetProfileCommand}"
+ IsVisible="{Binding CanReset}" />
+ <Button Content="{DynamicResource toolbar.delete_profile}" Command="{Binding DeleteProfileCommand}"
+ IsVisible="{Binding CanDelete}" />
+ </StackPanel>
</StackPanel>
- </Button>
- <Button Grid.Column="2" HorizontalAlignment="Stretch" HorizontalContentAlignment="Center" Padding="6,6"
- Command="{Binding NewGroupCommand}" ToolTip.Tip="{DynamicResource group.hint}">
- <StackPanel Orientation="Horizontal" Spacing="5">
- <PathIcon Width="12" Height="12" Data="{StaticResource Icon.Donut}" />
- <TextBlock Text="{DynamicResource toolbar.new_group}" TextTrimming="CharacterEllipsis" />
+ </Border>
+
+ <Border Classes="card">
+ <StackPanel Spacing="6">
+ <TextBlock Classes="h2" Text="{DynamicResource toolbar.appearance}" />
+ <Grid ColumnDefinitions="90,*">
+ <TextBlock Classes="label" VerticalAlignment="Center" Text="{DynamicResource toolbar.size}" />
- <Slider Grid.Column="1" Minimum="110" Maximum="220" Value="{Binding OuterRadius}" />
++ <Slider Grid.Column="1" Minimum="110" Maximum="220" Value="{Binding OuterRadius}" AutomationProperties.Name="{DynamicResource toolbar.size}" />
+ </Grid>
+ <Grid ColumnDefinitions="90,*">
+ <TextBlock Classes="label" VerticalAlignment="Center" Text="{DynamicResource toolbar.hole}" />
- <Slider Grid.Column="1" Minimum="25" Maximum="65" Value="{Binding HoleRatio}" />
++ <Slider Grid.Column="1" Minimum="25" Maximum="65" Value="{Binding HoleRatio}" AutomationProperties.Name="{DynamicResource toolbar.hole}" />
+ </Grid>
+ <Grid ColumnDefinitions="90,*">
+ <TextBlock Classes="label" VerticalAlignment="Center" Text="{DynamicResource toolbar.opacity}" />
- <Slider Grid.Column="1" Minimum="10" Maximum="100" Value="{Binding SliceOpacity}" />
++ <Slider Grid.Column="1" Minimum="10" Maximum="100" Value="{Binding SliceOpacity}" AutomationProperties.Name="{DynamicResource toolbar.opacity}" />
+ </Grid>
</StackPanel>
- </Button>
- </Grid>
- <TextBox x:Name="PaletteSearchBox" Classes="search clearButton" Text="{Binding PaletteSearch}" Watermark="{DynamicResource common.search}">
- <TextBox.InnerLeftContent>
- <PathIcon Width="14" Height="14" Margin="10,0,0,0" Data="{StaticResource Icon.Search}" Foreground="{DynamicResource TextSecondaryBrush}" />
- </TextBox.InnerLeftContent>
- </TextBox>
- <!-- Kinds of preset (All first). Hidden when one kind would only repeat All. Wraps rather than scrolls sideways. -->
- <ListBox x:Name="PaletteTabs" ItemsSource="{Binding Tabs}" SelectedItem="{Binding SelectedTab}"
- IsVisible="{Binding ShowTabRow}"
- AutomationProperties.Name="{DynamicResource toolbar.available}"
- ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Disabled">
- <ListBox.ItemsPanel>
- <ItemsPanelTemplate>
- <WrapPanel />
- </ItemsPanelTemplate>
- </ListBox.ItemsPanel>
- <ListBox.ItemTemplate>
- <DataTemplate x:DataType="vm:PaletteTabItem">
- <TextBlock Text="{Binding Label}" TextWrapping="Wrap" />
- </DataTemplate>
- </ListBox.ItemTemplate>
- </ListBox>
- <Border x:Name="PaletteBox" MinHeight="180" Padding="6" CornerRadius="{DynamicResource SoftRadius}"
- BorderThickness="2" BorderBrush="{DynamicResource SubtleBorderBrush}" Background="Transparent">
- <ItemsControl ItemsSource="{Binding VisiblePalette}">
- <ItemsControl.ItemsPanel>
+ </Border>
+ </StackPanel>
+
+ <!-- Palette -->
+ <StackPanel x:Name="PaletteColumn" Grid.Column="4" Spacing="8">
+ <TextBlock Classes="label" Text="{DynamicResource toolbar.available}" />
+ <!-- Keep complete action labels; longer translations can move the second action to the next row. -->
+ <WrapPanel>
+ <Button x:Name="NewPresetButton" Margin="0,0,6,6" HorizontalContentAlignment="Center" Padding="6,6"
+ Command="{Binding NewPresetCommand}" ToolTip.Tip="{DynamicResource toolbar.new_preset}">
+ <StackPanel Orientation="Horizontal" Spacing="5">
+ <PathIcon Width="12" Height="12" Data="{StaticResource Icon.Plus}" />
+ <TextBlock Text="{DynamicResource toolbar.new_preset}" />
+ </StackPanel>
+ </Button>
+ <Button x:Name="NewGroupButton" Margin="0,0,0,6" HorizontalContentAlignment="Center" Padding="6,6"
+ Command="{Binding NewGroupCommand}" ToolTip.Tip="{DynamicResource group.hint}">
+ <StackPanel Orientation="Horizontal" Spacing="5">
+ <PathIcon Width="12" Height="12" Data="{StaticResource Icon.Donut}" />
+ <TextBlock Text="{DynamicResource toolbar.new_group}" />
+ </StackPanel>
+ </Button>
+ </WrapPanel>
+ <TextBox x:Name="PaletteSearchBox" Classes="search clearButton" Text="{Binding PaletteSearch}" Watermark="{DynamicResource common.search}">
+ <TextBox.InnerLeftContent>
+ <PathIcon Width="14" Height="14" Margin="10,0,0,0" Data="{StaticResource Icon.Search}" Foreground="{DynamicResource TextSecondaryBrush}" />
+ </TextBox.InnerLeftContent>
+ </TextBox>
+ <!-- Kinds of preset (All first). Hidden when one kind would only repeat All. Wraps rather than scrolls sideways. -->
+ <ListBox x:Name="PaletteTabs" ItemsSource="{Binding Tabs}" SelectedItem="{Binding SelectedTab}"
+ IsVisible="{Binding ShowTabRow}"
+ AutomationProperties.Name="{DynamicResource toolbar.available}"
+ ScrollViewer.HorizontalScrollBarVisibility="Disabled" ScrollViewer.VerticalScrollBarVisibility="Disabled">
+ <ListBox.ItemsPanel>
<ItemsPanelTemplate>
<WrapPanel />
</ItemsPanelTemplate>