From f68365b0ee595785597e3d6d704c5131d41bd2c5 Mon Sep 17 00:00:00 2001
From: clueless <14300910+theClueless@users.noreply.github.com>
Date: Thu, 12 Mar 2020 01:49:24 +0200
Subject: [PATCH 1/2] fix issue #115
---
Plugins/HelloWorldCSharp/App.config | 6 ------
Plugins/HelloWorldCSharp/HelloWorldCSharp.csproj | 1 -
Wox.Plugin/IPublicAPI.cs | 11 ++++++++++-
Wox.sln | 4 ++--
Wox/PublicAPIInstance.cs | 7 ++++++-
5 files changed, 18 insertions(+), 11 deletions(-)
delete mode 100644 Plugins/HelloWorldCSharp/App.config
diff --git a/Plugins/HelloWorldCSharp/App.config b/Plugins/HelloWorldCSharp/App.config
deleted file mode 100644
index 8d234373a..000000000
--- a/Plugins/HelloWorldCSharp/App.config
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/Plugins/HelloWorldCSharp/HelloWorldCSharp.csproj b/Plugins/HelloWorldCSharp/HelloWorldCSharp.csproj
index 143052a03..49f3bf88f 100644
--- a/Plugins/HelloWorldCSharp/HelloWorldCSharp.csproj
+++ b/Plugins/HelloWorldCSharp/HelloWorldCSharp.csproj
@@ -11,7 +11,6 @@
HelloWorldCSharp
v4.6.2
512
- true
diff --git a/Wox.Plugin/IPublicAPI.cs b/Wox.Plugin/IPublicAPI.cs
index 754b76d36..3c5b34277 100644
--- a/Wox.Plugin/IPublicAPI.cs
+++ b/Wox.Plugin/IPublicAPI.cs
@@ -81,7 +81,16 @@ public interface IPublicAPI
/// Message title
/// Message subtitle
/// Message icon path (relative path to your plugin folder)
- void ShowMsg(string title, string subTitle = "", string iconPath = "", bool useMainWindowAsOwner = true);
+ void ShowMsg(string title, string subTitle = "", string iconPath = "");
+
+ ///
+ /// Show message box
+ ///
+ /// Message title
+ /// Message subtitle
+ /// Message icon path (relative path to your plugin folder)
+ /// when true will use main windows as the owner
+ void ShowMsg(string title, string subTitle, string iconPath, bool useMainWindowAsOwner = true);
///
/// Open setting dialog
diff --git a/Wox.sln b/Wox.sln
index cbceab9b8..a8a42ae8d 100644
--- a/Wox.sln
+++ b/Wox.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.271
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.29806.167
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wox.Test", "Wox.Test\Wox.Test.csproj", "{FF742965-9A80-41A5-B042-D6C7D3A21708}"
ProjectSection(ProjectDependencies) = postProject
diff --git a/Wox/PublicAPIInstance.cs b/Wox/PublicAPIInstance.cs
index 58915f87b..6c17be5c5 100644
--- a/Wox/PublicAPIInstance.cs
+++ b/Wox/PublicAPIInstance.cs
@@ -97,7 +97,12 @@ public void ShowApp()
_mainVM.MainWindowVisibility = Visibility.Visible;
}
- public void ShowMsg(string title, string subTitle = "", string iconPath = "", bool useMainWindowAsOwner = true)
+ public void ShowMsg(string title, string subTitle = "", string iconPath = "")
+ {
+ ShowMsg(title, subTitle, iconPath, true);
+ }
+
+ public void ShowMsg(string title, string subTitle, string iconPath, bool useMainWindowAsOwner = true)
{
Application.Current.Dispatcher.Invoke(() =>
{
From 98ed4e7b593b5ee3c3376b29866e5a1834b17a78 Mon Sep 17 00:00:00 2001
From: clueless <14300910+theClueless@users.noreply.github.com>
Date: Thu, 12 Mar 2020 01:54:30 +0200
Subject: [PATCH 2/2] app config remove
---
Plugins/HelloWorldCSharp/HelloWorldCSharp.csproj | 1 -
1 file changed, 1 deletion(-)
diff --git a/Plugins/HelloWorldCSharp/HelloWorldCSharp.csproj b/Plugins/HelloWorldCSharp/HelloWorldCSharp.csproj
index 49f3bf88f..827c74170 100644
--- a/Plugins/HelloWorldCSharp/HelloWorldCSharp.csproj
+++ b/Plugins/HelloWorldCSharp/HelloWorldCSharp.csproj
@@ -52,7 +52,6 @@
-
PreserveNewest