diff --git a/Plugins/Wox.Plugin.Program/AddProgramSource.xaml.cs b/Plugins/Wox.Plugin.Program/AddProgramSource.xaml.cs index 97456bea19..b959cc5183 100644 --- a/Plugins/Wox.Plugin.Program/AddProgramSource.xaml.cs +++ b/Plugins/Wox.Plugin.Program/AddProgramSource.xaml.cs @@ -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 { diff --git a/Plugins/Wox.Plugin.Program/ProgramSetting.xaml b/Plugins/Wox.Plugin.Program/ProgramSetting.xaml index af8616cab3..5711e23835 100644 --- a/Plugins/Wox.Plugin.Program/ProgramSetting.xaml +++ b/Plugins/Wox.Plugin.Program/ProgramSetting.xaml @@ -28,14 +28,14 @@ - + - + diff --git a/Plugins/Wox.Plugin.Program/StringEmptyConverter.cs b/Plugins/Wox.Plugin.Program/StringEmptyConverter.cs index d098063620..bd28bc9441 100644 --- a/Plugins/Wox.Plugin.Program/StringEmptyConverter.cs +++ b/Plugins/Wox.Plugin.Program/StringEmptyConverter.cs @@ -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; diff --git a/Plugins/Wox.Plugin.Program/SuffixesConverter.cs b/Plugins/Wox.Plugin.Program/SuffixesConverter.cs new file mode 100644 index 0000000000..11d76e5b31 --- /dev/null +++ b/Plugins/Wox.Plugin.Program/SuffixesConverter.cs @@ -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; + } + } +} diff --git a/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj b/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj index 4d2807a9ca..8171b727d5 100644 --- a/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj +++ b/Plugins/Wox.Plugin.Program/Wox.Plugin.Program.csproj @@ -62,6 +62,7 @@ +