Mirrors/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2026-04-05 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

UI improvements

Browse Source
This commit is contained in:
Niels Laute
2020-11-08 20:09:07 +01:00
parent 14f905dbfd
commit aafab46456
12 changed files with 78 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/modules/imageresizer/ui/Properties/Resources.Designer.cs generated
View File

@@ -276,6 +276,15 @@ namespace ImageResizer.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to Height.
/// </summary>
public static string Height {
get {
return ResourceManager.GetString("Height", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Image Resizer.
/// </summary>
@@ -555,6 +564,15 @@ namespace ImageResizer.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to Resize type.
/// </summary>
public static string Resize_Type {
get {
return ResourceManager.GetString("Resize_Type", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Fill.
/// </summary>
@@ -735,6 +753,15 @@ namespace ImageResizer.Properties {
}
}
/// <summary>
/// Looks up a localized string similar to Unit.
/// </summary>
public static string Unit {
get {
return ResourceManager.GetString("Unit", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Value must be between &apos;{0}&apos; and &apos;{1}&apos;..
/// </summary>
@@ -752,5 +779,14 @@ namespace ImageResizer.Properties {
return ResourceManager.GetString("Version", resourceCulture);
}
}
/// <summary>
/// Looks up a localized string similar to Width.
/// </summary>
public static string Width {
get {
return ResourceManager.GetString("Width", resourceCulture);
}
}
}
}

12
src/modules/imageresizer/ui/Properties/Resources.resx
View File

@@ -189,6 +189,9 @@
<data name="Copyright" xml:space="preserve">
<value>© 2020 Brice Lambson. All rights reserved.</value>
</data>
<data name="Height" xml:space="preserve">
<value>Height</value>
</data>
<data name="ImageResizer" xml:space="preserve">
<value>Image Resizer</value>
</data>
@@ -312,6 +315,9 @@
<data name="Resize_Tooltip" xml:space="preserve">
<value>Resize pictures</value>
</data>
<data name="Resize_Type" xml:space="preserve">
<value>Resize type</value>
</data>
<data name="Results_Close" xml:space="preserve">
<value>Close</value>
</data>
@@ -342,10 +348,16 @@
<data name="TiffCompressOption_Zip" xml:space="preserve">
<value>Zip</value>
</data>
<data name="Unit" xml:space="preserve">
<value>Unit</value>
</data>
<data name="ValueMustBeBetween" xml:space="preserve">
<value>Value must be between '{0}' and '{1}'.</value>
</data>
<data name="Version" xml:space="preserve">
<value>Version</value>
</data>
<data name="Width" xml:space="preserve">
<value>Width</value>
</data>
</root>

1
src/modules/imageresizer/ui/Themes/Dark.xaml
View File

@@ -19,4 +19,5 @@
<SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FF000000" />
<SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FFFFFFFF" />
<SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FF999999" />
<SolidColorBrush x:Key="PrimaryBorderBrush" Color="Transparent"/>
</ResourceDictionary>

1
src/modules/imageresizer/ui/Themes/HighContrast1.xaml
View File

@@ -19,4 +19,5 @@
<SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FF000000" />
<SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FFffff00" />
<SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FF00ff00" />
<SolidColorBrush x:Key="PrimaryBorderBrush" Color="Transparent"/>
</ResourceDictionary>

1
src/modules/imageresizer/ui/Themes/HighContrast2.xaml
View File

@@ -20,4 +20,5 @@
<SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FF000000" />
<SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FF00ff00" />
<SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FFc0c0c0" />
<SolidColorBrush x:Key="PrimaryBorderBrush" Color="Transparent"/>
</ResourceDictionary>

1
src/modules/imageresizer/ui/Themes/HighContrastBlack.xaml
View File

@@ -19,4 +19,5 @@
<SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FF000000" />
<SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FFffffff" />
<SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FF1aebff" />
<SolidColorBrush x:Key="PrimaryBorderBrush" Color="Transparent"/>
</ResourceDictionary>

1
src/modules/imageresizer/ui/Themes/HighContrastWhite.xaml
View File

@@ -19,4 +19,5 @@
<SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FFFFFFFF" />
<SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FF000000" />
<SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FF7d7d7d" />
<SolidColorBrush x:Key="PrimaryBorderBrush" Color="Transparent"/>
</ResourceDictionary>

1
src/modules/imageresizer/ui/Themes/Light.xaml
View File

@@ -19,4 +19,5 @@
<SolidColorBrush x:Key="PrimaryBackgroundBrush" Color="#FFFFFFFF" />
<SolidColorBrush x:Key="PrimaryForegroundBrush" Color="#FF000000" />
<SolidColorBrush x:Key="SecondaryForegroundBrush" Color="#FF7d7d7d" />
<SolidColorBrush x:Key="PrimaryBorderBrush" Color="Transparent"/>
</ResourceDictionary>

8
src/modules/imageresizer/ui/Views/AdvancedWindow.xaml
View File

@@ -6,7 +6,7 @@
xmlns:p="clr-namespace:ImageResizer.Properties"
xmlns:sys="clr-namespace:System;assembly=mscorlib"
xmlns:ui="http://schemas.modernwpf.com/2019"
MinWidth="390"
MinWidth="560"
MinHeight="340"
ui:WindowHelper.UseModernWindowStyle="True"
ui:TitleBar.IsIconVisible="True"
@@ -65,6 +65,7 @@
<ComboBox Grid.Column="1"
Margin="8,0,0,0"
ItemsSource="{Binding Source={StaticResource ResizeFitValues}}"
AutomationProperties.Name="{x:Static p:Resources.Resize_Type}"
SelectedItem="{Binding Fit}">
<ComboBox.ItemTemplate>
<DataTemplate DataType="{x:Type m:ResizeFit}">
@@ -76,6 +77,7 @@
Width="56"
MaxWidth="56"
TextWrapping="Wrap"
AutomationProperties.Name="{x:Static p:Resources.Width}"
Margin="8,0,0,0">
<TextBox.Text>
<Binding Converter="{StaticResource AutoDoubleConverter}"
@@ -96,6 +98,7 @@
Width="56"
MaxWidth="56"
TextWrapping="Wrap"
AutomationProperties.Name="{x:Static p:Resources.Height}"
Margin="8,0,0,0"
Visibility="{Binding ShowHeight,Converter={StaticResource BoolValueConverter}}">
<TextBox.Text>
@@ -111,6 +114,7 @@
<ComboBox Grid.Column="5"
Margin="8,0,0,0"
ItemsSource="{Binding Source={StaticResource ResizeUnitValues}}"
AutomationProperties.Name="{x:Static p:Resources.Unit}"
SelectedItem="{Binding Unit}">
<ComboBox.ItemTemplate>
<DataTemplate DataType="{x:Type m:ResizeUnit}">
@@ -262,6 +266,8 @@
</TabControl>
<Border Grid.Row="1"
Margin="0,24,0,0"
BorderBrush="{DynamicResource PrimaryBorderBrush}"
BorderThickness="0,1,0,0"
Background="{DynamicResource SecondaryBackgroundBrush}"
Padding="12">

12
src/modules/imageresizer/ui/Views/InputPage.xaml
View File

@@ -37,7 +37,7 @@
Content="{x:Static p:Resources.Input_Content}"
Target="{Binding ElementName=_selectedSizeListBox}"/>
<ListBox Margin="12,12,12,0"
<ListBox Margin="12,24,12,0"
BorderThickness="0"
Background="Transparent"
AutomationProperties.Name="Sizes listbox"
@@ -87,6 +87,7 @@
<ComboBox Margin="8,0,0,0"
ItemsSource="{Binding Source={StaticResource ResizeFitValues}}"
Style="{StaticResource DisabledWhenUnselectedComboBoxStyle}"
AutomationProperties.Name="{x:Static p:Resources.Resize_Type}"
SelectedItem="{Binding Fit}">
<ComboBox.ItemTemplate>
<DataTemplate DataType="{x:Type m:ResizeFit}">
@@ -97,6 +98,7 @@
<TextBox Width="56"
TextWrapping="Wrap"
Style="{StaticResource DisabledWhenUnselectedTextBoxStyle}"
AutomationProperties.Name="{x:Static p:Resources.Width}"
Margin="8,0,0,0">
<TextBox.Text>
<Binding Converter="{StaticResource AutoDoubleConverter}"
@@ -115,6 +117,7 @@
<TextBox Width="56"
Style="{StaticResource DisabledWhenUnselectedTextBoxStyle}"
TextWrapping="Wrap"
AutomationProperties.Name="{x:Static p:Resources.Height}"
Visibility="{Binding ShowHeight,Converter={StaticResource BoolValueConverter}}">
<TextBox.Text>
<Binding Converter="{StaticResource AutoDoubleConverter}"
@@ -129,6 +132,7 @@
<ComboBox Margin="8,0,0,0"
ItemsSource="{Binding Source={StaticResource ResizeUnitValues}}"
Style="{StaticResource DisabledWhenUnselectedComboBoxStyle}"
AutomationProperties.Name="{x:Static p:Resources.Unit}"
SelectedItem="{Binding Unit}">
<ComboBox.ItemTemplate>
<DataTemplate DataType="{x:Type m:ResizeUnit}">
@@ -141,7 +145,7 @@
</ListBox.Resources>
</ListBox>
<CheckBox Margin="12,24,12,0"
<CheckBox Margin="12,36,12,0"
Content="{x:Static p:Resources.Input_ShrinkOnly}"
IsChecked="{Binding Settings.ShrinkOnly}"/>
<!-- TODO: This option doesn't make much sense when resizing into a directory. We should swap it for an option
@@ -156,6 +160,8 @@
<Border Margin="0,24,0,0"
Background="{DynamicResource SecondaryBackgroundBrush}"
BorderBrush="{DynamicResource PrimaryBorderBrush}"
BorderThickness="0,1,0,0"
Padding="12">
<Grid>
<Grid.ColumnDefinitions>
@@ -168,7 +174,7 @@
FontFamily="Segoe MDL2 Assets"
Style="{StaticResource DefaultButtonStyle}"
FontSize="16"
Margin="-10,0,0,0"
Margin="-6,0,0,0"
AutomationProperties.Name="{x:Static p:Resources.Input_ShowAdvanced}"
ToolTip="{x:Static p:Resources.Input_ShowAdvanced}"
Background="Transparent"

7
src/modules/imageresizer/ui/Views/ProgressPage.xaml
View File

@@ -20,14 +20,19 @@
<StackPanel>
<TextBlock Margin="12,12,12,0"
FontSize="16"
Foreground="{DynamicResource PrimaryForegroundBrush}"
Text="{x:Static p:Resources.Progress_MainInstruction}"/>
<TextBlock Margin="12,12,12,0" Text="{Binding TimeRemaining,Converter={StaticResource TimeRemainingConverter}}"/>
<TextBlock Margin="12,12,12,0"
Foreground="{DynamicResource PrimaryForegroundBrush}"
Text="{Binding TimeRemaining,Converter={StaticResource TimeRemainingConverter}}"/>
<ProgressBar Height="16"
Margin="12,12,12,0"
Value="{Binding Progress}"
Maximum="1"/>
<Border Margin="0,12,0,0"
Background="{DynamicResource SecondaryBackgroundBrush}"
BorderBrush="{DynamicResource PrimaryBorderBrush}"
BorderThickness="0,1,0,0"
Padding="12,12">
<StackPanel HorizontalAlignment="Right" Orientation="Horizontal">
<Button MinWidth="76"

3
src/modules/imageresizer/ui/Views/ResultsPage.xaml
View File

@@ -8,6 +8,7 @@
<StackPanel>
<TextBlock Margin="12,12,12,0"
FontSize="16"
Foreground="{DynamicResource PrimaryForegroundBrush}"
Text="{x:Static p:Resources.Results_MainInstruction}"/>
<ScrollViewer MaxWidth="363"
MaxHeight="350"
@@ -28,7 +29,7 @@
</ScrollViewer>
<Border Margin="0,12,0,0"
Background="{DynamicResource SecondaryBackgroundBrush}"
BorderBrush="{DynamicResource {x:Static SystemColors.ControlLightBrushKey}}"
BorderBrush="{DynamicResource PrimaryBorderBrush}"
BorderThickness="0,1,0,0"
Padding="12,12">
<StackPanel HorizontalAlignment="Right" Orientation="Horizontal">