From f03e0e3bf50ad52d8dd01976d9a8f624c082c4cd Mon Sep 17 00:00:00 2001 From: Diamond Creeper Date: Tue, 16 Apr 2024 01:21:17 +1200 Subject: [PATCH] Update Added a request handler. Changed the way you block sites. Disabled GPU acceleration and GPU vsync. Enabled webgl. Removed the rick roll blocking because I see it pointless. --- WebBrowser/Program.cs | 3 +- WebBrowser/RequestHandler.cs | 114 +++++++++----- WebBrowser/frmBrowser.cs | 49 +----- WebBrowser/frmSettings.Designer.cs | 244 ++++++++++------------------- 4 files changed, 162 insertions(+), 248 deletions(-) diff --git a/WebBrowser/Program.cs b/WebBrowser/Program.cs index 9428bda..c981afc 100644 --- a/WebBrowser/Program.cs +++ b/WebBrowser/Program.cs @@ -75,7 +75,8 @@ namespace XeroBrowser settings.CachePath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData) + @"\CEF"; settings.CefCommandLineArgs.Add("safebrowsing-disable-download-protection", "0"); settings.CefCommandLineArgs.Add("safebrowsing-disable-extension-blacklist", "0"); - settings.CefCommandLineArgs.Add("disable-webgl", "1"); + settings.CefCommandLineArgs.Add("disable-gpu"); // Disable GPU acceleration + settings.CefCommandLineArgs.Add("disable-gpu-vsync"); // Disable GPU vsync /// settings.CefCommandLineArgs.Add("safebrowsing-disable-auto-update", "0"); FileChecker.FolderCheck(); FileChecker.FileCheck(); diff --git a/WebBrowser/RequestHandler.cs b/WebBrowser/RequestHandler.cs index 2e4b1ab..c50044f 100644 --- a/WebBrowser/RequestHandler.cs +++ b/WebBrowser/RequestHandler.cs @@ -1,64 +1,94 @@ using System; +using System.Linq; +using System.Net.Http; using System.Security.Cryptography.X509Certificates; +using System.Threading.Tasks; +using System.Windows.Forms; +using Bunifu.UI.WinForms; using CefSharp; +using CefSharp.WinForms; + namespace XeroBrowser { - public class RequestHandler : IRequestHandler + public class RequestHandler : CefSharp.Handler.RequestHandler { - public bool GetAuthCredentials(IWebBrowser chromiumWebBrowser, IBrowser browser, string originUrl, bool isProxy, string host, int port, string realm, string scheme, IAuthCallback callback) + + // Define arrays with domain names only + private readonly string[] blockedDrms = { "netflix.com", "www.netflix.com", "disneyplus.com", "twitch.tv", "tiktok.com" }; + private readonly string[] incompatibleExtSites = { "chrome.google.com", "addons.mozilla.org", "chromewebstore.google.com" }; + private string[] adDomains; + + public RequestHandler() + { + // Fetch the blocked domains asynchronously when the RequestHandler is instantiated + FetchAdDomainsAsync().ContinueWith(t => adDomains = t.Result); + } + + public async Task FetchAdDomainsAsync() + { + string[] adDomains = Array.Empty(); + + try + { + using (HttpClient client = new HttpClient()) + { + string url = "https://diamondcreeper.org/web-filtering/lists/ads.txt"; + HttpResponseMessage response = await client.GetAsync(url); + + if (response.IsSuccessStatusCode) + { + string content = await response.Content.ReadAsStringAsync(); + string[] adsDomains = content.Split(new[] { "\r\n", "\r", "\n" }, StringSplitOptions.RemoveEmptyEntries); + } + } + } + catch (Exception ex) + { + MessageBox.Show($"Error fetching ad domains: {ex.Message}"); + } + + return adDomains; + } + + protected override bool GetAuthCredentials(IWebBrowser chromiumWebBrowser, IBrowser browser, string originUrl, bool isProxy, string host, int port, string realm, string scheme, IAuthCallback callback) { throw new NotImplementedException(); } - public IResourceRequestHandler GetResourceRequestHandler(IWebBrowser chromiumWebBrowser, IBrowser browser, IFrame frame, IRequest request, bool isNavigation, bool isDownload, string requestInitiator, ref bool disableDefaultHandling) + protected override IResourceRequestHandler GetResourceRequestHandler(IWebBrowser chromiumWebBrowser, IBrowser browser, IFrame frame, IRequest request, bool isNavigation, bool isDownload, string requestInitiator, ref bool disableDefaultHandling) { - throw new NotImplementedException(); + return null; } - public bool OnBeforeBrowse(IWebBrowser chromiumWebBrowser, IBrowser browser, IFrame frame, IRequest request, bool userGesture, bool isRedirect) + protected override bool OnBeforeBrowse(IWebBrowser chromiumWebBrowser, IBrowser browser, IFrame frame, IRequest request, bool userGesture, bool isRedirect) { - throw new NotImplementedException(); - } + Uri requestUri = new Uri(request.Url); + string domain = requestUri.Host.ToLower(); - public bool OnCertificateError(IWebBrowser chromiumWebBrowser, IBrowser browser, CefErrorCode errorCode, string requestUrl, ISslInfo sslInfo, IRequestCallback callback) - { - throw new NotImplementedException(); - } + if (blockedDrms.Contains(domain)) + { + // Cancel the navigation or sub-request + chromiumWebBrowser.LoadHtml("

