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

Fix suffixes converter, part 1

Browse Source 
1. fix #568, fix #566 fix #553, fix #559
2. simple refactoring
This commit is contained in:
bao-qian
2016-04-24 02:51:20 +01:00
parent 0ee3d1160a
commit e3a7d0807e
5 changed files with 50 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Plugins/Wox.Plugin.Program/AddProgramSource.xaml.cs
View File

@@ -49,14 +49,15 @@ namespace Wox.Plugin.Program
if(_editing == null)
{
_settings.ProgramSources.Add(new ProgramSource
var source = new ProgramSource
{
Location = Directory.Text,
MaxDepth = max,
Suffixes = Suffixes.Text.Split(ProgramSource.SuffixSeperator),
Type = "FileSystemProgramSource",
Enabled = true
});
};
_settings.ProgramSources.Add(source);
}
else
{

4
Plugins/Wox.Plugin.Program/ProgramSetting.xaml
View File

@@ -28,14 +28,14 @@
<GridViewColumn Header="{DynamicResource wox_plugin_program_location}" Width="250">
<GridViewColumn.CellTemplate>
<DataTemplate>
<TextBlock Text="{Binding Location, ConverterParameter=(null), Converter={program:StringEmptyConverter}}"/>
<TextBlock Text="{Binding Location, ConverterParameter=(null), Converter={program:LocationConverter}}"/>
</DataTemplate>
</GridViewColumn.CellTemplate>
</GridViewColumn>
<GridViewColumn Header="{DynamicResource wox_plugin_program_suffixes_header}" Width="220">
<GridViewColumn.CellTemplate>
<DataTemplate>
<TextBlock Text="{Binding Suffixes, ConverterParameter=(null), Converter={program:StringEmptyConverter}}"/>
<TextBlock Text="{Binding Suffixes, ConverterParameter=(null), Converter={program:SuffixesConvert}}"/>
</DataTemplate>
</GridViewColumn.CellTemplate>
</GridViewColumn>

16
Plugins/Wox.Plugin.Program/StringEmptyConverter.cs
View File

@@ -5,20 +5,26 @@ using System.Windows.Markup;
namespace Wox.Plugin.Program
{
public class StringEmptyConverter : MarkupExtension, IValueConverter
public class LocationConverter : MarkupExtension, IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
return string.IsNullOrEmpty((string)value) ? parameter : value;
var text = value as string;
if (string.IsNullOrEmpty(text))
{
return string.Empty;
}
else
{
return text;
}
}
public object ConvertBack(
object value, Type targetType, object parameter, CultureInfo culture)
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
throw new NotSupportedException();
}
public override object ProvideValue(IServiceProvider serviceProvider)
{
return this;

33
Plugins/Wox.Plugin.Program/SuffixesConverter.cs Normal file
View File

@@ -0,0 +1,33 @@
using System;
using System.Globalization;
using System.Windows.Data;
using System.Windows.Markup;
namespace Wox.Plugin.Program
{
public class SuffixesConvert : MarkupExtension, IValueConverter
{
public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
{
var text = value as string[];
if (text != null)
{
return string.Join("", text);
}
else
{
return string.Empty;
}
}
public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture)
{
throw new NotSupportedException();
}
public override object ProvideValue(IServiceProvider serviceProvider)
{
return this;
}
}
}

1
Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj
View File

@@ -62,6 +62,7 @@
</Compile>
<Compile Include="FileChangeWatcher.cs" />
<Compile Include="IProgramSource.cs" />
<Compile Include="SuffixesConverter.cs" />
<Compile Include="Program.cs" />
<Compile Include="ProgramIndexCache.cs" />
<Compile Include="Programs.cs" />