Merge branch 'dev'

This commit is contained in:
bao-qian 2016-07-30 16:17:13 +01:00
commit fc56027929
2 changed files with 2 additions and 2 deletions

View file

@ -13,7 +13,7 @@ namespace Wox.Plugin.WebSearch
public string ActionKeyword { get; set; }
[NotNull]
public string Icon { private get; set; } = DefaultIcon;
public string Icon { get; set; } = DefaultIcon;
/// <summary>
/// All icon should be put under Images directory

View file

@ -119,7 +119,7 @@ namespace Wox.Plugin.WebSearch
private void OnSelectIconClick(object sender, RoutedEventArgs e)
{
var directory = Path.Combine(Main.ImagesDirectory, Main.Images);
var directory = Main.ImagesDirectory;
const string filter = "Image files (*.jpg, *.jpeg, *.gif, *.png, *.bmp) |*.jpg; *.jpeg; *.gif; *.png; *.bmp";
var dialog = new OpenFileDialog {InitialDirectory = directory, Filter = filter};