Merge branch 'V1.1.0' into dev

This commit is contained in:
qianlifeng
2014-12-12 12:21:23 +08:00
42 changed files with 1603 additions and 121 deletions

View File

@@ -9,7 +9,7 @@ namespace Wox.Plugin
void PushResults(Query query,PluginMetadata plugin, List<Result> results);
bool ShellRun(string cmd);
bool ShellRun(string cmd, bool runAsAdministrator = false);
void ChangeQuery(string query, bool requery = false);

View File

@@ -3,71 +3,78 @@ using System.Collections;
using System.Collections.Generic;
using System.IO;
namespace Wox.Plugin {
namespace Wox.Plugin
{
public class Result {
public string Title { get; set; }
public string SubTitle { get; set; }
public string IcoPath { get; set; }
public class Result
{
public string FullIcoPath
{
get
{
public string Title { get; set; }
public string SubTitle { get; set; }
public string IcoPath { get; set; }
public string FullIcoPath
{
get
{
if (string.IsNullOrEmpty(IcoPath)) return string.Empty;
if (IcoPath.StartsWith("data:"))
{
return IcoPath;
}
if (IcoPath.StartsWith("data:"))
{
return IcoPath;
}
return Path.Combine(PluginDirectory, IcoPath);
}
}
}
}
/// <summary>
/// return true to hide wox after select result
/// </summary>
public Func<ActionContext, bool> Action { get; set; }
public int Score { get; set; }
/// <summary>
/// return true to hide wox after select result
/// </summary>
public Func<ActionContext, bool> Action { get; set; }
/// <summary>
/// Auto add scores for MRU items
/// </summary>
public bool AutoAjustScore { get; set; }
public int Score { get; set; }
//todo: this should be controlled by system, not visible to users
/// <summary>
/// Only resulsts that originQuery match with curren query will be displayed in the panel
/// </summary>
public Query OriginQuery { get; set; }
/// <summary>
/// Auto add scores for MRU items
/// </summary>
public bool AutoAjustScore { get; set; }
/// <summary>
/// Don't set this property if you are developing a plugin
/// </summary>
public string PluginDirectory { get; set; }
//todo: this should be controlled by system, not visible to users
/// <summary>
/// Only resulsts that originQuery match with curren query will be displayed in the panel
/// </summary>
public Query OriginQuery { get; set; }
public new bool Equals(object obj) {
if (obj == null || !(obj is Result)) return false;
/// <summary>
/// Don't set this property if you are developing a plugin
/// </summary>
public string PluginDirectory { get; set; }
Result r = (Result)obj;
return r.Title == Title && r.SubTitle == SubTitle;
}
public new bool Equals(object obj)
{
if (obj == null || !(obj is Result)) return false;
Result r = (Result)obj;
return r.Title == Title && r.SubTitle == SubTitle;
}
public override string ToString()
{
return Title + SubTitle;
}
public override string ToString() {
return Title + SubTitle;
}
public Result()
{
public Result() {
}
}
public Result(string Title = null, string IcoPath = null, string SubTitle = null)
{
this.Title = Title;
this.IcoPath = IcoPath;
this.SubTitle = SubTitle;
}
public Result(string Title = null, string IcoPath = null, string SubTitle = null) {
this.Title = Title;
this.IcoPath = IcoPath;
this.SubTitle = SubTitle;
}
}
public List<Result> ContextMenu { get; set; }
}
}