Skip to content

Remove form labels #24

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

Merged
CascadePass merged 1 commit into from
Jun 11, 2025
Merged

Remove form labels #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
166 changes: 76 additions & 90 deletions src/Glazier.UI/LoadImageForm.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,6 @@
x:Name="InputFormBorder"
Style="{DynamicResource OuterBorderStyle}">
<StackPanel>
<TextBlock
x:Name="InputFileLabel"
Text="{x:Static local:Resources.Label_SourceFile}"
Visibility="{Binding IsImageNeeded, Converter={StaticResource boolToVisibility}}"
Style="{DynamicResource FormLabel}"
/>

<local:CommandTextBox
x:Name="InputFile"
Margin="0,4,0,0"
Expand All @@ -30,97 +23,90 @@
/>


<TextBlock
x:Name="AlgorithmLabel"
Margin="0,12,0,0"
Text="{x:Static local:Resources.Algorithm}"
Visibility="{Binding IsImageNeeded, Converter={StaticResource boolToVisibility}}"
Style="{DynamicResource FormLabel}"
/>

<Border Background="{DynamicResource AlgorithmSelectorButtonBackgroundBrush}" Margin="0,4,0,4" CornerRadius="12">
<Border Background="{DynamicResource AlgorithmSelectorButtonBackgroundBrush}" Margin="0,40,0,4" CornerRadius="12">
<Grid>
<!-- Selection Indicator -->
<Border
x:Name="SelectionHighlight"
CornerRadius="8"
Background="{DynamicResource AlgorithmSelectorCheckedButtonBackgroundBrush}"
RenderTransformOrigin="0.5,0.5">
<Border.RenderTransform>
<TranslateTransform x:Name="HighlightTransform"/>
</Border.RenderTransform>
</Border>
<!-- Selection Indicator -->
<Border
x:Name="SelectionHighlight"
CornerRadius="8"
Background="{DynamicResource AlgorithmSelectorCheckedButtonBackgroundBrush}"
RenderTransformOrigin="0.5,0.5">
<Border.RenderTransform>
<TranslateTransform x:Name="HighlightTransform"/>
</Border.RenderTransform>
</Border>

<ItemsControl x:Name="GlazeMethodSelector" ItemsSource="{Binding AvailableGlazeMethods}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel />
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<RadioButton
IsEnabled="{Binding IsEnabled}"
IsChecked="{Binding IsSelected, Mode=TwoWay}"
Style="{StaticResource SegmentedRadioButtonStyle}"
HorizontalAlignment="Left"
GroupName="GlazeMethodSelectionRadioGroup"
Checked="RadioButton_Checked"
Loaded="RadioButton_Loaded">
<ItemsControl x:Name="GlazeMethodSelector" ItemsSource="{Binding AvailableGlazeMethods}">
<ItemsControl.ItemsPanel>
<ItemsPanelTemplate>
<StackPanel />
</ItemsPanelTemplate>
</ItemsControl.ItemsPanel>
<ItemsControl.ItemTemplate>
<DataTemplate>
<RadioButton
AutomationProperties.Name="{Binding Name}"
IsEnabled="{Binding IsEnabled}"
IsChecked="{Binding IsSelected, Mode=TwoWay}"
Style="{StaticResource SegmentedRadioButtonStyle}"
HorizontalAlignment="Left"
GroupName="GlazeMethodSelectionRadioGroup"
Checked="RadioButton_Checked"
Loaded="RadioButton_Loaded">

<DockPanel HorizontalAlignment="Left">
<Image
DockPanel.Dock="Left"
Source="{Binding IconPath}"
HorizontalAlignment="Left"
Style="{DynamicResource Icon}" Height="64" Width="64" />
<DockPanel HorizontalAlignment="Left">
<Image
DockPanel.Dock="Left"
Source="{Binding IconPath}"
HorizontalAlignment="Left"
Style="{DynamicResource Icon}" Height="64" Width="64" />

<Grid Margin="8,0,0,0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>
<Grid Margin="8,0,0,0">
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
<RowDefinition Height="Auto" />
</Grid.RowDefinitions>

<TextBlock
Grid.Row="0"
FontSize="{DynamicResource FontSize.Large}"
FontWeight="Bold"
Margin="0,0,0,4"
Text="{Binding Name}" />
<TextBlock
Grid.Row="0"
FontSize="{DynamicResource FontSize.Large}"
FontWeight="Bold"
Margin="0,0,0,4"
Text="{Binding Name}" />

<TextBlock
Grid.Row="1"
FontSize="{DynamicResource FontSize.Medium}"
TextWrapping="Wrap">
<Run Text="{Binding MethodDescription}" />
<Run Text="{Binding Description}" FontStyle="Italic" />
</TextBlock>
<TextBlock
Grid.Row="1"
FontSize="{DynamicResource FontSize.Medium}"
TextWrapping="Wrap">
<Run Text="{Binding MethodDescription}" />
<Run Text="{Binding Description}" FontStyle="Italic" />
</TextBlock>

