SLBr 2022.3.20.0 Code

SLT-World · Mar 20, 2022 · 3dc5c31 · 3dc5c31
1 parent 73bc36f
commit 3dc5c31
Show file tree

Hide file tree

Showing 43 changed files with 1,267 additions and 432 deletions.
diff --git a/SLBr/SLBr/App.config b/SLBr/SLBr/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
-</configuration>
+</configuration>
diff --git a/SLBr/SLBr/App.xaml.cs b/SLBr/SLBr/App.xaml.cs
@@ -1,5 +1,5 @@
 // Copyright © 2022 SLT World. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+// Use of this source code is governed by a GNU license that can be found in the LICENSE file.
 using System;
 using System.Collections.Generic;
 using System.Configuration;

diff --git a/SLBr/SLBr/Favourite.cs b/SLBr/SLBr/Favourite.cs
@@ -1,16 +1,45 @@
 // Copyright © 2022 SLT World. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+// Use of this source code is governed by a GNU license that can be found in the LICENSE file.
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace SLBr
 {
-    public class Favourite
+    public class Favourite : INotifyPropertyChanged
     {
-        public string Name { get; set; }
-        public string Arguments { get; set; }
+        #region INotifyPropertyChanged
+        public event PropertyChangedEventHandler PropertyChanged = delegate { };
+
+        private void RaisePropertyChanged(string Name)
+        {
+            PropertyChanged(this, new PropertyChangedEventArgs(Name));
+        }
+        #endregion
+
+        public string Name
+        {
+            get { return DName; }
+            set
+            {
+                DName = value;
+                RaisePropertyChanged("Name");
+            }
+        }
+        public string Arguments
+        {
+            get { return DArguments; }
+            set
+            {
+                DArguments = value;
+                RaisePropertyChanged("Arguments");
+            }
+        }
+
+        public string DName { get; set; }
+        public string DArguments { get; set; }
     }
 }
diff --git a/SLBr/SLBr/FileAssociation.cs b/SLBr/SLBr/FileAssociation.cs
@@ -1,5 +1,5 @@
 // Copyright © 2022 SLT World. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+// Use of this source code is governed by a GNU license that can be found in the LICENSE file.
 using Microsoft.Win32;
 using System;
 using System.Collections.Generic;

diff --git a/SLBr/SLBr/Handlers/ContextMenuHandler.cs b/SLBr/SLBr/Handlers/ContextMenuHandler.cs
@@ -1,5 +1,5 @@
 // Copyright © 2022 SLT World. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+// Use of this source code is governed by a GNU license that can be found in the LICENSE file.
 
 using CefSharp;
 using CefSharp.Wpf;
