Fix gtk bug

junian · May 25, 2018 · 0da5e45 · 0da5e45
1 parent 9aaaa1f
commit 0da5e45
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 5 deletions.
diff --git a/src/Termission.EtoForms/Forms/MainForm.cs b/src/Termission.EtoForms/Forms/MainForm.cs
@@ -148,7 +148,7 @@ private TrayIndicator CreateTrayIndicator()
         {
             var tray = new TrayIndicator
             {
-                Image = DesktopAppResources.DevAppIcon,
+                Image = !Platform.IsGtk ? DesktopAppResources.DevAppIcon : DesktopAppResources.DevAppLogo,
                 Title = CoreApp.AssemblyProduct
             };
 

diff --git a/src/Termission.EtoForms/MainApplication.cs b/src/Termission.EtoForms/MainApplication.cs
@@ -87,7 +87,10 @@ public void RegisterServices()
         {
             // Register all Services here
             ServiceLocator.Current.Register<ICrossDialog, CrossDialog>();
-            ServiceLocator.Current.Register<INotificationService, NotificationService>();
+            if(Platform.Supports<Notification>())
+                ServiceLocator.Current.Register<INotificationService, NotificationService>();
+            else
+                ServiceLocator.Current.Register<INotificationService, CrossDialog>();
             ServiceLocator.Current.Register<IJavaScriptBotEngine, JSJintScriptEngine>();
             ServiceLocator.Current.Register<INetworkEngine, TermSharpEngine>();
             ServiceLocator.Current.Register<ISystemService, EtoSystemService>();

diff --git a/src/Termission.EtoForms/Services/CrossDialog.cs b/src/Termission.EtoForms/Services/CrossDialog.cs
@@ -5,7 +5,7 @@
 
 namespace Juniansoft.Termission.EtoForms.Services
 {
-    public class CrossDialog: ICrossDialog
+    public class CrossDialog: ICrossDialog, INotificationService
     {
         public Task<string> ShowOpenDialogAsync(string extension = "json", string typename = "JSON Files")
         {
@@ -54,5 +54,10 @@ public async Task ShowMessageBoxAsync(string message)
         {
             await Task.Run(() => MessageBox.Show(message));
         }
+
+        public void Show(string title, string message)
+        {
+            MessageBox.Show(message, title);
+        }
     }
 }
diff --git a/src/Termission.Wpf/Program.cs b/src/Termission.Wpf/Program.cs
@@ -15,7 +15,7 @@
 
 namespace Termission.Wpf
 {
-	class MainClass
+	class Program
 	{
 		[STAThread]
 		public static void Main(string[] args)

diff --git a/src/Termission.XamMac/Program.cs b/src/Termission.XamMac/Program.cs
@@ -17,7 +17,7 @@
 
 namespace Juniansoft.Termission.XamMac
 {
-	static class MainClass
+	static class Program
 	{
 		static void Main(string[] args)
 		{