Error!

The requested site requires a DRM (Digital Rights Management) which Xero Browser does not support!

"); - public void OnDocumentAvailableInMainFrame(IWebBrowser chromiumWebBrowser, IBrowser browser) - { - throw new NotImplementedException(); - } + // Clear the txtSearchOrUrl text box + //txtSearchOrUrl.Text = string.Empty; + } + else if (incompatibleExtSites.Contains(domain)) + { + // Cancel the navigation or sub-request + chromiumWebBrowser.LoadHtml("

Error!

Browser extensions are not supported!

"); - public bool OnOpenUrlFromTab(IWebBrowser chromiumWebBrowser, IBrowser browser, IFrame frame, string targetUrl, WindowOpenDisposition targetDisposition, bool userGesture) - { - throw new NotImplementedException(); - } + // Clear the txtSearchOrUrl text box + //txtSearchOrUrl.Text = string.Empty; + } + else if (adDomains.Contains(domain)) + { + chromiumWebBrowser.LoadHtml("

Ads are blocked!

Ads are blocked in xero browser

"); + return true; + } - public void OnPluginCrashed(IWebBrowser chromiumWebBrowser, IBrowser browser, string pluginPath) - { - throw new NotImplementedException(); - } - - public bool OnQuotaRequest(IWebBrowser chromiumWebBrowser, IBrowser browser, string originUrl, long newSize, IRequestCallback callback) - { - throw new NotImplementedException(); - } - - public void OnRenderProcessTerminated(IWebBrowser chromiumWebBrowser, IBrowser browser, CefTerminationStatus status) - { - throw new NotImplementedException(); - } - - public void OnRenderViewReady(IWebBrowser chromiumWebBrowser, IBrowser browser) - { - throw new NotImplementedException(); - } - - public bool OnSelectClientCertificate(IWebBrowser chromiumWebBrowser, IBrowser browser, bool isProxy, string host, int port, X509Certificate2Collection certificates, ISelectClientCertificateCallback callback) - { - throw new NotImplementedException(); + return false; } } } \ No newline at end of file diff --git a/WebBrowser/frmBrowser.cs b/WebBrowser/frmBrowser.cs index 7fff245..ef67592 100644 --- a/WebBrowser/frmBrowser.cs +++ b/WebBrowser/frmBrowser.cs @@ -13,6 +13,7 @@ using System.Collections.Generic; using System.Threading.Tasks; using XeroBrowser.Properties; using static System.Net.WebRequestMethods; +using System.Linq; // ReSharper disable PossibleNullReferenceException namespace XeroBrowser @@ -29,6 +30,7 @@ namespace XeroBrowser chromiumWebBrowser1.LifeSpanHandler = new LifeSpanHandler(); chromiumWebBrowser1.MenuHandler = new MenuHandler(); chromiumWebBrowser1.DisplayHandler = new DisplayHandler(this); + chromiumWebBrowser1.RequestHandler = new RequestHandler(); string filePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "index.html"); _fileUri = new Uri(filePath); @@ -152,53 +154,6 @@ namespace XeroBrowser - try { - - string[] blockedUrls = { "https://www.youtube.com/watch?v=dQw4w9WgXcQ", "https://www.youtube.com/watch?v=xm3YgoEiEDc", "https://www.youtube.com/watch?v=xvFZjo5PgG0", "https://www.youtube.com/watch?v=O91DT1pR1ew", "https://www.youtube.com/watch?v=o-YBDTqX_ZU", "https://www.youtube.com/watch?v=H8ZH_mkfPUY", "https://www.youtube.com/watch?v=o-YBDTqX_ZU", "https://www.youtube.com/watch?v=xvFZjo5PgG0" }; - string[] blockedDrms = { "https://www.netflix.com/", "http://www.netflix.com/", "https://netflix.com/", "http://netflix.com/", "https://www.disneyplus.com/", "http://www.disneyplus.com/", "https://disneyplus.com/", "http://disneyplus.com/", "https://www.twitch.tv/", "http://www.twitch.tv/", "https://twitch.tv/", "http://twitch.tv/", "https://www.tiktok.com/", "http://www.tiktok.com/", "https://tiktok.com/", "http://tiktok.com/" }; - string[] incompatibleExtSites = { "https://www.chrome.google.com", "https://chrome.google.com", "https://www.addons.mozilla.org", "https://addons.mozilla.org" }; - - string currentAddress = chromiumWebBrowser1.Address; - - if (!_isBlocked) - { - foreach (string blockedDrm in blockedDrms) - { - if (currentAddress.StartsWith(blockedDrm)) - { - chromiumWebBrowser1.Stop(); // cancel the navigation - _isBlocked = true; - chromiumWebBrowser1.LoadHtml("