<TextBlock
Grid.Row="2"
FontStyle="Italic"
Visibility="{Binding ModelPath, Converter={StaticResource nullOrWhitespaceToVisibility}}">
<Run Text="Model:" />
<Hyperlink>
<Run Text="{Binding ModelPath}" />
</Hyperlink>
</TextBlock>
<TextBlock
Grid.Row="2"
FontStyle="Italic"
Visibility="{Binding ModelPath, Converter={StaticResource nullOrWhitespaceToVisibility}}">
<Run Text="Model:" />
<Hyperlink>
<Run Text="{Binding ModelPath}" />
</Hyperlink>
</TextBlock>

<TextBlock
Grid.Row="3"
FontWeight="Bold"
Text="{Binding CurrentStatus}"
Visibility="{Binding CurrentStatus, Converter={StaticResource nullOrWhitespaceToVisibility}}"
Margin="0,4,0,0" />
</Grid>
</DockPanel>
</RadioButton>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</Grid>
<TextBlock
Grid.Row="3"
FontWeight="Bold"
Text="{Binding CurrentStatus}"
Visibility="{Binding CurrentStatus, Converter={StaticResource nullOrWhitespaceToVisibility}}"
Margin="0,4,0,0" />
</Grid>
</DockPanel>
</RadioButton>
</DataTemplate>
</ItemsControl.ItemTemplate>
</ItemsControl>
</Grid>
</Border>
</StackPanel>
</Border>
Expand Down
4 changes: 4 additions & 0 deletions src/Glazier.UI/LoadImageForm.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Linq;
using System.Reflection;
using System.Text;
Expand Down Expand Up @@ -36,6 +37,9 @@ private void RadioButton_Checked(object sender, RoutedEventArgs e)
{
if (sender is RadioButton selectedButton)
{
SelectionHighlight.UpdateLayout();
GlazeMethodSelector.InvalidateArrange();

Animator.SelectAlgorithmRadioButton(selectedButton, this.GlazeMethodSelector, this.HighlightTransform, this.SelectionHighlight);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Glazier.UI/Themes/Dark.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
<SolidColorBrush x:Key="MouseOverImageBorderBrush" Color="Orange"/>

<SolidColorBrush x:Key="AlgorithmSelectorButtonBackgroundBrush" Color="Bisque"/>
<SolidColorBrush x:Key="AlgorithmSelectorButtonBorderBrush" Color="Red"/>
<SolidColorBrush x:Key="AlgorithmSelectorButtonTextForegroundBrush" Color="Black"/>
<SolidColorBrush x:Key="AlgorithmSelectorCheckedButtonBackgroundBrush" Color="Orange"/>
<SolidColorBrush x:Key="AlgorithmSelectorCheckedButtonTextForegroundBrush" Color="Red"/>
<SolidColorBrush x:Key="AlgorithmSelectorMouseOverButtonTextForegroundBrush" Color="Red"/>


<LinearGradientBrush x:Key="SplitterBrush" StartPoint="0,0" EndPoint="1,1">
Expand Down
2 changes: 1 addition & 1 deletion src/Glazier.UI/Themes/HighContrast.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<SolidColorBrush x:Key="ToolbarBorderBrush" Color="DarkGray"/>
<SolidColorBrush x:Key="MouseOverImageBorderBrush" Color="{DynamicResource SystemColors.ActiveBorder}"/>

<SolidColorBrush x:Key="AlgorithmSelectorButtonBackgroundBrush" Color="Transparent"/>
<SolidColorBrush x:Key="AlgorithmSelectorButtonBackgroundBrush" Color="Bisque"/>
<SolidColorBrush x:Key="AlgorithmSelectorButtonBorderBrush" Color="Red"/>
<SolidColorBrush x:Key="AlgorithmSelectorButtonTextForegroundBrush" Color="Black"/>
<SolidColorBrush x:Key="AlgorithmSelectorCheckedButtonBackgroundBrush" Color="Orange"/>
Expand Down
2 changes: 1 addition & 1 deletion src/Glazier.UI/Themes/Light.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<SolidColorBrush x:Key="ToolbarBorderBrush" Color="DarkGray"/>
<SolidColorBrush x:Key="MouseOverImageBorderBrush" Color="Green"/>

<SolidColorBrush x:Key="AlgorithmSelectorButtonBackgroundBrush" Color="Transparent"/>
<SolidColorBrush x:Key="AlgorithmSelectorButtonBackgroundBrush" Color="Bisque"/>
<SolidColorBrush x:Key="AlgorithmSelectorButtonBorderBrush" Color="Red"/>
<SolidColorBrush x:Key="AlgorithmSelectorButtonTextForegroundBrush" Color="Black"/>
<SolidColorBrush x:Key="AlgorithmSelectorCheckedButtonBackgroundBrush" Color="Orange"/>
Expand Down
1 change: 1 addition & 0 deletions src/Glazier.UI/Themes/Universal.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,7 @@
</ControlTemplate>
</Setter.Value>
</Setter>
<Setter Property="MinHeight" Value="100" />
<Setter Property="BorderBrush" Value="Transparent" />
<Setter Property="Foreground" Value="{DynamicResource AlgorithmSelectorButtonTextForegroundBrush}"/>
<Style.Triggers>
Expand Down
Loading