@@ -22,23 +22,31 @@ public void OnBeforeContextMenu(IWebBrowser chromiumWebBrowser, IBrowser browser
             {
                 if (!string.IsNullOrEmpty(parameters.SelectionText))
                 {
-                    model.AddItem((CefMenuCommand)26501, "Search for text in new tab");
-                    model.AddSeparator();
-                    model.AddItem(CefMenuCommand.NotFound, "Close Menu");
-                    /*model.AddItem(CefMenuCommand.NotFound, "Close Menu");
-                    model.AddSeparator();
-                    model.Clear();
-                    model.AddItem(CefMenuCommand.Copy, "Copy");
-                    model.AddItem((CefMenuCommand)26501, "Save as");*/
+                    if (Utils.IsHttpScheme(parameters.SelectionText) || Utils.IsSchemeNotHttp(parameters.SelectionText))
+                    {
+                        //model.Clear();
+                        model.AddItem((CefMenuCommand)26501, "Open in new tab");
+                        model.AddSeparator();
+                        model.AddItem(CefMenuCommand.NotFound, "Cancel");
+                    }
+                    else
+                    {
+                        model.AddItem((CefMenuCommand)26501, "Search for text in new tab");
+                        model.AddSeparator();
+                        model.AddItem(CefMenuCommand.NotFound, "Cancel");
+                        /*model.AddItem(CefMenuCommand.NotFound, "Close Menu");
+                        model.AddSeparator();
+                        model.Clear();
+                        model.AddItem(CefMenuCommand.Copy, "Copy");
+                        model.AddItem((CefMenuCommand)26501, "Save as");*/
+                    }
                 }
                 else
                 {
                     model.Remove(CefMenuCommand.Print);
                     model.Remove(CefMenuCommand.ViewSource);
                     model.AddItem(CefMenuCommand.Reload, "Refresh");
                     model.AddSeparator();
-                    model.AddItem(CefMenuCommand.NotFound, "Close Menu");
-                    model.AddSeparator();
                     model.AddItem((CefMenuCommand)26501, "Zoom In");
                     model.AddItem((CefMenuCommand)26502, "Zoom Out");
                     model.AddItem((CefMenuCommand)26503, "Reset Zoom Level");
@@ -59,15 +67,17 @@ public void OnBeforeContextMenu(IWebBrowser chromiumWebBrowser, IBrowser browser
                     model.AddItem((CefMenuCommand)26507, "Search page on SafeBrowsing");
                     model.AddItem((CefMenuCommand)26504, "View page source");
                     model.AddItem((CefMenuCommand)26505, "Inspect");
+                    model.AddSeparator();
+                    model.AddItem(CefMenuCommand.NotFound, "Cancel");
                 }
             }
             else
             {
-                model.AddItem(CefMenuCommand.NotFound, "Close Menu");
-                model.AddSeparator();
                 model.Clear();
                 model.AddItem(CefMenuCommand.Copy, "Copy");
                 model.AddItem((CefMenuCommand)26501, "Save as");
+                model.AddSeparator();
+                model.AddItem(CefMenuCommand.NotFound, "Cancel");
                 //model.AddItem((CefMenuCommand)26502, "Open in paintbrush");
             }
         }
@@ -83,8 +93,21 @@ public bool OnContextMenuCommand(IWebBrowser chromiumWebBrowser, IBrowser browse
                 {
                     if (!string.IsNullOrEmpty(SelectedText))
                     {
-                        if (commandId == (CefMenuCommand)26501)
-                            MainWindow.Instance.CreateTab(MainWindow.Instance.CreateWebBrowser(string.Format(MainWindow.Instance.MainSave.Get("Search_Engine"), SelectedText.Trim().Replace(" ", "+"))));
+                        if (Utils.IsHttpScheme(SelectedText) || Utils.IsSchemeNotHttp(SelectedText))
+                        {
+                            if (commandId == (CefMenuCommand)26501)
+                                MainWindow.Instance.CreateTab(MainWindow.Instance.CreateWebBrowser(SelectedText));
+                        }
+                        else
+                        {
+                            if (commandId == (CefMenuCommand)26501)
+                                MainWindow.Instance.CreateTab(MainWindow.Instance.CreateWebBrowser(string.Format(MainWindow.Instance.MainSave.Get("Search_Engine"), SelectedText.Trim().Replace(" ", "+"))));
+                            /*model.AddItem(CefMenuCommand.NotFound, "Close Menu");
+                            model.AddSeparator();
+                            model.Clear();
+                            model.AddItem(CefMenuCommand.Copy, "Copy");
+                            model.AddItem((CefMenuCommand)26501, "Save as");*/
+                        }
                     }
                     else
                     {

diff --git a/SLBr/SLBr/Handlers/DownloadHandler.cs b/SLBr/SLBr/Handlers/DownloadHandler.cs
@@ -1,5 +1,5 @@
 // Copyright © 2022 SLT World. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+// Use of this source code is governed by a GNU license that can be found in the LICENSE file.
 using CefSharp;
 //using Microsoft.Win32;
 using System;
@@ -81,11 +81,13 @@ public void OnDownloadUpdated(IWebBrowser chromiumWebBrowser, IBrowser browser,
             {
                 if (downloadItem.IsComplete)
                 {
-                    MainWindow.Instance.DownloadProgressText.Visibility = Visibility.Collapsed;
+                    /*MainWindow.Instance.DownloadProgressText.Visibility = Visibility.Collapsed;
                     MainWindow.Instance.DownloadProgressBar.Visibility = Visibility.Collapsed;
                     //browser.CloseBrowser(true);
                     MainWindow.Instance.DownloadOpenFileButton.Visibility = Visibility.Visible;
-                    MainWindow.Instance.DownloadOpenFileButton.Tag = $"13<,>{downloadItem.FullPath}";
+                    MainWindow.Instance.DownloadOpenFileButton.Tag = $"13<,>{downloadItem.FullPath}";*/
+                    MainWindow.Instance.DownloadContainer.Visibility = Visibility.Collapsed;
+                    MainWindow.Instance.Prompt($"The file \"{Path.GetFileName(downloadItem.FullPath)}\" finished downloading.", true, "Open In Explorer", $"13<,>{downloadItem.FullPath}", downloadItem.FullPath, true, "\xE896");
                 }
                 else
                 {

diff --git a/SLBr/SLBr/Handlers/JSBindingHandler.cs b/SLBr/SLBr/Handlers/JSBindingHandler.cs
@@ -1,5 +1,5 @@
 // Copyright © 2022 SLT World. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+// Use of this source code is governed by a GNU license that can be found in the LICENSE file.
 using CefSharp;
 using System;
 using System.Collections.Generic;

diff --git a/SLBr/SLBr/Handlers/JsDialogHandler.cs b/SLBr/SLBr/Handlers/JsDialogHandler.cs
@@ -0,0 +1,40 @@
+using CefSharp;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace SLBr
+{
+    public class JsDialogHandler : IJsDialogHandler
+    {
+        public bool OnBeforeUnloadDialog(IWebBrowser chromiumWebBrowser, IBrowser browser, string messageText, bool isReload, IJsDialogCallback callback)
+        {
+            return false;
+        }
+
+        public void OnDialogClosed(IWebBrowser chromiumWebBrowser, IBrowser browser)
+        {
+        }
+
+        public bool OnJSDialog(IWebBrowser chromiumWebBrowser, IBrowser browser, string originUrl, CefJsDialogType dialogType, string messageText, string defaultPromptText, IJsDialogCallback callback, ref bool suppressMessage)
+        {
+            //Plan to override default dialog
+
+            //Remove dialog from showing
+            //callback.Continue(true);
+            //return true;
+
+            //Surpress dialog
+            //suppressMessage = true;
+            //return false;
+
+            return false;
+        }
+
+        public void OnResetDialogState(IWebBrowser chromiumWebBrowser, IBrowser browser)
+        {
+        }
+    }
+}
diff --git a/SLBr/SLBr/Handlers/KeyboardHandler.cs b/SLBr/SLBr/Handlers/KeyboardHandler.cs
@@ -1,5 +1,5 @@
 // Copyright © 2022 SLT World. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+// Use of this source code is governed by a GNU license that can be found in the LICENSE file.
 using CefSharp;
 using System;
 using System.Collections.Generic;

diff --git a/SLBr/SLBr/Handlers/LifeSpanHandler.cs b/SLBr/SLBr/Handlers/LifeSpanHandler.cs
@@ -1,5 +1,5 @@
 // Copyright © 2022 SLT World. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+// Use of this source code is governed by a GNU license that can be found in the LICENSE file.
 using CefSharp;
 using System;
 using System.Collections.Generic;

diff --git a/SLBr/SLBr/Handlers/RequestHandler.cs b/SLBr/SLBr/Handlers/RequestHandler.cs
@@ -1,5 +1,5 @@
 // Copyright © 2022 SLT World. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+// Use of this source code is governed by a GNU license that can be found in the LICENSE file.
 using CefSharp;
 using System;
 using System.Collections.Generic;
@@ -24,7 +24,7 @@ public bool OnBeforeBrowse(IWebBrowser chromiumWebBrowser, IBrowser browser, IFr
 		{
 			if (request.Url.Contains("roblox.com"))
 				return true;
-			if ((isRedirect || userGesture || frame.IsMain) && !Utils.IsSystemUrl(request.Url) && !Utils.IsProgramUrl(request.Url))
+			if (Utils.CanCheck(request.TransitionType) && !Utils.IsSystemUrl(request.Url) && !Utils.IsProgramUrl(request.Url))//(isRedirect || userGesture || frame.IsMain)
 			{
 				string Response = MainWindow.Instance._SafeBrowsing.Response(request.Url.Replace("https://googleweblight.com/?lite_url=", ""));
 				Utils.SafeBrowsing.ThreatType _ThreatType = Utils.CheckForInternetConnection() ? MainWindow.Instance._SafeBrowsing.GetThreatType(Response) : Utils.SafeBrowsing.ThreatType.Unknown;

diff --git a/SLBr/SLBr/Handlers/ResourceRequestHandler.cs b/SLBr/SLBr/Handlers/ResourceRequestHandler.cs
@@ -1,5 +1,5 @@
 // Copyright © 2022 SLT World. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be found in the LICENSE file.
+// Use of this source code is governed by a GNU license that can be found in the LICENSE file.
 using CefSharp;
 using Newtonsoft.Json.Linq;
 using System;
@@ -37,6 +37,19 @@ public IResponseFilter GetResourceResponseFilter(IWebBrowser chromiumWebBrowser,
 
         public CefReturnValue OnBeforeResourceLoad(IWebBrowser chromiumWebBrowser, IBrowser browser, IFrame frame, IRequest request, IRequestCallback callback)
         {
+            /*try
+            {
+                if (Utils.CanCheck(request.TransitionType))
+                {
+                    if (Utils.CleanUrl(request.Url).Contains("facebook.com"))
+                        request.SetHeaderByName("user-agent", MainWindow.Instance.UserAgent.Replace($"Chromium", "Chrome"), true);
+                    else if (Utils.CleanUrl(request.Url).Contains("web.whatsapp.com"))
+                        request.SetHeaderByName("user-agent", MainWindow.Instance.UserAgent.Replace($"Chromium", "Chrome"), true);
+                    else if (Utils.CleanUrl(request.Url).Contains("mail.google.com") || Utils.CleanUrl(request.Url).Contains("web.whatsapp.com"))
+                        request.SetHeaderByName("user-agent", MainWindow.Instance.UserAgent.Replace($"SLBr {MainWindow.Instance.ReleaseVersion}", "").Replace($"Chromium", "Chrome"), true);
+                }
+            }
+            catch { }*/
             //Chrome Web Store Experiment
             //request.SetHeaderByName("user-agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.102 Safari/537.36 Edg/98.0.1108.62", false);
             //request.SetHeaderByName("sec-ch-ua", "\" Not A; Brand\";v=\"99\", \"Chromium\";v=\"98\", \"Microsoft Edge\";v=\"98\"", false);