Error!

", blockedDrm); - break; - } - } - - foreach (string blockedUrl in blockedUrls) - { - if (currentAddress.StartsWith(blockedUrl)) - { - chromiumWebBrowser1.Stop(); // cancel the navigation - _isBlocked = true; - chromiumWebBrowser1.LoadHtml("

Rickroll Blocked!

Being rickrolled is disabled.

", blockedUrl); - break; - } - } - - foreach (string incompatibleExtSite in incompatibleExtSites) - { - if (currentAddress.StartsWith(incompatibleExtSite)) - { - chromiumWebBrowser1.Stop(); // cancel the navigation - _isBlocked = true; - chromiumWebBrowser1.LoadHtml("

Error!

Xero Browser has no extension support (Yet).

", incompatibleExtSite); - break; - } - } - } - - } - catch (System.Net.WebException) { } - catch (ArgumentException) { } } private void chromiumWebBrowser1_TitleChanged(object sender, TitleChangedEventArgs e) diff --git a/WebBrowser/frmSettings.Designer.cs b/WebBrowser/frmSettings.Designer.cs index c029be1..144154e 100644 --- a/WebBrowser/frmSettings.Designer.cs +++ b/WebBrowser/frmSettings.Designer.cs @@ -34,19 +34,19 @@ namespace XeroBrowser private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FrmSettings)); - Bunifu.UI.WinForms.BunifuTextBox.StateProperties stateProperties1 = new Bunifu.UI.WinForms.BunifuTextBox.StateProperties(); - Bunifu.UI.WinForms.BunifuTextBox.StateProperties stateProperties2 = new Bunifu.UI.WinForms.BunifuTextBox.StateProperties(); - Bunifu.UI.WinForms.BunifuTextBox.StateProperties stateProperties3 = new Bunifu.UI.WinForms.BunifuTextBox.StateProperties(); - Bunifu.UI.WinForms.BunifuTextBox.StateProperties stateProperties4 = new Bunifu.UI.WinForms.BunifuTextBox.StateProperties(); - Bunifu.UI.WinForms.BunifuButton.BunifuButton2.BorderEdges borderEdges1 = new Bunifu.UI.WinForms.BunifuButton.BunifuButton2.BorderEdges(); - Bunifu.UI.WinForms.BunifuButton.BunifuButton2.BorderEdges borderEdges2 = new Bunifu.UI.WinForms.BunifuButton.BunifuButton2.BorderEdges(); - Bunifu.UI.WinForms.BunifuButton.BunifuButton.BorderEdges borderEdges9 = new Bunifu.UI.WinForms.BunifuButton.BunifuButton.BorderEdges(); - Bunifu.UI.WinForms.BunifuButton.BunifuButton.BorderEdges borderEdges3 = new Bunifu.UI.WinForms.BunifuButton.BunifuButton.BorderEdges(); - Bunifu.UI.WinForms.BunifuButton.BunifuButton.BorderEdges borderEdges8 = new Bunifu.UI.WinForms.BunifuButton.BunifuButton.BorderEdges(); - Bunifu.UI.WinForms.BunifuButton.BunifuButton.BorderEdges borderEdges7 = new Bunifu.UI.WinForms.BunifuButton.BunifuButton.BorderEdges(); - Bunifu.UI.WinForms.BunifuButton.BunifuButton.BorderEdges borderEdges6 = new Bunifu.UI.WinForms.BunifuButton.BunifuButton.BorderEdges(); - Bunifu.UI.WinForms.BunifuButton.BunifuButton.BorderEdges borderEdges5 = new Bunifu.UI.WinForms.BunifuButton.BunifuButton.BorderEdges(); - Bunifu.UI.WinForms.BunifuButton.BunifuButton.BorderEdges borderEdges4 = new Bunifu.UI.WinForms.BunifuButton.BunifuButton.BorderEdges(); + Bunifu.UI.WinForms.BunifuTextBox.StateProperties stateProperties5 = new Bunifu.UI.WinForms.BunifuTextBox.StateProperties(); + Bunifu.UI.WinForms.BunifuTextBox.StateProperties stateProperties6 = new Bunifu.UI.WinForms.BunifuTextBox.StateProperties(); + Bunifu.UI.WinForms.BunifuTextBox.StateProperties stateProperties7 = new Bunifu.UI.WinForms.BunifuTextBox.StateProperties(); + Bunifu.UI.WinForms.BunifuTextBox.StateProperties stateProperties8 = new Bunifu.UI.WinForms.BunifuTextBox.StateProperties(); + Bunifu.UI.WinForms.BunifuButton.BunifuButton2.BorderEdges borderEdges10 = new Bunifu.UI.WinForms.BunifuButton.BunifuButton2.BorderEdges(); + Bunifu.UI.WinForms.BunifuButton.BunifuButton2.BorderEdges borderEdges11 = new Bunifu.UI.WinForms.BunifuButton.BunifuButton2.BorderEdges(); + Bunifu.UI.WinForms.BunifuButton.BunifuButton.BorderEdges borderEdges18 = new Bunifu.UI.WinForms.BunifuButton.BunifuButton.BorderEdges(); + Bunifu.UI.WinForms.BunifuButton.BunifuButton.BorderEdges borderEdges12 = new Bunifu.UI.WinForms.BunifuButton.BunifuButton.BorderEdges(); + Bunifu.UI.WinForms.BunifuButton.BunifuButton.BorderEdges borderEdges17 = new Bunifu.UI.WinForms.BunifuButton.BunifuButton.BorderEdges(); + Bunifu.UI.WinForms.BunifuButton.BunifuButton.BorderEdges borderEdges16 = new Bunifu.UI.WinForms.BunifuButton.BunifuButton.BorderEdges(); + Bunifu.UI.WinForms.BunifuButton.BunifuButton.BorderEdges borderEdges15 = new Bunifu.UI.WinForms.BunifuButton.BunifuButton.BorderEdges(); + Bunifu.UI.WinForms.BunifuButton.BunifuButton.BorderEdges borderEdges14 = new Bunifu.UI.WinForms.BunifuButton.BunifuButton.BorderEdges(); + Bunifu.UI.WinForms.BunifuButton.BunifuButton.BorderEdges borderEdges13 = new Bunifu.UI.WinForms.BunifuButton.BunifuButton.BorderEdges(); this.tabControl1 = new System.Windows.Forms.TabControl(); this.tabBrowser = new System.Windows.Forms.TabPage(); this.bunifuLabel15 = new Bunifu.UI.WinForms.BunifuLabel(); @@ -94,8 +94,6 @@ namespace XeroBrowser this.bunifuSeparator10 = new Bunifu.UI.WinForms.BunifuSeparator(); this.bunifuLabel18 = new Bunifu.UI.WinForms.BunifuLabel(); this.bunifuSeparator6 = new Bunifu.UI.WinForms.BunifuSeparator(); - this.bunifuDropdown7 = new Bunifu.UI.WinForms.BunifuDropdown(); - this.bunifuLabel14 = new Bunifu.UI.WinForms.BunifuLabel(); this.tabAutofill = new System.Windows.Forms.TabPage(); this.bunifuLabel19 = new Bunifu.UI.WinForms.BunifuLabel(); this.bunifuSeparator7 = new Bunifu.UI.WinForms.BunifuSeparator(); @@ -242,26 +240,26 @@ namespace XeroBrowser this.bunifuTextBox1.Modified = false; this.bunifuTextBox1.Multiline = false; this.bunifuTextBox1.Name = "bunifuTextBox1"; - stateProperties1.BorderColor = System.Drawing.Color.DodgerBlue; - stateProperties1.FillColor = System.Drawing.Color.Empty; - stateProperties1.ForeColor = System.Drawing.Color.Empty; - stateProperties1.PlaceholderForeColor = System.Drawing.Color.Empty; - this.bunifuTextBox1.OnActiveState = stateProperties1; - stateProperties2.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - stateProperties2.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240))))); - stateProperties2.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - stateProperties2.PlaceholderForeColor = System.Drawing.Color.DarkGray; - this.bunifuTextBox1.OnDisabledState = stateProperties2; - stateProperties3.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(105)))), ((int)(((byte)(181)))), ((int)(((byte)(255))))); - stateProperties3.FillColor = System.Drawing.Color.Empty; - stateProperties3.ForeColor = System.Drawing.Color.Empty; - stateProperties3.PlaceholderForeColor = System.Drawing.Color.Empty; - this.bunifuTextBox1.OnHoverState = stateProperties3; - stateProperties4.BorderColor = System.Drawing.Color.Silver; - stateProperties4.FillColor = System.Drawing.Color.White; - stateProperties4.ForeColor = System.Drawing.Color.Empty; - stateProperties4.PlaceholderForeColor = System.Drawing.Color.Empty; - this.bunifuTextBox1.OnIdleState = stateProperties4; + stateProperties5.BorderColor = System.Drawing.Color.DodgerBlue; + stateProperties5.FillColor = System.Drawing.Color.Empty; + stateProperties5.ForeColor = System.Drawing.Color.Empty; + stateProperties5.PlaceholderForeColor = System.Drawing.Color.Empty; + this.bunifuTextBox1.OnActiveState = stateProperties5; + stateProperties6.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); + stateProperties6.FillColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240))))); + stateProperties6.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); + stateProperties6.PlaceholderForeColor = System.Drawing.Color.DarkGray; + this.bunifuTextBox1.OnDisabledState = stateProperties6; + stateProperties7.BorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(105)))), ((int)(((byte)(181)))), ((int)(((byte)(255))))); + stateProperties7.FillColor = System.Drawing.Color.Empty; + stateProperties7.ForeColor = System.Drawing.Color.Empty; + stateProperties7.PlaceholderForeColor = System.Drawing.Color.Empty; + this.bunifuTextBox1.OnHoverState = stateProperties7; + stateProperties8.BorderColor = System.Drawing.Color.Silver; + stateProperties8.FillColor = System.Drawing.Color.White; + stateProperties8.ForeColor = System.Drawing.Color.Empty; + stateProperties8.PlaceholderForeColor = System.Drawing.Color.Empty; + this.bunifuTextBox1.OnIdleState = stateProperties8; this.bunifuTextBox1.Padding = new System.Windows.Forms.Padding(3); this.bunifuTextBox1.PasswordChar = '\0'; this.bunifuTextBox1.PlaceholderForeColor = System.Drawing.Color.Silver; @@ -967,11 +965,11 @@ namespace XeroBrowser this.bunifuButton22.ColorContrastOnClick = 45; this.bunifuButton22.ColorContrastOnHover = 45; this.bunifuButton22.Cursor = System.Windows.Forms.Cursors.Hand; - borderEdges1.BottomLeft = true; - borderEdges1.BottomRight = true; - borderEdges1.TopLeft = true; - borderEdges1.TopRight = true; - this.bunifuButton22.CustomizableEdges = borderEdges1; + borderEdges10.BottomLeft = true; + borderEdges10.BottomRight = true; + borderEdges10.TopLeft = true; + borderEdges10.TopRight = true; + this.bunifuButton22.CustomizableEdges = borderEdges10; this.bunifuButton22.DialogResult = System.Windows.Forms.DialogResult.None; this.bunifuButton22.DisabledBorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191))))); this.bunifuButton22.DisabledFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); @@ -1058,11 +1056,11 @@ namespace XeroBrowser this.bunifuButton21.ColorContrastOnClick = 45; this.bunifuButton21.ColorContrastOnHover = 45; this.bunifuButton21.Cursor = System.Windows.Forms.Cursors.Hand; - borderEdges2.BottomLeft = true; - borderEdges2.BottomRight = true; - borderEdges2.TopLeft = true; - borderEdges2.TopRight = true; - this.bunifuButton21.CustomizableEdges = borderEdges2; + borderEdges11.BottomLeft = true; + borderEdges11.BottomRight = true; + borderEdges11.TopLeft = true; + borderEdges11.TopRight = true; + this.bunifuButton21.CustomizableEdges = borderEdges11; this.bunifuButton21.DialogResult = System.Windows.Forms.DialogResult.None; this.bunifuButton21.DisabledBorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191))))); this.bunifuButton21.DisabledFillColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); @@ -1157,8 +1155,6 @@ namespace XeroBrowser this.tabBehavior.Controls.Add(this.bunifuSeparator10); this.tabBehavior.Controls.Add(this.bunifuLabel18); this.tabBehavior.Controls.Add(this.bunifuSeparator6); - this.tabBehavior.Controls.Add(this.bunifuDropdown7); - this.tabBehavior.Controls.Add(this.bunifuLabel14); this.tabBehavior.Location = new System.Drawing.Point(4, 23); this.tabBehavior.Name = "tabBehavior"; this.tabBehavior.Size = new System.Drawing.Size(902, 625); @@ -1208,7 +1204,7 @@ namespace XeroBrowser "Enabled", "Disabled"}); this.bunifuDropdown10.ItemTopMargin = 3; - this.bunifuDropdown10.Location = new System.Drawing.Point(474, 251); + this.bunifuDropdown10.Location = new System.Drawing.Point(474, 205); this.bunifuDropdown10.Name = "bunifuDropdown10"; this.bunifuDropdown10.Size = new System.Drawing.Size(87, 32); this.bunifuDropdown10.TabIndex = 39; @@ -1223,7 +1219,7 @@ namespace XeroBrowser this.bunifuLabel25.AutoEllipsis = false; this.bunifuLabel25.CursorType = null; this.bunifuLabel25.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.bunifuLabel25.Location = new System.Drawing.Point(341, 259); + this.bunifuLabel25.Location = new System.Drawing.Point(341, 213); this.bunifuLabel25.Name = "bunifuLabel25"; this.bunifuLabel25.RightToLeft = System.Windows.Forms.RightToLeft.No; this.bunifuLabel25.Size = new System.Drawing.Size(128, 15); @@ -1274,7 +1270,7 @@ namespace XeroBrowser "Enabled", "Disabled"}); this.bunifuDropdown9.ItemTopMargin = 3; - this.bunifuDropdown9.Location = new System.Drawing.Point(462, 213); + this.bunifuDropdown9.Location = new System.Drawing.Point(462, 167); this.bunifuDropdown9.Name = "bunifuDropdown9"; this.bunifuDropdown9.Size = new System.Drawing.Size(87, 32); this.bunifuDropdown9.TabIndex = 37; @@ -1289,7 +1285,7 @@ namespace XeroBrowser this.bunifuLabel24.AutoEllipsis = false; this.bunifuLabel24.CursorType = null; this.bunifuLabel24.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.bunifuLabel24.Location = new System.Drawing.Point(355, 221); + this.bunifuLabel24.Location = new System.Drawing.Point(355, 175); this.bunifuLabel24.Name = "bunifuLabel24"; this.bunifuLabel24.RightToLeft = System.Windows.Forms.RightToLeft.No; this.bunifuLabel24.Size = new System.Drawing.Size(100, 15); @@ -1340,7 +1336,7 @@ namespace XeroBrowser "Enabled", "Disabled"}); this.bunifuDropdown8.ItemTopMargin = 3; - this.bunifuDropdown8.Location = new System.Drawing.Point(467, 175); + this.bunifuDropdown8.Location = new System.Drawing.Point(467, 129); this.bunifuDropdown8.Name = "bunifuDropdown8"; this.bunifuDropdown8.Size = new System.Drawing.Size(87, 32); this.bunifuDropdown8.TabIndex = 35; @@ -1355,7 +1351,7 @@ namespace XeroBrowser this.bunifuLabel23.AutoEllipsis = false; this.bunifuLabel23.CursorType = null; this.bunifuLabel23.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.bunifuLabel23.Location = new System.Drawing.Point(350, 183); + this.bunifuLabel23.Location = new System.Drawing.Point(350, 137); this.bunifuLabel23.Name = "bunifuLabel23"; this.bunifuLabel23.RightToLeft = System.Windows.Forms.RightToLeft.No; this.bunifuLabel23.Size = new System.Drawing.Size(111, 15); @@ -1370,7 +1366,7 @@ namespace XeroBrowser this.bunifuLabel22.AutoEllipsis = false; this.bunifuLabel22.CursorType = null; this.bunifuLabel22.Font = new System.Drawing.Font("Arial", 9.75F, System.Drawing.FontStyle.Bold); - this.bunifuLabel22.Location = new System.Drawing.Point(408, 135); + this.bunifuLabel22.Location = new System.Drawing.Point(408, 89); this.bunifuLabel22.Name = "bunifuLabel22"; this.bunifuLabel22.RightToLeft = System.Windows.Forms.RightToLeft.No; this.bunifuLabel22.Size = new System.Drawing.Size(86, 16); @@ -1388,7 +1384,7 @@ namespace XeroBrowser this.bunifuSeparator10.LineColor = System.Drawing.Color.DarkGray; this.bunifuSeparator10.LineStyle = Bunifu.UI.WinForms.BunifuSeparator.LineStyles.Solid; this.bunifuSeparator10.LineThickness = 3; - this.bunifuSeparator10.Location = new System.Drawing.Point(320, 153); + this.bunifuSeparator10.Location = new System.Drawing.Point(320, 107); this.bunifuSeparator10.Margin = new System.Windows.Forms.Padding(6, 3, 6, 3); this.bunifuSeparator10.Name = "bunifuSeparator10"; this.bunifuSeparator10.Orientation = Bunifu.UI.WinForms.BunifuSeparator.LineOrientation.Horizontal; @@ -1429,72 +1425,6 @@ namespace XeroBrowser this.bunifuSeparator6.Size = new System.Drawing.Size(310, 18); this.bunifuSeparator6.TabIndex = 31; // - // bunifuDropdown7 - // - this.bunifuDropdown7.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.bunifuDropdown7.BackColor = System.Drawing.Color.Transparent; - this.bunifuDropdown7.BackgroundColor = System.Drawing.Color.White; - this.bunifuDropdown7.BorderColor = System.Drawing.Color.Silver; - this.bunifuDropdown7.BorderRadius = 13; - this.bunifuDropdown7.Color = System.Drawing.Color.Silver; - this.bunifuDropdown7.Cursor = System.Windows.Forms.Cursors.Hand; - this.bunifuDropdown7.Direction = Bunifu.UI.WinForms.BunifuDropdown.Directions.Down; - this.bunifuDropdown7.DisabledBackColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240))))); - this.bunifuDropdown7.DisabledBorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(204)))), ((int)(((byte)(204)))), ((int)(((byte)(204))))); - this.bunifuDropdown7.DisabledColor = System.Drawing.Color.FromArgb(((int)(((byte)(240)))), ((int)(((byte)(240)))), ((int)(((byte)(240))))); - this.bunifuDropdown7.DisabledForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(109)))), ((int)(((byte)(109)))), ((int)(((byte)(109))))); - this.bunifuDropdown7.DisabledIndicatorColor = System.Drawing.Color.DarkGray; - this.bunifuDropdown7.DrawMode = System.Windows.Forms.DrawMode.OwnerDrawFixed; - this.bunifuDropdown7.DropdownBorderThickness = Bunifu.UI.WinForms.BunifuDropdown.BorderThickness.Thick; - this.bunifuDropdown7.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList; - this.bunifuDropdown7.DropDownTextAlign = Bunifu.UI.WinForms.BunifuDropdown.TextAlign.Left; - this.bunifuDropdown7.FillDropDown = true; - this.bunifuDropdown7.FillIndicator = false; - this.bunifuDropdown7.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.bunifuDropdown7.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.bunifuDropdown7.ForeColor = System.Drawing.Color.Black; - this.bunifuDropdown7.FormattingEnabled = true; - this.bunifuDropdown7.Icon = null; - this.bunifuDropdown7.IndicatorAlignment = Bunifu.UI.WinForms.BunifuDropdown.Indicator.Right; - this.bunifuDropdown7.IndicatorColor = System.Drawing.Color.DarkGray; - this.bunifuDropdown7.IndicatorLocation = Bunifu.UI.WinForms.BunifuDropdown.Indicator.Right; - this.bunifuDropdown7.IndicatorThickness = 2; - this.bunifuDropdown7.IsDropdownOpened = false; - this.bunifuDropdown7.ItemBackColor = System.Drawing.Color.White; - this.bunifuDropdown7.ItemBorderColor = System.Drawing.Color.White; - this.bunifuDropdown7.ItemForeColor = System.Drawing.Color.Black; - this.bunifuDropdown7.ItemHeight = 26; - this.bunifuDropdown7.ItemHighLightColor = System.Drawing.Color.DodgerBlue; - this.bunifuDropdown7.ItemHighLightForeColor = System.Drawing.Color.White; - this.bunifuDropdown7.Items.AddRange(new object[] { - "Enabled", - "Disabled"}); - this.bunifuDropdown7.ItemTopMargin = 3; - this.bunifuDropdown7.Location = new System.Drawing.Point(460, 82); - this.bunifuDropdown7.Name = "bunifuDropdown7"; - this.bunifuDropdown7.Size = new System.Drawing.Size(87, 32); - this.bunifuDropdown7.TabIndex = 15; - this.bunifuDropdown7.TabStop = false; - this.bunifuDropdown7.Text = "Enabled"; - this.bunifuDropdown7.TextAlignment = Bunifu.UI.WinForms.BunifuDropdown.TextAlign.Left; - this.bunifuDropdown7.TextLeftMargin = 5; - // - // bunifuLabel14 - // - this.bunifuLabel14.AllowParentOverrides = false; - this.bunifuLabel14.AutoEllipsis = false; - this.bunifuLabel14.CursorType = null; - this.bunifuLabel14.Font = new System.Drawing.Font("Arial", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(0))); - this.bunifuLabel14.Location = new System.Drawing.Point(355, 90); - this.bunifuLabel14.Name = "bunifuLabel14"; - this.bunifuLabel14.RightToLeft = System.Windows.Forms.RightToLeft.No; - this.bunifuLabel14.Size = new System.Drawing.Size(100, 15); - this.bunifuLabel14.TabIndex = 14; - this.bunifuLabel14.Text = "Rick roll blocking:"; - this.bunifuLabel14.TextAlignment = System.Drawing.ContentAlignment.TopLeft; - this.bunifuLabel14.TextFormat = Bunifu.UI.WinForms.BunifuLabel.TextFormattingOptions.Default; - // // tabAutofill // this.tabAutofill.Controls.Add(this.bunifuLabel19); @@ -1787,11 +1717,11 @@ namespace XeroBrowser this.btnBrowser.ColorContrastOnClick = 45; this.btnBrowser.ColorContrastOnHover = 45; this.btnBrowser.Cursor = System.Windows.Forms.Cursors.Default; - borderEdges9.BottomLeft = true; - borderEdges9.BottomRight = true; - borderEdges9.TopLeft = true; - borderEdges9.TopRight = true; - this.btnBrowser.CustomizableEdges = borderEdges9; + borderEdges18.BottomLeft = true; + borderEdges18.BottomRight = true; + borderEdges18.TopLeft = true; + borderEdges18.TopRight = true; + this.btnBrowser.CustomizableEdges = borderEdges18; this.btnBrowser.DialogResult = System.Windows.Forms.DialogResult.None; this.btnBrowser.DisabledBorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191))))); this.btnBrowser.DisabledFillColor = System.Drawing.Color.Empty; @@ -1879,11 +1809,11 @@ namespace XeroBrowser this.btnAppearance.ColorContrastOnClick = 45; this.btnAppearance.ColorContrastOnHover = 45; this.btnAppearance.Cursor = System.Windows.Forms.Cursors.Default; - borderEdges3.BottomLeft = true; - borderEdges3.BottomRight = true; - borderEdges3.TopLeft = true; - borderEdges3.TopRight = true; - this.btnAppearance.CustomizableEdges = borderEdges3; + borderEdges12.BottomLeft = true; + borderEdges12.BottomRight = true; + borderEdges12.TopLeft = true; + borderEdges12.TopRight = true; + this.btnAppearance.CustomizableEdges = borderEdges12; this.btnAppearance.DialogResult = System.Windows.Forms.DialogResult.None; this.btnAppearance.DisabledBorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191))))); this.btnAppearance.DisabledFillColor = System.Drawing.Color.Empty; @@ -1971,11 +1901,11 @@ namespace XeroBrowser this.btnPrivacy.ColorContrastOnClick = 45; this.btnPrivacy.ColorContrastOnHover = 45; this.btnPrivacy.Cursor = System.Windows.Forms.Cursors.Default; - borderEdges8.BottomLeft = true; - borderEdges8.BottomRight = true; - borderEdges8.TopLeft = true; - borderEdges8.TopRight = true; - this.btnPrivacy.CustomizableEdges = borderEdges8; + borderEdges17.BottomLeft = true; + borderEdges17.BottomRight = true; + borderEdges17.TopLeft = true; + borderEdges17.TopRight = true; + this.btnPrivacy.CustomizableEdges = borderEdges17; this.btnPrivacy.DialogResult = System.Windows.Forms.DialogResult.None; this.btnPrivacy.DisabledBorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191))))); this.btnPrivacy.DisabledFillColor = System.Drawing.Color.Empty; @@ -2063,11 +1993,11 @@ namespace XeroBrowser this.btnBehavior.ColorContrastOnClick = 45; this.btnBehavior.ColorContrastOnHover = 45; this.btnBehavior.Cursor = System.Windows.Forms.Cursors.Default; - borderEdges7.BottomLeft = true; - borderEdges7.BottomRight = true; - borderEdges7.TopLeft = true; - borderEdges7.TopRight = true; - this.btnBehavior.CustomizableEdges = borderEdges7; + borderEdges16.BottomLeft = true; + borderEdges16.BottomRight = true; + borderEdges16.TopLeft = true; + borderEdges16.TopRight = true; + this.btnBehavior.CustomizableEdges = borderEdges16; this.btnBehavior.DialogResult = System.Windows.Forms.DialogResult.None; this.btnBehavior.DisabledBorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191))))); this.btnBehavior.DisabledFillColor = System.Drawing.Color.Empty; @@ -2155,11 +2085,11 @@ namespace XeroBrowser this.btnAutofill.ColorContrastOnClick = 45; this.btnAutofill.ColorContrastOnHover = 45; this.btnAutofill.Cursor = System.Windows.Forms.Cursors.Default; - borderEdges6.BottomLeft = true; - borderEdges6.BottomRight = true; - borderEdges6.TopLeft = true; - borderEdges6.TopRight = true; - this.btnAutofill.CustomizableEdges = borderEdges6; + borderEdges15.BottomLeft = true; + borderEdges15.BottomRight = true; + borderEdges15.TopLeft = true; + borderEdges15.TopRight = true; + this.btnAutofill.CustomizableEdges = borderEdges15; this.btnAutofill.DialogResult = System.Windows.Forms.DialogResult.None; this.btnAutofill.DisabledBorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191))))); this.btnAutofill.DisabledFillColor = System.Drawing.Color.Empty; @@ -2247,11 +2177,11 @@ namespace XeroBrowser this.btnLanguages.ColorContrastOnClick = 45; this.btnLanguages.ColorContrastOnHover = 45; this.btnLanguages.Cursor = System.Windows.Forms.Cursors.Default; - borderEdges5.BottomLeft = true; - borderEdges5.BottomRight = true; - borderEdges5.TopLeft = true; - borderEdges5.TopRight = true; - this.btnLanguages.CustomizableEdges = borderEdges5; + borderEdges14.BottomLeft = true; + borderEdges14.BottomRight = true; + borderEdges14.TopLeft = true; + borderEdges14.TopRight = true; + this.btnLanguages.CustomizableEdges = borderEdges14; this.btnLanguages.DialogResult = System.Windows.Forms.DialogResult.None; this.btnLanguages.DisabledBorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191))))); this.btnLanguages.DisabledFillColor = System.Drawing.Color.Empty; @@ -2339,11 +2269,11 @@ namespace XeroBrowser this.btnAccessibility.ColorContrastOnClick = 45; this.btnAccessibility.ColorContrastOnHover = 45; this.btnAccessibility.Cursor = System.Windows.Forms.Cursors.Default; - borderEdges4.BottomLeft = true; - borderEdges4.BottomRight = true; - borderEdges4.TopLeft = true; - borderEdges4.TopRight = true; - this.btnAccessibility.CustomizableEdges = borderEdges4; + borderEdges13.BottomLeft = true; + borderEdges13.BottomRight = true; + borderEdges13.TopLeft = true; + borderEdges13.TopRight = true; + this.btnAccessibility.CustomizableEdges = borderEdges13; this.btnAccessibility.DialogResult = System.Windows.Forms.DialogResult.None; this.btnAccessibility.DisabledBorderColor = System.Drawing.Color.FromArgb(((int)(((byte)(191)))), ((int)(((byte)(191)))), ((int)(((byte)(191))))); this.btnAccessibility.DisabledFillColor = System.Drawing.Color.Empty; @@ -2494,8 +2424,6 @@ namespace XeroBrowser private BunifuPictureBox bunifuPictureBox1; private BunifuLabel bunifuLabel13; private BunifuImageButton bunifuImageButton1; - private BunifuDropdown bunifuDropdown7; - private BunifuLabel bunifuLabel14; private BunifuSeparator bunifuSeparator1; private BunifuSeparator bunifuSeparator2; private BunifuLabel bunifuLabel15;