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

[fxcop] image resizer ui (#6841)

Browse Source 
* adjustments

* Settings fixed

* Getting resizing tests operational again

* fixed default vs loading from settings

* one small tewak
This commit is contained in:
Clint Rutkas
2020-10-01 11:33:23 -07:00
committed by GitHub
parent 19b519638f
commit c219fe0d1d
21 changed files with 141 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/modules/imageresizer/ui/Views/ContainerFormatConverter.cs
View File

@@ -15,7 +15,7 @@ namespace ImageResizer.Views
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
=> AdvancedViewModel.EncoderMap.TryGetValue((Guid)value, out var result)
? result
: value.ToString();
: value?.ToString();
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
=> throw new NotImplementedException();

10
src/modules/imageresizer/ui/Views/EnumValueConverter.cs
View File

@@ -15,12 +15,12 @@ namespace ImageResizer.Views
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
var type = value.GetType();
var type = value?.GetType();
var builder = new StringBuilder();
builder
.Append(type.Name)
.Append("_")
.Append('_')
.Append(Enum.GetName(type, value));
var toLower = false;
@@ -31,15 +31,15 @@ namespace ImageResizer.Views
else if (parameter != null)
{
builder
.Append("_")
.Append('_')
.Append(parameter);
}
var targetValue = Resources.ResourceManager.GetString(builder.ToString());
var targetValue = Resources.ResourceManager.GetString(builder.ToString(), culture);
if (toLower)
{
targetValue = targetValue.ToLower();
targetValue = targetValue.ToLower(culture);
}
return targetValue;

3
src/modules/imageresizer/ui/Views/MainWindow.xaml.cs
View File

@@ -39,8 +39,7 @@ namespace ImageResizer.Views
return openFileDialog.FileNames;
}
public void ShowAdvanced(AdvancedViewModel viewModel)
=> viewModel.Close(new AdvancedWindow(viewModel).ShowDialog() == true);
public void ShowAdvanced(AdvancedViewModel viewModel) => viewModel?.Close(new AdvancedWindow(viewModel).ShowDialog() == true);
void IMainView.Close()
=> Dispatcher.Invoke((Action)Close);

2
src/modules/imageresizer/ui/Views/ResizeUnitConverter.cs
View File

@@ -15,7 +15,7 @@ namespace ImageResizer.Views
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
var output = Resources.ResourceManager.GetString(Enum.GetName(typeof(ResizeUnit), value));
var output = Resources.ResourceManager.GetString(Enum.GetName(typeof(ResizeUnit), value), culture);
if ((string)parameter == "ToLower")
{

3
src/modules/imageresizer/ui/Views/TiffCompressOptionConverter.cs
View File

@@ -15,7 +15,8 @@ namespace ImageResizer.Views
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
=> Resources.ResourceManager.GetString(
"TiffCompressOption_" + Enum.GetName(typeof(TiffCompressOption), value));
"TiffCompressOption_" + Enum.GetName(typeof(TiffCompressOption), value),
culture);
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
=> throw new NotImplementedException();

2
src/modules/imageresizer/ui/Views/TimeRemainingConverter.cs
View File

@@ -36,7 +36,7 @@ namespace ImageResizer.Views
return string.Format(
culture,
Resources.ResourceManager.GetString(builder.ToString()),
Resources.ResourceManager.GetString(builder.ToString(), culture),
timeRemaining.Hours,
timeRemaining.Minutes,
timeRemaining.Seconds);