diff --git a/WebBrowser/AppContainer.Designer.cs b/WebBrowser/AppContainer.Designer.cs index 5a4d250..adb63eb 100644 --- a/WebBrowser/AppContainer.Designer.cs +++ b/WebBrowser/AppContainer.Designer.cs @@ -1,11 +1,13 @@ -namespace WebBrowser +using System.ComponentModel; + +namespace WebBrowser { partial class AppContainer { /// /// Required designer variable. /// - private System.ComponentModel.IContainer components = null; + private IContainer components = null; /// /// Clean up any resources being used. diff --git a/WebBrowser/AppContainer.cs b/WebBrowser/AppContainer.cs index b09d27d..0339887 100644 --- a/WebBrowser/AppContainer.cs +++ b/WebBrowser/AppContainer.cs @@ -1,13 +1,4 @@ using EasyTabs; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; namespace WebBrowser { diff --git a/WebBrowser/DisplayHandler.cs b/WebBrowser/DisplayHandler.cs index 510ea4b..5b8f72d 100644 --- a/WebBrowser/DisplayHandler.cs +++ b/WebBrowser/DisplayHandler.cs @@ -1,15 +1,15 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; -using CefSharp; -using System.Threading.Tasks; -using CefSharp.Structs; -using CefSharp.Enums; -using WebBrowser; -using System.Net; +using System.ComponentModel; using System.Drawing; using System.IO; +using System.Linq; +using System.Net; +using CefSharp; +using CefSharp.Enums; +using CefSharp.Structs; +using WebBrowser; +using Size = CefSharp.Structs.Size; namespace DiamondCreeperBrowser { @@ -30,10 +30,9 @@ namespace DiamondCreeperBrowser } public void OnAddressChanged(IWebBrowser chromiumWebBrowser, AddressChangedEventArgs addressChangedArgs) { - return; } - public bool OnAutoResize(IWebBrowser chromiumWebBrowser, IBrowser browser, CefSharp.Structs.Size newSize) + public bool OnAutoResize(IWebBrowser chromiumWebBrowser, IBrowser browser, Size newSize) { return true; } @@ -75,8 +74,8 @@ namespace DiamondCreeperBrowser frmref.ParentTabs.RedrawTabs(); } catch (Exception){ - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmBrowser)); - frmref.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + ComponentResourceManager resources = new ComponentResourceManager(typeof(frmBrowser)); + frmref.Icon = ((Icon)(resources.GetObject("$this.Icon"))); frmref.Update(); frmref.ParentTabs.UpdateThumbnailPreviewIcon(frmref.ParentTabs.Tabs.Single(t => t.Content == frmref)); frmref.ParentTabs.RedrawTabs(); @@ -86,22 +85,18 @@ namespace DiamondCreeperBrowser public void OnFullscreenModeChange(IWebBrowser chromiumWebBrowser, IBrowser browser, bool fullscreen) { - return; } public void OnLoadingProgressChange(IWebBrowser chromiumWebBrowser, IBrowser browser, double progress) { - return; } public void OnStatusMessage(IWebBrowser chromiumWebBrowser, StatusMessageEventArgs statusMessageArgs) { - return; } public void OnTitleChanged(IWebBrowser chromiumWebBrowser, TitleChangedEventArgs titleChangedArgs) { - return; } public bool OnTooltipChanged(IWebBrowser chromiumWebBrowser, ref string text) diff --git a/WebBrowser/DownloadHandler.cs b/WebBrowser/DownloadHandler.cs index d1d2dbc..36e7e0d 100644 --- a/WebBrowser/DownloadHandler.cs +++ b/WebBrowser/DownloadHandler.cs @@ -3,13 +3,12 @@ // Use of this source code is governed by a BSD-style license that can be found in the LICENSE file. using System; -using System.Threading.Tasks; -using WebBrowser; -using CefSharp; -using System.IO; -using System.Threading; -using System.Linq.Expressions; using System.ComponentModel; +using System.IO; +using System.Windows.Forms; +using CefSharp; +using WebBrowser; +using Timer = System.Threading.Timer; namespace DiamondCreeperBrowser { @@ -53,7 +52,7 @@ namespace DiamondCreeperBrowser } } - private void DownloadProgress_FormClosing(object sender, System.Windows.Forms.FormClosingEventArgs e) + private void DownloadProgress_FormClosing(object sender, FormClosingEventArgs e) { downloadItem.IsCancelled = true; } @@ -66,13 +65,13 @@ namespace DiamondCreeperBrowser if (downloadItem.IsComplete) { - fivesecondtimer = new Timer(new TimerCallback(tcallback), null, 1000 * 5, 1000 * 5); + fivesecondtimer = new Timer(tcallback, null, 1000 * 5, 1000 * 5); } frmref.Invoke((Action)delegate { downloadProgress.ProgressBar1.Value = downloadItem.PercentComplete; - downloadProgress.ProgressPrecentage.Text = downloadItem.PercentComplete.ToString() + "% " + (downloadItem.ReceivedBytes / 0x100000).ToString() + "MB / " + (downloadItem.TotalBytes / 0x100000).ToString() + "MB"; + downloadProgress.ProgressPrecentage.Text = downloadItem.PercentComplete + "% " + (downloadItem.ReceivedBytes / 0x100000) + "MB / " + (downloadItem.TotalBytes / 0x100000) + "MB"; downloadProgress.ProgressFileName.Text = Path.GetFileName(downloadItem.FullPath); downloadProgress.Update(); try { } catch (InvalidAsynchronousStateException){}; diff --git a/WebBrowser/DownloadProgress.Designer.cs b/WebBrowser/DownloadProgress.Designer.cs index 0cfee64..8f73bd2 100644 --- a/WebBrowser/DownloadProgress.Designer.cs +++ b/WebBrowser/DownloadProgress.Designer.cs @@ -1,4 +1,7 @@  +using System.ComponentModel; +using Bunifu.UI.WinForms; + namespace DiamondCreeperBrowser { partial class DownloadProgress @@ -6,7 +9,7 @@ namespace DiamondCreeperBrowser /// /// Required designer variable. /// - private System.ComponentModel.IContainer components = null; + private IContainer components = null; /// /// Clean up any resources being used. @@ -132,8 +135,8 @@ namespace DiamondCreeperBrowser } #endregion - public Bunifu.UI.WinForms.BunifuProgressBar ProgressBar1; - public Bunifu.UI.WinForms.BunifuLabel ProgressPrecentage; - public Bunifu.UI.WinForms.BunifuLabel ProgressFileName; + public BunifuProgressBar ProgressBar1; + public BunifuLabel ProgressPrecentage; + public BunifuLabel ProgressFileName; } } \ No newline at end of file diff --git a/WebBrowser/DownloadProgress.cs b/WebBrowser/DownloadProgress.cs index 28c187e..c8d182f 100644 --- a/WebBrowser/DownloadProgress.cs +++ b/WebBrowser/DownloadProgress.cs @@ -1,11 +1,4 @@ using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; namespace DiamondCreeperBrowser diff --git a/WebBrowser/LifeSpanHandler.cs b/WebBrowser/LifeSpanHandler.cs index b15cd41..fda304b 100644 --- a/WebBrowser/LifeSpanHandler.cs +++ b/WebBrowser/LifeSpanHandler.cs @@ -1,8 +1,10 @@ // LifeSpanHandler.cs + +using System; using CefSharp; using EasyTabs; -using System; using WebBrowser; +using XeroBrowser; namespace DiamondCreeperBrowser { @@ -12,10 +14,10 @@ namespace DiamondCreeperBrowser public bool OnBeforePopup(IWebBrowser chromiumWebBrowser, IBrowser browser, IFrame frame, string targetUrl, string targetFrameName, WindowOpenDisposition targetDisposition, bool userGesture, IPopupFeatures popupFeatures, IWindowInfo windowInfo, IBrowserSettings browserSettings, ref bool noJavascriptAccess, out IWebBrowser newBrowser) { - Program.container.Invoke((Action)delegate + Program.Container.Invoke((Action)delegate { - EasyTabs.TitleBarTab tab = new EasyTabs.TitleBarTab(Program.container) + TitleBarTab tab = new TitleBarTab(Program.Container) { Content = new frmBrowser { @@ -24,8 +26,8 @@ namespace DiamondCreeperBrowser }; frmBrowser frmref = (frmBrowser)tab.Content; frmref.chromiumWebBrowser1.Load(targetUrl); - Program.container.Tabs.Add(tab); - Program.container.SelectedTab = tab; + Program.Container.Tabs.Add(tab); + Program.Container.SelectedTab = tab; }); diff --git a/WebBrowser/MenuHandler.cs b/WebBrowser/MenuHandler.cs index 1c33564..4ccea5d 100644 --- a/WebBrowser/MenuHandler.cs +++ b/WebBrowser/MenuHandler.cs @@ -1,6 +1,6 @@ using System; -using CefSharp; using System.Windows.Forms; +using CefSharp; public class MenuHandler : IContextMenuHandler { diff --git a/WebBrowser/Program.cs b/WebBrowser/Program.cs index 9fe7a46..4d3c637 100644 --- a/WebBrowser/Program.cs +++ b/WebBrowser/Program.cs @@ -1,20 +1,18 @@ -using CefSharp; +using System; +using System.IO; +using System.Windows.Forms; +using CefSharp; using CefSharp.WinForms; using EasyTabs; -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Threading.Tasks; -using System.Windows.Forms; +using WebBrowser; -namespace WebBrowser +namespace XeroBrowser { public static class Program { - public static AppContainer container; + public static AppContainer Container; - public static TitleBarTabsApplicationContext applicationContext; + public static TitleBarTabsApplicationContext ApplicationContext; /// /// The main entry point for the application. /// @@ -23,7 +21,7 @@ namespace WebBrowser { Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); - container = new AppContainer(); + Container = new AppContainer(); CefSettings settings = new CefSettings(); if (settings.CefCommandLineArgs.ContainsKey("enable-system-flash")) @@ -39,27 +37,30 @@ namespace WebBrowser Cef.Initialize(settings); - container.Tabs.Add( + Container.Tabs.Add( - new EasyTabs.TitleBarTab(container) + new TitleBarTab(Container) { Content = new frmBrowser { - Text = "New Tab" + Text = @"New Tab" } } ); - container.SelectedTabIndex = 0; + Container.SelectedTabIndex = 0; try { - applicationContext = new TitleBarTabsApplicationContext(); - applicationContext.Start(container); - Application.Run(applicationContext); + ApplicationContext = new TitleBarTabsApplicationContext(); + ApplicationContext.Start(Container); + Application.Run(ApplicationContext); + } + catch (Exception) + { + // ignored } - catch (Exception) { }; } } } diff --git a/WebBrowser/Properties/AssemblyInfo.cs b/WebBrowser/Properties/AssemblyInfo.cs index 549f504..0446643 100644 --- a/WebBrowser/Properties/AssemblyInfo.cs +++ b/WebBrowser/Properties/AssemblyInfo.cs @@ -1,5 +1,4 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following diff --git a/WebBrowser/Properties/Resources.Designer.cs b/WebBrowser/Properties/Resources.Designer.cs index 941e444..2637cbf 100644 --- a/WebBrowser/Properties/Resources.Designer.cs +++ b/WebBrowser/Properties/Resources.Designer.cs @@ -8,10 +8,16 @@ // //------------------------------------------------------------------------------ +using System.CodeDom.Compiler; +using System.ComponentModel; +using System.Diagnostics; +using System.Diagnostics.CodeAnalysis; +using System.Drawing; +using System.Globalization; +using System.Resources; +using System.Runtime.CompilerServices; + namespace XeroBrowser.Properties { - using System; - - /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -19,27 +25,27 @@ namespace XeroBrowser.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] - [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] + [GeneratedCode("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + [DebuggerNonUserCode()] + [CompilerGenerated()] internal class Resources { - private static global::System.Resources.ResourceManager resourceMan; + private static ResourceManager resourceMan; - private static global::System.Globalization.CultureInfo resourceCulture; + private static CultureInfo resourceCulture; - [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] + [SuppressMessage("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")] internal Resources() { } /// /// Returns the cached ResourceManager instance used by this class. /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Resources.ResourceManager ResourceManager { + [EditorBrowsable(EditorBrowsableState.Advanced)] + internal static ResourceManager ResourceManager { get { - if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("XeroBrowser.Properties.Resources", typeof(Resources).Assembly); + if (ReferenceEquals(resourceMan, null)) { + ResourceManager temp = new ResourceManager("XeroBrowser.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; @@ -50,8 +56,8 @@ namespace XeroBrowser.Properties { /// Overrides the current thread's CurrentUICulture property for all /// resource lookups using this strongly typed resource class. /// - [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)] - internal static global::System.Globalization.CultureInfo Culture { + [EditorBrowsable(EditorBrowsableState.Advanced)] + internal static CultureInfo Culture { get { return resourceCulture; } @@ -63,50 +69,50 @@ namespace XeroBrowser.Properties { /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap insecure { + internal static Bitmap insecure { get { object obj = ResourceManager.GetObject("insecure", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); + return ((Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap insecure1 { + internal static Bitmap insecure1 { get { object obj = ResourceManager.GetObject("insecure1", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); + return ((Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap local { + internal static Bitmap local { get { object obj = ResourceManager.GetObject("local", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); + return ((Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap secure { + internal static Bitmap secure { get { object obj = ResourceManager.GetObject("secure", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); + return ((Bitmap)(obj)); } } /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// - internal static System.Drawing.Bitmap Xero_Browser_Ico { + internal static Bitmap Xero_Browser_Ico { get { object obj = ResourceManager.GetObject("Xero Browser Ico", resourceCulture); - return ((System.Drawing.Bitmap)(obj)); + return ((Bitmap)(obj)); } } } diff --git a/WebBrowser/Properties/Settings.Designer.cs b/WebBrowser/Properties/Settings.Designer.cs index 2e61480..f5a3a9b 100644 --- a/WebBrowser/Properties/Settings.Designer.cs +++ b/WebBrowser/Properties/Settings.Designer.cs @@ -8,14 +8,18 @@ // //------------------------------------------------------------------------------ +using System.CodeDom.Compiler; +using System.Configuration; +using System.Runtime.CompilerServices; + namespace XeroBrowser.Properties { - [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0")] - internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase { + [CompilerGenerated()] + [GeneratedCode("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0")] + internal sealed partial class Settings : ApplicationSettingsBase { - private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + private static Settings defaultInstance = ((Settings)(Synchronized(new Settings()))); public static Settings Default { get { diff --git a/WebBrowser/RequestHandler.cs b/WebBrowser/RequestHandler.cs index 719a07a..5d513bb 100644 --- a/WebBrowser/RequestHandler.cs +++ b/WebBrowser/RequestHandler.cs @@ -1,8 +1,6 @@ using System; -using CefSharp; -using WebBrowser; using System.Security.Cryptography.X509Certificates; -using System.Windows.Forms; +using CefSharp; namespace DiamondCreeperBrowser { diff --git a/WebBrowser/frmBrowser.Designer.cs b/WebBrowser/frmBrowser.Designer.cs index 7618482..8f06c83 100644 --- a/WebBrowser/frmBrowser.Designer.cs +++ b/WebBrowser/frmBrowser.Designer.cs @@ -1,11 +1,17 @@ -namespace WebBrowser +using System.ComponentModel; +using Bunifu.Framework.UI; +using Bunifu.UI.WinForms; +using CefSharp.WinForms; +using BunifuImageButton = Bunifu.UI.WinForms.BunifuImageButton; + +namespace WebBrowser { partial class frmBrowser { /// /// Required designer variable. /// - private System.ComponentModel.IContainer components = null; + private IContainer components = null; /// /// Clean up any resources being used. @@ -567,18 +573,18 @@ #endregion - private Bunifu.Framework.UI.BunifuCards bunifuCards1; - private Bunifu.UI.WinForms.BunifuToolTip bunifuToolTip1; - public CefSharp.WinForms.ChromiumWebBrowser chromiumWebBrowser1; - private Bunifu.UI.WinForms.BunifuTextBox txtSearchOrUrl; - private Bunifu.UI.WinForms.BunifuImageButton bunifuImageButton2; - private Bunifu.UI.WinForms.BunifuImageButton bunifuImageButton1; - private Bunifu.UI.WinForms.BunifuImageButton btnBack; - private Bunifu.UI.WinForms.BunifuImageButton btnSettings; - private Bunifu.UI.WinForms.BunifuImageButton btnForward; - private Bunifu.UI.WinForms.BunifuLoader loadingIndicator; - private Bunifu.UI.WinForms.BunifuImageButton btnRefresh; - private Bunifu.UI.WinForms.BunifuImageButton bunifuImageButton3; - private Bunifu.UI.WinForms.BunifuImageButton bunifuImageButton4; + private BunifuCards bunifuCards1; + private BunifuToolTip bunifuToolTip1; + public ChromiumWebBrowser chromiumWebBrowser1; + private BunifuTextBox txtSearchOrUrl; + private BunifuImageButton bunifuImageButton2; + private BunifuImageButton bunifuImageButton1; + private BunifuImageButton btnBack; + private BunifuImageButton btnSettings; + private BunifuImageButton btnForward; + private BunifuLoader loadingIndicator; + private BunifuImageButton btnRefresh; + private BunifuImageButton bunifuImageButton3; + private BunifuImageButton bunifuImageButton4; } } \ No newline at end of file diff --git a/WebBrowser/frmBrowser.cs b/WebBrowser/frmBrowser.cs index df1c163..e019646 100644 --- a/WebBrowser/frmBrowser.cs +++ b/WebBrowser/frmBrowser.cs @@ -1,24 +1,12 @@ -using Bunifu.Utils; -using CefSharp; -using CefSharp.WinForms; -using DiamondCreeperBrowser; -using XeroBrowser.Properties; -using EasyTabs; -using System; -using System.Collections.Generic; +using System; using System.ComponentModel; -using System.Data; -using System.Drawing; -using System.Linq; -using System.Security.Policy; -using System.Text; -using System.Threading.Tasks; -using System.Windows.Forms; -using CefSharp.DevTools.Network; -using CefSharp.DevTools.Page; -using System.Runtime.Versioning; -using System.Xml.Linq; using System.IO; +using System.Windows.Forms; +using Bunifu.Utils; +using CefSharp; +using DiamondCreeperBrowser; +using EasyTabs; +using XeroBrowser.Properties; namespace WebBrowser { @@ -38,7 +26,7 @@ namespace WebBrowser string fileUrl = fileUri.AbsoluteUri; chromiumWebBrowser1.Load(fileUrl); txtSearchOrUrl.Text = ""; - Form.CheckForIllegalCrossThreadCalls = false; + CheckForIllegalCrossThreadCalls = false; } @@ -71,18 +59,18 @@ namespace WebBrowser chromiumWebBrowser1.Reload(); } - private bool isBlocked = false; + private bool isBlocked; private void chromiumWebBrowser1_LoadingStateChanged(object sender, LoadingStateChangedEventArgs e) { if (e.IsLoading) { - this.loadingIndicator.Visible = true; - this.btnRefresh.Visible = false; + loadingIndicator.Visible = true; + btnRefresh.Visible = false; } else { - this.loadingIndicator.Visible = false; - this.btnRefresh.Visible = true; + loadingIndicator.Visible = false; + btnRefresh.Visible = true; } try @@ -90,7 +78,7 @@ namespace WebBrowser if (this == null) return; - this.Invoke((Action)delegate + Invoke((Action)delegate { if (txtSearchOrUrl != null && chromiumWebBrowser1 != null) { @@ -112,19 +100,19 @@ namespace WebBrowser var uri = new Uri(chromiumWebBrowser1.Address); if (uri.Scheme == "file") { - txtSearchOrUrl.IconLeft = XeroBrowser.Properties.Resources.local; + txtSearchOrUrl.IconLeft = Resources.local; } else if (uri.Scheme == "https") { - txtSearchOrUrl.IconLeft = XeroBrowser.Properties.Resources.secure; + txtSearchOrUrl.IconLeft = Resources.secure; } else { - txtSearchOrUrl.IconLeft = XeroBrowser.Properties.Resources.insecure1; + txtSearchOrUrl.IconLeft = Resources.insecure1; if (!isBlocked) { - MessageBox.Show("Warning: This site is insecure!, Your personal information may be at risk or hackers can install malicious software on your device.", "Xero Browser", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Warning); + MessageBox.Show("Warning: This site is insecure!, Your personal information may be at risk or hackers can install malicious software on your device.", "Xero Browser", MessageBoxButtons.OK, MessageBoxIcon.Warning); } } @@ -179,7 +167,7 @@ namespace WebBrowser { try { - this.Invoke((Action)delegate { this.FindForm().Text = e.Title; }); + Invoke((Action)delegate { FindForm().Text = e.Title; }); } catch (ObjectDisposedException) { } } diff --git a/WebBrowser/frmSettings.Designer.cs b/WebBrowser/frmSettings.Designer.cs index e8df1ea..272676a 100644 --- a/WebBrowser/frmSettings.Designer.cs +++ b/WebBrowser/frmSettings.Designer.cs @@ -1,11 +1,16 @@ -namespace WebBrowser +using System.ComponentModel; +using System.Windows.Forms; +using Bunifu.UI.WinForms; +using Bunifu.UI.WinForms.BunifuButton; + +namespace WebBrowser { partial class frmSettings { /// /// Required designer variable. /// - private System.ComponentModel.IContainer components = null; + private IContainer components = null; /// /// Clean up any resources being used. @@ -1211,42 +1216,42 @@ } #endregion - private System.Windows.Forms.TabControl tabControl1; - private System.Windows.Forms.TabPage tabBrowser; - private Bunifu.UI.WinForms.BunifuLabel bunifuLabel1; - private System.Windows.Forms.TabPage tabPrivacy; - private Bunifu.UI.WinForms.BunifuLabel bunifuLabel2; - private Bunifu.UI.WinForms.BunifuFormDock bunifuFormDock1; - private Bunifu.UI.WinForms.BunifuLabel bunifuLabel3; - private System.Windows.Forms.TabPage tabPersonalization; - private Bunifu.UI.WinForms.BunifuDropdown bunifuDropdown1; - private Bunifu.UI.WinForms.BunifuLabel bunifuLabel6; - private Bunifu.UI.WinForms.BunifuLabel bunifuLabel5; - private Bunifu.UI.WinForms.BunifuLabel bunifuLabel8; - private Bunifu.UI.WinForms.BunifuDropdown bunifuDropdown2; - private Bunifu.UI.WinForms.BunifuLabel bunifuLabel9; - private Bunifu.UI.WinForms.BunifuDropdown bunifuDropdown3; - private Bunifu.UI.WinForms.BunifuLabel bunifuLabel4; - private Bunifu.UI.WinForms.BunifuButton.BunifuButton2 bunifuButton21; - private Bunifu.UI.WinForms.BunifuButton.BunifuButton2 bunifuButton22; - private Bunifu.UI.WinForms.BunifuLabel bunifuLabel7; - private Bunifu.UI.WinForms.BunifuRadioButton bunifuRadioButton2; - private Bunifu.UI.WinForms.BunifuRadioButton bunifuRadioButton1; - private Bunifu.UI.WinForms.BunifuDropdown bunifuDropdown5; - private Bunifu.UI.WinForms.BunifuLabel bunifuLabel11; - private Bunifu.UI.WinForms.BunifuDropdown bunifuDropdown4; - private Bunifu.UI.WinForms.BunifuToggleSwitch2 bunifuToggleSwitch22; - private Bunifu.UI.WinForms.BunifuToggleSwitch2 bunifuToggleSwitch21; - private Bunifu.UI.WinForms.BunifuLabel bunifuLabel10; - private Bunifu.UI.WinForms.BunifuDropdown bunifuDropdown6; - private Bunifu.UI.WinForms.BunifuLabel bunifuLabel12; - internal Bunifu.UI.WinForms.BunifuTextBox bunifuTextBox1; - private System.Windows.Forms.TabPage tabBehavior; - private System.Windows.Forms.PictureBox pictureBox1; - private Bunifu.UI.WinForms.BunifuPictureBox bunifuPictureBox1; - private Bunifu.UI.WinForms.BunifuLabel bunifuLabel13; - private Bunifu.UI.WinForms.BunifuImageButton bunifuImageButton1; - private Bunifu.UI.WinForms.BunifuDropdown bunifuDropdown7; - private Bunifu.UI.WinForms.BunifuLabel bunifuLabel14; + private TabControl tabControl1; + private TabPage tabBrowser; + private BunifuLabel bunifuLabel1; + private TabPage tabPrivacy; + private BunifuLabel bunifuLabel2; + private BunifuFormDock bunifuFormDock1; + private BunifuLabel bunifuLabel3; + private TabPage tabPersonalization; + private BunifuDropdown bunifuDropdown1; + private BunifuLabel bunifuLabel6; + private BunifuLabel bunifuLabel5; + private BunifuLabel bunifuLabel8; + private BunifuDropdown bunifuDropdown2; + private BunifuLabel bunifuLabel9; + private BunifuDropdown bunifuDropdown3; + private BunifuLabel bunifuLabel4; + private BunifuButton2 bunifuButton21; + private BunifuButton2 bunifuButton22; + private BunifuLabel bunifuLabel7; + private BunifuRadioButton bunifuRadioButton2; + private BunifuRadioButton bunifuRadioButton1; + private BunifuDropdown bunifuDropdown5; + private BunifuLabel bunifuLabel11; + private BunifuDropdown bunifuDropdown4; + private BunifuToggleSwitch2 bunifuToggleSwitch22; + private BunifuToggleSwitch2 bunifuToggleSwitch21; + private BunifuLabel bunifuLabel10; + private BunifuDropdown bunifuDropdown6; + private BunifuLabel bunifuLabel12; + internal BunifuTextBox bunifuTextBox1; + private TabPage tabBehavior; + private PictureBox pictureBox1; + private BunifuPictureBox bunifuPictureBox1; + private BunifuLabel bunifuLabel13; + private BunifuImageButton bunifuImageButton1; + private BunifuDropdown bunifuDropdown7; + private BunifuLabel bunifuLabel14; } } \ No newline at end of file diff --git a/WebBrowser/frmSettings.cs b/WebBrowser/frmSettings.cs index 84fab5e..38e10d2 100644 --- a/WebBrowser/frmSettings.cs +++ b/WebBrowser/frmSettings.cs @@ -1,17 +1,7 @@ -using CefSharp.WinForms; -using CefSharp; -using System; -using System.Collections.Generic; -using System.ComponentModel; -using System.Data; +using System; using System.Diagnostics; -using System.Drawing; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using System.Windows.Forms; using Bunifu.UI.WinForms; -using static System.Windows.Forms.VisualStyles.VisualStyleElement; namespace WebBrowser { @@ -23,12 +13,12 @@ namespace WebBrowser } - private void bunifuToggleSwitchflash_CheckedChanged(object sender, Bunifu.UI.WinForms.BunifuToggleSwitch.CheckedChangedEventArgs e) + private void bunifuToggleSwitchflash_CheckedChanged(object sender, BunifuToggleSwitch.CheckedChangedEventArgs e) { } - private void bunifuToggleSwitchcookies_CheckedChanged(object sender, Bunifu.UI.WinForms.BunifuToggleSwitch.CheckedChangedEventArgs e) + private void bunifuToggleSwitchcookies_CheckedChanged(object sender, BunifuToggleSwitch.CheckedChangedEventArgs e) { } @@ -55,7 +45,7 @@ namespace WebBrowser private void bunifuImageButton1_Click(object sender, EventArgs e) { - this.Close(); + Close(); } } }