Release 1.19.0.1

Closes #297

.github/FUNDING.yml

@@ -1,4 +1,3 @@
-# These are supported funding model platforms
+github: chylex
-
 patreon: chylex
 ko_fi: chylex

Application/LockHandler.cs

@@ -1,10 +1,10 @@
 using System;
 using System.ComponentModel;
 using System.Diagnostics;
-using TweetDuck.Core.Utils;
+using TweetDuck.Utils;
 using TweetLib.Core.Application;
 
-namespace TweetDuck.Impl{
+namespace TweetDuck.Application{
     class LockHandler : IAppLockHandler{
         private const int WaitRetryDelay = 250;
         private const int RestoreFailTimeout = 2000;

Application/SystemHandler.cs

@@ -0,0 +1,28 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+using TweetLib.Core.Application;
+
+namespace TweetDuck.Application{
+    class SystemHandler : IAppSystemHandler{
+        void IAppSystemHandler.OpenAssociatedProgram(string path){
+            try{
+                using(Process.Start(new ProcessStartInfo{
+                    FileName = path,
+                    ErrorDialog = true
+                })){}
+            }catch(Exception e){
+                Program.Reporter.HandleException("Error Opening Program", "Could not open the associated program for " + path, true, e);
+            }
+        }
+
+        void IAppSystemHandler.OpenFileExplorer(string path){
+            if (File.Exists(path)){
+                using(Process.Start("explorer.exe", "/select,\"" + path.Replace('/', '\\') + "\"")){}
+            }
+            else if (Directory.Exists(path)){
+                using(Process.Start("explorer.exe", '"' + path.Replace('/', '\\') + '"')){}
+            }
+        }
+    }
+}

Browser/Adapters/CefScriptExecutor.cs

@@ -2,7 +2,7 @@
 using CefSharp;
 using TweetLib.Core.Browser;
 
-namespace TweetDuck.Core.Adapters{
+namespace TweetDuck.Browser.Adapters{
     sealed class CefScriptExecutor : IScriptExecutor{
         private readonly IWebBrowser browser;
 

Browser/Bridge/PropertyBridge.cs

@@ -1,7 +1,9 @@
 using System.Text;
 using TweetDuck.Configuration;
+using TweetLib.Core;
+using TweetLib.Core.Utils;
 
-namespace TweetDuck.Core.Bridge{
+namespace TweetDuck.Browser.Bridge{
     static class PropertyBridge{
         public enum Environment{
             Browser, Notification
@@ -12,7 +14,7 @@ namespace TweetDuck.Core.Bridge{
             static string Str(string value) => $"\"{value}\";";
 
             UserConfig config = Program.Config.User;
-            StringBuilder build = new StringBuilder(128).Append("(function(x){");
+            StringBuilder build = new StringBuilder(384).Append("(function(x){");
 
             build.Append("x.expandLinksOnHover=").Append(Bool(config.ExpandLinksOnHover));
             
@@ -23,13 +25,14 @@ namespace TweetDuck.Core.Bridge{
                 build.Append("x.muteNotifications=").Append(Bool(config.MuteNotifications));
                 build.Append("x.notificationMediaPreviews=").Append(Bool(config.NotificationMediaPreviews));
                 build.Append("x.translationTarget=").Append(Str(config.TranslationTarget));
+                build.Append("x.firstDayOfWeek=").Append(config.CalendarFirstDay == -1 ? LocaleUtils.GetJQueryDayOfWeek(Lib.Culture.DateTimeFormat.FirstDayOfWeek) : config.CalendarFirstDay);
             }
 
             if (environment == Environment.Notification){
                 build.Append("x.skipOnLinkClick=").Append(Bool(config.NotificationSkipOnLinkClick));
             }
             
-            return build.Append("})(window.$TDX=window.$TDX||{})").ToString();
+            return build.Append("})(window.$TDX=window.$TDX||{});if(window.TDGF_onPropertiesUpdated)window.TDGF_onPropertiesUpdated()").ToString();
         }
     }
 }

Browser/Bridge/TweetDeckBridge.cs

@@ -1,13 +1,18 @@
-using System.Diagnostics.CodeAnalysis;
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Threading.Tasks;
 using System.Windows.Forms;
-using TweetDuck.Core.Controls;
+using CefSharp;
-using TweetDuck.Core.Handling;
+using TweetDuck.Browser.Handling;
-using TweetDuck.Core.Notification;
+using TweetDuck.Browser.Notification;
-using TweetDuck.Core.Other;
+using TweetDuck.Controls;
-using TweetDuck.Core.Utils;
+using TweetDuck.Dialogs;
+using TweetDuck.Management;
+using TweetDuck.Utils;
 using TweetLib.Core.Features.Notifications;
+using TweetLib.Core.Utils;
 
-namespace TweetDuck.Core.Bridge{
+namespace TweetDuck.Browser.Bridge{
     [SuppressMessage("ReSharper", "UnusedMember.Global")]
     class TweetDeckBridge{
         public static void ResetStaticProperties(){
@@ -37,9 +42,7 @@ namespace TweetDuck.Core.Bridge{
             }
             
             public void OnIntroductionClosed(bool showGuide, bool allowDataCollection){
-                form.InvokeAsyncSafe(() => {
+                form.InvokeAsyncSafe(() => form.OnIntroductionClosed(showGuide, allowDataCollection));
-                    form.OnIntroductionClosed(showGuide, allowDataCollection);
-                });
             }
 
             public void LoadNotificationLayout(string fontSize, string headLayout){
@@ -100,18 +103,39 @@ namespace TweetDuck.Core.Bridge{
             form.InvokeAsyncSafe(() => form.OnTweetScreenshotReady(html, width));
         }
 
-        public void PlayVideo(string url, string username){
+        public void PlayVideo(string videoUrl, string tweetUrl, string username, IJavascriptCallback callShowOverlay){
-            form.InvokeAsyncSafe(() => form.PlayVideo(url, username));
+            form.InvokeAsyncSafe(() => form.PlayVideo(videoUrl, tweetUrl, username, callShowOverlay));
+        }
+        
+        public void StopVideo(){
+            form.InvokeAsyncSafe(form.StopVideo);
         }
 
         public void FixClipboard(){
-            form.InvokeAsyncSafe(WindowsUtils.ClipboardStripHtmlStyles);
+            form.InvokeAsyncSafe(ClipboardManager.StripHtmlStyles);
         }
 
         public void OpenBrowser(string url){
             form.InvokeAsyncSafe(() => BrowserUtils.OpenExternalBrowser(url));
         }
 
+        public void MakeGetRequest(string url, IJavascriptCallback onSuccess, IJavascriptCallback onError){
+            Task.Run(async () => {
+                var client = WebUtils.NewClient(BrowserUtils.UserAgentVanilla);
+
+                try{
+                    var result = await client.DownloadStringTaskAsync(url);
+                    await onSuccess.ExecuteAsync(result);
+                }catch(Exception e){
+                    await onError.ExecuteAsync(e.Message);
+                }finally{
+                    onSuccess.Dispose();
+                    onError.Dispose();
+                    client.Dispose();
+                }
+            });
+        }
+
         public int GetIdleSeconds(){
             return NativeMethods.GetIdleSeconds();
         }

Browser/Bridge/UpdateBridge.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Windows.Forms;
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
-using TweetLib.Core.Features.Updates;
+using TweetLib.Core.Systems.Updates;
 
-namespace TweetDuck.Core.Bridge{
+namespace TweetDuck.Browser.Bridge{
     [SuppressMessage("ReSharper", "UnusedMember.Global")]
     class UpdateBridge{
         private readonly UpdateHandler updates;

Browser/Data/ContextInfo.cs

@@ -2,7 +2,7 @@
 using CefSharp;
 using TweetLib.Core.Utils;
 
-namespace TweetDuck.Core.Management{
+namespace TweetDuck.Browser.Data{
     sealed class ContextInfo{
         private LinkInfo link;
         private ChirpInfo? chirp;

Browser/Data/ResourceHandlers.cs

@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Concurrent;
+using CefSharp;
+
+namespace TweetDuck.Browser.Data{
+    sealed class ResourceHandlers{
+        private readonly ConcurrentDictionary<string, Func<IResourceHandler>> handlers = new ConcurrentDictionary<string, Func<IResourceHandler>>(StringComparer.OrdinalIgnoreCase);
+
+        public bool HasHandler(IRequest request){
+            return handlers.ContainsKey(request.Url);
+        }
+
+        public IResourceHandler GetHandler(IRequest request){
+            return handlers.TryGetValue(request.Url, out var factory) ? factory() : null;
+        }
+
+        public bool Register(string url, Func<IResourceHandler> factory){
+            if (Uri.TryCreate(url, UriKind.Absolute, out Uri uri)){
+                handlers.AddOrUpdate(uri.AbsoluteUri, factory, (key, prev) => factory);
+                return true;
+            }
+
+            return false;
+        }
+
+        public bool Register(ResourceLink link){
+            return Register(link.Url, link.Factory);
+        }
+
+        public bool Unregister(string url){
+            return handlers.TryRemove(url, out _);
+        }
+
+        public bool Unregister(ResourceLink link){
+            return Unregister(link.Url);
+        }
+
+        public static Func<IResourceHandler> ForString(string str){
+            return () => ResourceHandler.FromString(str);
+        }
+
+        public static Func<IResourceHandler> ForString(string str, string mimeType){
+            return () => ResourceHandler.FromString(str, mimeType: mimeType);
+        }
+
+        public static Func<IResourceHandler> ForBytes(byte[] bytes, string mimeType){
+            return () => ResourceHandler.FromByteArray(bytes, mimeType);
+        }
+    }
+}

Browser/Data/ResourceLink.cs

@@ -0,0 +1,14 @@
+using System;
+using CefSharp;
+
+namespace TweetDuck.Browser.Data{
+    sealed class ResourceLink{
+        public string Url { get; }
+        public Func<IResourceHandler> Factory { get; }
+
+        public ResourceLink(string url, Func<IResourceHandler> factory){
+            this.Url = url;
+            this.Factory = factory;
+        }
+    }
+}

Browser/Data/WindowState.cs

@@ -1,10 +1,10 @@
 using System.Drawing;
 using System.Windows.Forms;
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
 using TweetLib.Core.Serialization.Converters;
 using TweetLib.Core.Utils;
 
-namespace TweetDuck.Data{
+namespace TweetDuck.Browser.Data{
     sealed class WindowState{
         private Rectangle rect;
         private bool isMaximized;

Browser/FormBrowser.Designer.cs

@@ -1,21 +1,10 @@
-namespace TweetDuck.Core {
+namespace TweetDuck.Browser {
     sealed partial class FormBrowser {
         /// <summary>
         /// Required designer variable.
         /// </summary>
         private System.ComponentModel.IContainer components = null;
 
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing) {
-            if (disposing && (components != null)) {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
         #region Windows Form Designer generated code
 
         /// <summary>
@@ -24,7 +13,7 @@
         /// </summary>
         private void InitializeComponent() {
             this.components = new System.ComponentModel.Container();
-            this.trayIcon = new TweetDuck.Core.Other.TrayIcon(this.components);
+            this.trayIcon = new TrayIcon(this.components);
             this.toolTip = new System.Windows.Forms.ToolTip(this.components);
             this.timerResize = new System.Windows.Forms.Timer(this.components);
             this.SuspendLayout();
@@ -38,10 +27,10 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.BackColor = TweetDuck.Core.Utils.TwitterUtils.BackgroundColor;
+            this.BackColor = TweetDuck.Utils.TwitterUtils.BackgroundColor;
             this.ClientSize = new System.Drawing.Size(1008, 730);
             this.Icon = Properties.Resources.icon;
-            this.Location = TweetDuck.Core.Controls.ControlExtensions.InvisibleLocation;
+            this.Location = TweetDuck.Controls.ControlExtensions.InvisibleLocation;
             this.MinimumSize = new System.Drawing.Size(348, 424);
             this.Name = "FormBrowser";
             this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
@@ -57,7 +46,7 @@
 
         #endregion
 
-        private TweetDuck.Core.Other.TrayIcon trayIcon;
+        private TrayIcon trayIcon;
         private System.Windows.Forms.ToolTip toolTip;
         private System.Windows.Forms.Timer timerResize;
     }

Browser/FormBrowser.cs

@@ -1,26 +1,29 @@
 using System;
 using System.Diagnostics;
 using System.Drawing;
+using System.IO;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using CefSharp;
+using TweetDuck.Browser.Bridge;
+using TweetDuck.Browser.Handling;
+using TweetDuck.Browser.Handling.General;
+using TweetDuck.Browser.Notification;
+using TweetDuck.Browser.Notification.Screenshot;
 using TweetDuck.Configuration;
-using TweetDuck.Core.Bridge;
+using TweetDuck.Controls;
-using TweetDuck.Core.Controls;
+using TweetDuck.Dialogs;
-using TweetDuck.Core.Handling;
+using TweetDuck.Dialogs.Settings;
-using TweetDuck.Core.Handling.General;
+using TweetDuck.Management;
-using TweetDuck.Core.Management;
+using TweetDuck.Management.Analytics;
-using TweetDuck.Core.Notification;
+using TweetDuck.Plugins;
-using TweetDuck.Core.Notification.Screenshot;
-using TweetDuck.Core.Other;
-using TweetDuck.Core.Other.Analytics;
-using TweetDuck.Core.Other.Settings.Dialogs;
-using TweetDuck.Core.Utils;
 using TweetDuck.Updates;
+using TweetDuck.Utils;
 using TweetLib.Core.Features.Plugins;
 using TweetLib.Core.Features.Plugins.Events;
-using TweetLib.Core.Features.Updates;
+using TweetLib.Core.Systems.Updates;
 
-namespace TweetDuck.Core{
+namespace TweetDuck.Browser{
     sealed partial class FormBrowser : Form, AnalyticsFile.IProvider{
         private static UserConfig Config => Program.Config.User;
 
@@ -41,15 +44,18 @@ namespace TweetDuck.Core{
             }
         }
 
-        public string UpdateInstallerPath { get; private set; }
+        public UpdateInstaller UpdateInstaller { get; private set; }
         private bool ignoreUpdateCheckError;
         
         public AnalyticsFile AnalyticsFile => analytics?.File ?? AnalyticsFile.Dummy;
 
+        #pragma warning disable IDE0069 // Disposable fields should be disposed
         private readonly TweetDeckBrowser browser;
+        private readonly FormNotificationTweet notification;
+        #pragma warning restore IDE0069 // Disposable fields should be disposed
+
         private readonly PluginManager plugins;
         private readonly UpdateHandler updates;
-        private readonly FormNotificationTweet notification;
         private readonly ContextMenu contextMenu;
         private readonly UpdateBridge updateBridge;
 
@@ -60,7 +66,7 @@ namespace TweetDuck.Core{
         private VideoPlayer videoPlayer;
         private AnalyticsManager analytics;
 
-        public FormBrowser(){
+        public FormBrowser(PluginSchemeFactory pluginScheme){
             InitializeComponent();
 
             Text = Program.BrandName;
@@ -69,6 +75,7 @@ namespace TweetDuck.Core{
             this.plugins.Reloaded += plugins_Reloaded;
             this.plugins.Executed += plugins_Executed;
             this.plugins.Reload();
+            pluginScheme.Setup(plugins);
 
             this.notification = new FormNotificationTweet(this, plugins);
             this.notification.Show();
@@ -88,14 +95,7 @@ namespace TweetDuck.Core{
             Disposed += (sender, args) => {
                 Config.MuteToggled -= Config_MuteToggled;
                 Config.TrayBehaviorChanged -= Config_TrayBehaviorChanged;
-                
                 browser.Dispose();
-                updates.Dispose();
-                contextMenu.Dispose();
-
-                notificationScreenshotManager?.Dispose();
-                videoPlayer?.Dispose();
-                analytics?.Dispose();
             };
 
             Config.MuteToggled += Config_MuteToggled;
@@ -117,6 +117,21 @@ namespace TweetDuck.Core{
             RestoreWindow();
         }
 
+        protected override void Dispose(bool disposing){
+            if (disposing){
+                components?.Dispose();
+
+                updates.Dispose();
+                contextMenu.Dispose();
+
+                notificationScreenshotManager?.Dispose();
+                videoPlayer?.Dispose();
+                analytics?.Dispose();
+            }
+
+            base.Dispose(disposing);
+        }
+
         private void ShowChildForm(Form form){
             form.VisibleChanged += (sender, args) => form.MoveToCenter(this);
             form.Show(this);
@@ -131,6 +146,8 @@ namespace TweetDuck.Core{
 
         private void RestoreWindow(){
             Config.BrowserWindow.Restore(this, true);
+            browser.PrepareSize(ClientSize);
+
             prevState = WindowState;
             isLoaded = true;
         }
@@ -150,7 +167,9 @@ namespace TweetDuck.Core{
         }
 
         private void FormBrowser_Activated(object sender, EventArgs e){
-            if (!isLoaded)return;
+            if (!isLoaded){
+                return;
+            }
 
             trayIcon.HasNotifications = false;
 
@@ -160,14 +179,18 @@ namespace TweetDuck.Core{
         }
 
         private void FormBrowser_LocationChanged(object sender, EventArgs e){
-            if (!isLoaded)return;
+            if (!isLoaded){
+                return;
+            }
             
             timerResize.Stop();
             timerResize.Start();
         }
 
         private void FormBrowser_Resize(object sender, EventArgs e){
-            if (!isLoaded)return;
+            if (!isLoaded){
+                return;
+            }
 
             if (WindowState != prevState){
                 prevState = WindowState;
@@ -188,9 +211,12 @@ namespace TweetDuck.Core{
         }
 
         private void FormBrowser_ResizeEnd(object sender, EventArgs e){ // also triggers when the window moves
-            if (!isLoaded)return;
+            if (!isLoaded){
+                return;
+            }
 
             timerResize.Stop();
+            browser.PrepareSize(ClientSize); // needed to pre-size browser control when launched in maximized state
             
             if (Location != ControlExtensions.InvisibleLocation){
                 Config.BrowserWindow.Save(this);
@@ -199,7 +225,9 @@ namespace TweetDuck.Core{
         }
 
         private void FormBrowser_FormClosing(object sender, FormClosingEventArgs e){
-            if (!isLoaded)return;
+            if (!isLoaded){
+                return;
+            }
 
             if (Config.TrayBehavior.ShouldHideOnClose() && trayIcon.Visible && e.CloseReason == CloseReason.UserClosing){
                 Hide(); // hides taskbar too?! welp that works I guess
@@ -208,7 +236,7 @@ namespace TweetDuck.Core{
         }
 
         private void FormBrowser_FormClosed(object sender, FormClosedEventArgs e){
-            if (isLoaded && UpdateInstallerPath == null){
+            if (isLoaded && UpdateInstaller == null){
                 updateBridge.Cleanup();
             }
         }
@@ -235,9 +263,7 @@ namespace TweetDuck.Core{
         
         private void plugins_Reloaded(object sender, PluginErrorEventArgs e){
             if (e.HasErrors){
-                this.InvokeAsyncSafe(() => { // TODO not needed but makes code consistent...
+                FormMessage.Error("Error Loading Plugins", "The following plugins will not be available until the issues are resolved:\n\n" + string.Join("\n\n", e.Errors), FormMessage.OK);
-                    FormMessage.Error("Error Loading Plugins", "The following plugins will not be available until the issues are resolved:\n\n" + string.Join("\n\n", e.Errors), FormMessage.OK);
-                });
             }
 
             if (isLoaded){
@@ -286,7 +312,7 @@ namespace TweetDuck.Core{
                 UpdateDownloadStatus status = update.DownloadStatus;
 
                 if (status == UpdateDownloadStatus.Done){
-                    UpdateInstallerPath = update.InstallerPath;
+                    UpdateInstaller = new UpdateInstaller(update.InstallerPath);
                     ForceClose();
                 }
                 else if (status != UpdateDownloadStatus.Canceled && FormMessage.Error("Update Has Failed", "Could not automatically download the update: " + (update.DownloadError?.Message ?? "unknown error") + "\n\nWould you like to open the website and try downloading the update manually?", FormMessage.Yes, FormMessage.No)){
@@ -489,12 +515,12 @@ namespace TweetDuck.Core{
         public void OpenProfileImport(){
             FormManager.TryFind<FormSettings>()?.Close();
 
-            using(DialogSettingsManage dialog = new DialogSettingsManage(plugins, true)){
+            using DialogSettingsManage dialog = new DialogSettingsManage(plugins, true);
-                if (!dialog.IsDisposed && dialog.ShowDialog() == DialogResult.OK && !dialog.IsRestarting){ // needs disposal check because the dialog may be closed in constructor
+
-                    BrowserProcessHandler.UpdatePrefs();
+            if (!dialog.IsDisposed && dialog.ShowDialog() == DialogResult.OK && !dialog.IsRestarting){ // needs disposal check because the dialog may be closed in constructor
-                    FormManager.TryFind<FormPlugins>()?.Close();
+                BrowserProcessHandler.UpdatePrefs();
-                    plugins.Reload(); // also reloads the browser
+                FormManager.TryFind<FormPlugins>()?.Close();
-                }
+                plugins.Reload(); // also reloads the browser
             }
         }
 
@@ -508,24 +534,40 @@ namespace TweetDuck.Core{
             AnalyticsFile.SoundNotifications.Trigger();
         }
 
-        public void PlayVideo(string url, string username){
+        public void PlayVideo(string videoUrl, string tweetUrl, string username, IJavascriptCallback callShowOverlay){
-            if (string.IsNullOrEmpty(url)){
+            string playerPath = Config.VideoPlayerPath;
-                videoPlayer?.Close();
+
-                return;
+            if (playerPath == null || !File.Exists(playerPath)){
+                if (videoPlayer == null){
+                    videoPlayer = new VideoPlayer(this);
+                    videoPlayer.ProcessExited += (sender, args) => browser.HideVideoOverlay(true);
+                }
+                
+                callShowOverlay.ExecuteAsync();
+                callShowOverlay.Dispose();
+
+                videoPlayer.Launch(videoUrl, tweetUrl, username);
+            }
+            else{
+                callShowOverlay.Dispose();
+
+                string quotedUrl = '"' + videoUrl + '"';
+                string playerArgs = Config.VideoPlayerPathArgs == null ? quotedUrl : Config.VideoPlayerPathArgs + ' ' + quotedUrl;
+                
+                try{
+                    using(Process.Start(playerPath, playerArgs)){}
+                }catch(Exception e){
+                    Program.Reporter.HandleException("Error Opening Video Player", "Could not open the video player.", true, e);
+                }
             }
             
-            if (videoPlayer == null){
-                videoPlayer = new VideoPlayer(this);
-
-                videoPlayer.ProcessExited += (sender, args) => {
-                    browser.HideVideoOverlay(true);
-                };
-            }
-            
-            videoPlayer.Launch(url, username);
             AnalyticsFile.VideoPlays.Trigger();
         }
 
+        public void StopVideo(){
+            videoPlayer?.Close();
+        }
+
         public bool ProcessBrowserKey(Keys key){
             if (videoPlayer != null && videoPlayer.Running){
                 videoPlayer.SendKeyEvent(key);

Browser/Handling/ContextMenuBase.cs

@@ -1,20 +1,21 @@
 using System;
+using System.Linq;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using CefSharp;
-using TweetDuck.Core.Controls;
+using TweetDuck.Browser.Adapters;
-using TweetDuck.Core.Utils;
+using TweetDuck.Browser.Data;
-using System.Linq;
+using TweetDuck.Browser.Notification;
 using TweetDuck.Configuration;
-using TweetDuck.Core.Adapters;
+using TweetDuck.Controls;
-using TweetDuck.Core.Management;
+using TweetDuck.Dialogs;
-using TweetDuck.Core.Notification;
+using TweetDuck.Management;
-using TweetDuck.Core.Other;
+using TweetDuck.Management.Analytics;
-using TweetDuck.Core.Other.Analytics;
+using TweetDuck.Utils;
 using TweetLib.Core.Features.Twitter;
 using TweetLib.Core.Utils;
 
-namespace TweetDuck.Core.Handling{
+namespace TweetDuck.Browser.Handling{
     abstract class ContextMenuBase : IContextMenuHandler{
         public static ContextInfo CurrentInfo { get; } = new ContextInfo();
 
@@ -27,10 +28,11 @@ namespace TweetDuck.Core.Handling{
         private const CefMenuCommand MenuViewImage       = (CefMenuCommand)26503;
         private const CefMenuCommand MenuOpenMediaUrl    = (CefMenuCommand)26504;
         private const CefMenuCommand MenuCopyMediaUrl    = (CefMenuCommand)26505;
-        private const CefMenuCommand MenuSaveMedia       = (CefMenuCommand)26506;
+        private const CefMenuCommand MenuCopyImage       = (CefMenuCommand)26506;
-        private const CefMenuCommand MenuSaveTweetImages = (CefMenuCommand)26507;
+        private const CefMenuCommand MenuSaveMedia       = (CefMenuCommand)26507;
-        private const CefMenuCommand MenuSearchInBrowser = (CefMenuCommand)26508;
+        private const CefMenuCommand MenuSaveTweetImages = (CefMenuCommand)26508;
-        private const CefMenuCommand MenuReadApplyROT13  = (CefMenuCommand)26509;
+        private const CefMenuCommand MenuSearchInBrowser = (CefMenuCommand)26509;
+        private const CefMenuCommand MenuReadApplyROT13  = (CefMenuCommand)26510;
         private const CefMenuCommand MenuOpenDevTools    = (CefMenuCommand)26599;
         
         protected ContextInfo.ContextData Context { get; private set; }
@@ -84,6 +86,7 @@ namespace TweetDuck.Core.Handling{
                 model.AddItem(MenuViewImage, "View image in photo viewer");
                 model.AddItem(MenuOpenMediaUrl, TextOpen("image"));
                 model.AddItem(MenuCopyMediaUrl, TextCopy("image"));
+                model.AddItem(MenuCopyImage, "Copy image");
                 model.AddItem(MenuSaveMedia, TextSave("image"));
 
                 if (Context.Chirp.Images.Length > 1){
@@ -123,6 +126,16 @@ namespace TweetDuck.Core.Handling{
                     SetClipboardText(control, TwitterUrls.GetMediaLink(Context.MediaUrl, ImageQuality));
                     break;
 
+                case MenuCopyImage: {
+                    string url = Context.MediaUrl;
+
+                    control.InvokeAsyncSafe(() => {
+                        TwitterUtils.CopyImage(url, ImageQuality);
+                    });
+                    
+                    break;
+                }
+
                 case MenuViewImage: {
                     string url = Context.MediaUrl;
 
@@ -178,7 +191,7 @@ namespace TweetDuck.Core.Handling{
                     break;
                     
                 case MenuOpenDevTools:
-                    browserControl.ShowDevTools();
+                    browserControl.OpenDevToolsCustom();
                     break;
             }
 
@@ -202,7 +215,7 @@ namespace TweetDuck.Core.Handling{
         }
 
         protected static void SetClipboardText(Control control, string text){
-            control.InvokeAsyncSafe(() => WindowsUtils.SetClipboard(text, TextDataFormat.UnicodeText));
+            control.InvokeAsyncSafe(() => ClipboardManager.SetText(text, TextDataFormat.UnicodeText));
         }
 
         protected static void InsertSelectionSearchItem(IMenuModel model, CefMenuCommand insertCommand, string insertLabel){

Browser/Handling/ContextMenuBrowser.cs

@@ -1,10 +1,10 @@
-using CefSharp;
+using System.Windows.Forms;
-using System.Windows.Forms;
+using CefSharp;
-using TweetDuck.Core.Controls;
+using TweetDuck.Browser.Data;
-using TweetDuck.Core.Management;
+using TweetDuck.Controls;
 using TweetLib.Core.Features.Twitter;
 
-namespace TweetDuck.Core.Handling{
+namespace TweetDuck.Browser.Handling{
     sealed class ContextMenuBrowser : ContextMenuBase{
         private const CefMenuCommand MenuGlobal   = (CefMenuCommand)26600;
         private const CefMenuCommand MenuMute     = (CefMenuCommand)26601;

Browser/Handling/ContextMenuGuide.cs

@@ -1,7 +1,7 @@
 using CefSharp;
-using TweetDuck.Core.Other.Analytics;
+using TweetDuck.Management.Analytics;
 
-namespace TweetDuck.Core.Handling{
+namespace TweetDuck.Browser.Handling{
     sealed class ContextMenuGuide : ContextMenuBase{
         public ContextMenuGuide(AnalyticsFile.IProvider analytics) : base(analytics){}
 

Browser/Handling/ContextMenuNotification.cs

@@ -1,8 +1,8 @@
 using CefSharp;
-using TweetDuck.Core.Controls;
+using TweetDuck.Browser.Notification;
-using TweetDuck.Core.Notification;
+using TweetDuck.Controls;
 
-namespace TweetDuck.Core.Handling{
+namespace TweetDuck.Browser.Handling{
     sealed class ContextMenuNotification : ContextMenuBase{
         private const CefMenuCommand MenuViewDetail         = (CefMenuCommand)26600;
         private const CefMenuCommand MenuSkipTweet          = (CefMenuCommand)26601;

Browser/Handling/DragHandlerBrowser.cs

@@ -2,7 +2,7 @@
 using CefSharp;
 using CefSharp.Enums;
 
-namespace TweetDuck.Core.Handling{
+namespace TweetDuck.Browser.Handling{
     sealed class DragHandlerBrowser : IDragHandler{
         private readonly RequestHandlerBrowser requestHandler;
 
@@ -30,6 +30,6 @@ namespace TweetDuck.Core.Handling{
             return false;
         }
 
-        public void OnDraggableRegionsChanged(IWebBrowser browserControl, IBrowser browser, IList<DraggableRegion> regions){}
+        public void OnDraggableRegionsChanged(IWebBrowser browserControl, IBrowser browser, IFrame frame, IList<DraggableRegion> regions){}
     }
 }

Browser/Handling/Filters/ResponseFilterBase.cs

@@ -3,7 +3,7 @@ using System.IO;
 using System.Text;
 using CefSharp;
 
-namespace TweetDuck.Core.Handling.Filters{
+namespace TweetDuck.Browser.Handling.Filters{
     abstract class ResponseFilterBase : IResponseFilter{
         private enum State{
             Reading, Writing, Done

Browser/Handling/Filters/ResponseFilterVendor.cs

@@ -1,7 +1,7 @@
 using System.Text;
 using System.Text.RegularExpressions;
 
-namespace TweetDuck.Core.Handling.Filters{
+namespace TweetDuck.Browser.Handling.Filters{
     sealed class ResponseFilterVendor : ResponseFilterBase{
         private static readonly Regex RegexRestoreJQuery = new Regex(@"(\w+)\.fn=\1\.prototype", RegexOptions.Compiled);
 

Browser/Handling/General/BrowserProcessHandler.cs

@@ -3,7 +3,7 @@ using System.Threading.Tasks;
 using CefSharp;
 using TweetDuck.Configuration;
 
-namespace TweetDuck.Core.Handling.General{
+namespace TweetDuck.Browser.Handling.General{
     sealed class BrowserProcessHandler : IBrowserProcessHandler{
         public static Task UpdatePrefs(){
             return Cef.UIThreadTaskFactory.StartNew(UpdatePrefsInternal);

Browser/Handling/General/FileDialogHandler.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Windows.Forms;
 using CefSharp;
 
-namespace TweetDuck.Core.Handling.General{
+namespace TweetDuck.Browser.Handling.General{
     sealed class FileDialogHandler : IDialogHandler{
         public bool OnFileDialog(IWebBrowser browserControl, IBrowser browser, CefFileDialogMode mode, CefFileDialogFlags flags, string title, string defaultFilePath, List<string> acceptFilters, int selectedAcceptFilter, IFileDialogCallback callback){
             if (mode == CefFileDialogMode.Open || mode == CefFileDialogMode.OpenMultiple){

Browser/Handling/General/JavaScriptDialogHandler.cs

@@ -1,11 +1,11 @@
 using System.Drawing;
 using System.Windows.Forms;
 using CefSharp;
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
-using TweetDuck.Core.Other;
+using TweetDuck.Dialogs;
-using TweetDuck.Core.Utils;
+using TweetDuck.Utils;
 
-namespace TweetDuck.Core.Handling.General{
+namespace TweetDuck.Browser.Handling.General{
     sealed class JavaScriptDialogHandler : IJsDialogHandler{
         private static FormMessage CreateMessageForm(string caption, string text){
             MessageBoxIcon icon = MessageBoxIcon.None;
@@ -82,7 +82,8 @@ namespace TweetDuck.Core.Handling.General{
             return true;
         }
 
-        bool IJsDialogHandler.OnJSBeforeUnload(IWebBrowser browserControl, IBrowser browser, string message, bool isReload, IJsDialogCallback callback){
+        bool IJsDialogHandler.OnBeforeUnloadDialog(IWebBrowser browserControl, IBrowser browser, string messageText, bool isReload, IJsDialogCallback callback){
+            callback.Dispose();
             return false;
         }
 

Browser/Handling/General/LifeSpanHandler.cs

@@ -1,8 +1,8 @@
 using CefSharp;
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
-using TweetDuck.Core.Utils;
+using TweetDuck.Utils;
 
-namespace TweetDuck.Core.Handling.General{
+namespace TweetDuck.Browser.Handling.General{
     sealed class LifeSpanHandler : ILifeSpanHandler{
         private static bool IsPopupAllowed(string url){
             return url.StartsWith("https://twitter.com/teams/authorize?");

Browser/Handling/KeyboardHandlerBase.cs

@@ -1,15 +1,15 @@
 using System.Windows.Forms;
 using CefSharp;
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
-using TweetDuck.Core.Other;
+using TweetDuck.Dialogs;
-using TweetDuck.Core.Utils;
+using TweetDuck.Utils;
 
-namespace TweetDuck.Core.Handling{
+namespace TweetDuck.Browser.Handling{
     class KeyboardHandlerBase : IKeyboardHandler{
         protected virtual bool HandleRawKey(IWebBrowser browserControl, IBrowser browser, Keys key, CefEventFlags modifiers){
             if (modifiers == (CefEventFlags.ControlDown | CefEventFlags.ShiftDown) && key == Keys.I){
                 if (BrowserUtils.HasDevTools){
-                    browser.ShowDevTools();
+                    browserControl.OpenDevToolsCustom();
                 }
                 else{
                     browserControl.AsControl().InvokeSafe(() => {
@@ -33,7 +33,7 @@ namespace TweetDuck.Core.Handling{
         }
 
         bool IKeyboardHandler.OnPreKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey, ref bool isKeyboardShortcut){
-            if (type == KeyType.RawKeyDown && !browser.FocusedFrame.Url.StartsWith("chrome-devtools://")){
+            if (type == KeyType.RawKeyDown && !browser.FocusedFrame.Url.StartsWith("devtools://")){
                 return HandleRawKey(browserControl, browser, (Keys)windowsKeyCode, modifiers);
             }
 

Browser/Handling/KeyboardHandlerBrowser.cs

@@ -1,7 +1,7 @@
 using System.Windows.Forms;
 using CefSharp;
 
-namespace TweetDuck.Core.Handling{
+namespace TweetDuck.Browser.Handling{
     sealed class KeyboardHandlerBrowser : KeyboardHandlerBase{
         private readonly FormBrowser form;
 

Browser/Handling/KeyboardHandlerNotification.cs

@@ -1,9 +1,9 @@
-using CefSharp;
+using System.Windows.Forms;
-using System.Windows.Forms;
+using CefSharp;
-using TweetDuck.Core.Controls;
+using TweetDuck.Browser.Notification;
-using TweetDuck.Core.Notification;
+using TweetDuck.Controls;
 
-namespace TweetDuck.Core.Handling {
+namespace TweetDuck.Browser.Handling{
     sealed class KeyboardHandlerNotification : KeyboardHandlerBase{
         private readonly FormNotificationBase notification;
 

Browser/Handling/RequestHandlerBase.cs

@@ -0,0 +1,23 @@
+using CefSharp;
+using CefSharp.Handler;
+using TweetDuck.Browser.Handling.General;
+
+namespace TweetDuck.Browser.Handling{
+    class RequestHandlerBase : RequestHandler{
+        private readonly bool autoReload;
+
+        public RequestHandlerBase(bool autoReload){
+            this.autoReload = autoReload;
+        }
+
+        protected override bool OnOpenUrlFromTab(IWebBrowser browserControl, IBrowser browser, IFrame frame, string targetUrl, WindowOpenDisposition targetDisposition, bool userGesture){
+            return LifeSpanHandler.HandleLinkClick(browserControl, targetDisposition, targetUrl);
+        }
+        
+        protected override void OnRenderProcessTerminated(IWebBrowser browserControl, IBrowser browser, CefTerminationStatus status){
+            if (autoReload){
+                browser.Reload();
+            }
+        }
+    }
+}

Browser/Handling/RequestHandlerBrowser.cs

@@ -0,0 +1,23 @@
+using CefSharp;
+using TweetLib.Core.Features.Twitter;
+
+namespace TweetDuck.Browser.Handling{
+    sealed class RequestHandlerBrowser : RequestHandlerBase{
+        public string BlockNextUserNavUrl { get; set; }
+
+        public RequestHandlerBrowser() : base(true){}
+
+        protected override bool OnBeforeBrowse(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, bool userGesture, bool isRedirect){
+            if (userGesture && request.TransitionType == TransitionType.LinkClicked){
+                bool block = request.Url == BlockNextUserNavUrl;
+                BlockNextUserNavUrl = string.Empty;
+                return block;
+            }
+            else if (request.TransitionType.HasFlag(TransitionType.ForwardBack) && TwitterUrls.IsTweetDeck(frame.Url)){
+                return true;
+            }
+
+            return base.OnBeforeBrowse(browserControl, browser, frame, request, userGesture, isRedirect);
+        }
+    }
+}

Browser/Handling/ResourceHandlerNotification.cs

@@ -1,9 +1,11 @@
-using CefSharp;
+using System;
 using System.Collections.Specialized;
 using System.IO;
 using System.Text;
+using CefSharp;
+using CefSharp.Callback;
 
-namespace TweetDuck.Core.Handling{
+namespace TweetDuck.Browser.Handling{
     sealed class ResourceHandlerNotification : IResourceHandler{
         private readonly NameValueCollection headers = new NameValueCollection(0);
         private MemoryStream dataIn;
@@ -20,8 +22,14 @@ namespace TweetDuck.Core.Handling{
             }
         }
 
-        bool IResourceHandler.ProcessRequest(IRequest request, ICallback callback){
+        bool IResourceHandler.Open(IRequest request, out bool handleRequest, ICallback callback){
-            callback.Continue();
+            callback.Dispose();
+            handleRequest = true;
+
+            if (dataIn != null){
+                dataIn.Position = 0;
+            }
+
             return true;
         }
 
@@ -31,31 +39,39 @@ namespace TweetDuck.Core.Handling{
             response.MimeType = "text/html";
             response.StatusCode = 200;
             response.StatusText = "OK";
-            response.ResponseHeaders = headers;
+            response.Headers = headers;
-            responseLength = dataIn?.Length ?? -1;
+            responseLength = dataIn?.Length ?? 0;
+        }
+
+        bool IResourceHandler.Read(Stream dataOut, out int bytesRead, IResourceReadCallback callback){
+            callback?.Dispose(); // TODO unnecessary null check once ReadResponse is removed
+
+            try{
+                byte[] buffer = new byte[Math.Min(dataIn.Length - dataIn.Position, dataOut.Length)];
+                int length = buffer.Length;
+
+                dataIn.Read(buffer, 0, length);
+                dataOut.Write(buffer, 0, length);
+                bytesRead = length;
+            }catch{ // catch IOException, possibly NullReferenceException if dataIn is null
+                bytesRead = 0;
+            }
+
+            return bytesRead > 0;
+        }
+
+        bool IResourceHandler.Skip(long bytesToSkip, out long bytesSkipped, IResourceSkipCallback callback){
+            bytesSkipped = -2; // ERR_FAILED
+            callback.Dispose();
+            return false;
+        }
+
+        bool IResourceHandler.ProcessRequest(IRequest request, ICallback callback){
+            return ((IResourceHandler)this).Open(request, out bool _, callback);
         }
 
         bool IResourceHandler.ReadResponse(Stream dataOut, out int bytesRead, ICallback callback){
-            callback.Dispose();
+            return ((IResourceHandler)this).Read(dataOut, out bytesRead, null);
-
-            try{
-                int length = (int)dataIn.Length;
-
-                dataIn.CopyTo(dataOut, length);
-                bytesRead = length;
-                return true;
-            }catch{ // catch IOException, possibly NullReferenceException if dataIn is null
-                bytesRead = 0;
-                return false;
-            }
-        }
-
-        bool IResourceHandler.CanGetCookie(Cookie cookie){
-            return true;
-        }
-
-        bool IResourceHandler.CanSetCookie(Cookie cookie){
-            return true;
         }
 
         void IResourceHandler.Cancel(){}

Browser/Handling/ResourceRequestHandler.cs

@@ -0,0 +1,35 @@
+using System.Diagnostics.CodeAnalysis;
+using CefSharp;
+using TweetDuck.Browser.Data;
+
+namespace TweetDuck.Browser.Handling{
+    abstract class ResourceRequestHandler : CefSharp.Handler.ResourceRequestHandler{
+        private class SelfFactoryImpl : IResourceRequestHandlerFactory{
+            private readonly ResourceRequestHandler me;
+
+            public SelfFactoryImpl(ResourceRequestHandler me){
+                this.me = me;
+            }
+
+            bool IResourceRequestHandlerFactory.HasHandlers { get; } = true;
+
+            [SuppressMessage("ReSharper", "RedundantAssignment")]
+            IResourceRequestHandler IResourceRequestHandlerFactory.GetResourceRequestHandler(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, bool isNavigation, bool isDownload, string requestInitiator, ref bool disableDefaultHandling){
+                disableDefaultHandling = me.ResourceHandlers.HasHandler(request);
+                return me;
+            }
+        }
+
+        public IResourceRequestHandlerFactory SelfFactory { get; }
+        public ResourceHandlers ResourceHandlers { get; }
+
+        protected ResourceRequestHandler(){
+            this.SelfFactory = new SelfFactoryImpl(this);
+            this.ResourceHandlers = new ResourceHandlers();
+        }
+
+        protected override IResourceHandler GetResourceHandler(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request){
+            return ResourceHandlers.GetHandler(request);
+        }
+    }
+}

Browser/Handling/ResourceRequestHandlerBase.cs

@@ -4,13 +4,11 @@ using System.Collections.Specialized;
 using System.Linq;
 using System.Text.RegularExpressions;
 using CefSharp;
-using CefSharp.Handler;
+using TweetDuck.Utils;
-using TweetDuck.Core.Handling.General;
-using TweetDuck.Core.Utils;
 using TweetLib.Core.Utils;
 
-namespace TweetDuck.Core.Handling{
+namespace TweetDuck.Browser.Handling{
-    class RequestHandlerBase : DefaultRequestHandler{
+    class ResourceRequestHandlerBase : ResourceRequestHandler{
         private static readonly Regex TweetDeckResourceUrl = new Regex(@"/dist/(.*?)\.(.*?)\.(css|js)$");
         private static readonly SortedList<string, string> TweetDeckHashes = new SortedList<string, string>(4);
 
@@ -33,17 +31,12 @@ namespace TweetDuck.Core.Handling{
             }
         }
 
-        private readonly bool autoReload;
+        protected override CefReturnValue OnBeforeResourceLoad(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IRequestCallback callback){
+            if (request.ResourceType == ResourceType.CspReport){
+                callback.Dispose();
+                return CefReturnValue.Cancel;
+            }
 
-        public RequestHandlerBase(bool autoReload){
-            this.autoReload = autoReload;
-        }
-
-        public override bool OnOpenUrlFromTab(IWebBrowser browserControl, IBrowser browser, IFrame frame, string targetUrl, WindowOpenDisposition targetDisposition, bool userGesture){
-            return LifeSpanHandler.HandleLinkClick(browserControl, targetDisposition, targetUrl);
-        }
-
-        public override CefReturnValue OnBeforeResourceLoad(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IRequestCallback callback){
             if (BrowserUtils.HasDevTools){
                 NameValueCollection headers = request.Headers;
                 headers.Remove("x-devtools-emulate-network-conditions-client-id");
@@ -53,7 +46,7 @@ namespace TweetDuck.Core.Handling{
             return base.OnBeforeResourceLoad(browserControl, browser, frame, request, callback);
         }
 
-        public override bool OnResourceResponse(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response){
+        protected override bool OnResourceResponse(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response){
             if ((request.ResourceType == ResourceType.Script || request.ResourceType == ResourceType.Stylesheet) && TweetDeckHashes.Count > 0){
                 string url = request.Url;
                 Match match = TweetDeckResourceUrl.Match(url);
@@ -72,11 +65,5 @@ namespace TweetDuck.Core.Handling{
 
             return base.OnResourceResponse(browserControl, browser, frame, request, response);
         }
-        
-        public override void OnRenderProcessTerminated(IWebBrowser browserControl, IBrowser browser, CefTerminationStatus status){
-            if (autoReload){
-                browser.Reload();
-            }
-        }
     }
 }

Browser/Handling/ResourceRequestHandlerBrowser.cs

@@ -0,0 +1,52 @@
+using CefSharp;
+using TweetDuck.Browser.Handling.Filters;
+using TweetDuck.Utils;
+using TweetLib.Core.Features.Twitter;
+
+namespace TweetDuck.Browser.Handling{
+    class ResourceRequestHandlerBrowser : ResourceRequestHandlerBase{
+        private const string UrlVendorResource = "/dist/vendor";
+        private const string UrlLoadingSpinner = "/backgrounds/spinner_blue";
+        private const string UrlVersionCheck = "/web/dist/version.json";
+
+        protected override CefReturnValue OnBeforeResourceLoad(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IRequestCallback callback){
+            if (request.ResourceType == ResourceType.MainFrame){
+                if (request.Url.EndsWith("//twitter.com/")){
+                    request.Url = TwitterUrls.TweetDeck; // redirect plain twitter.com requests, fixes bugs with login 2FA
+                }
+            }
+            else if (request.ResourceType == ResourceType.Image){
+                if (request.Url.Contains(UrlLoadingSpinner)){
+                    request.Url = TwitterUtils.LoadingSpinner.Url;
+                }
+            }
+            else if (request.ResourceType == ResourceType.Script){
+                string url = request.Url;
+
+                if (url.Contains("analytics.")){
+                    callback.Dispose();
+                    return CefReturnValue.Cancel;
+                }
+                else if (url.Contains(UrlVendorResource)){
+                    request.SetHeaderByName("Accept-Encoding", "identity", overwrite: true);
+                }
+            }
+            else if (request.ResourceType == ResourceType.Xhr){
+                if (request.Url.Contains(UrlVersionCheck)){
+                    callback.Dispose();
+                    return CefReturnValue.Cancel;
+                }
+            }
+
+            return base.OnBeforeResourceLoad(browserControl, browser, frame, request, callback);
+        }
+
+        protected override IResponseFilter GetResourceResponseFilter(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response){
+            if (request.ResourceType == ResourceType.Script && request.Url.Contains(UrlVendorResource) && int.TryParse(response.Headers["Content-Length"], out int totalBytes)){
+                return new ResponseFilterVendor(totalBytes);
+            }
+
+            return base.GetResourceResponseFilter(browserControl, browser, frame, request, response);
+        }
+    }
+}

Browser/Notification/Example/FormNotificationExample.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Windows.Forms;
 using CefSharp;
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
 using TweetLib.Core.Features.Notifications;
 using TweetLib.Core.Features.Plugins;
 
-namespace TweetDuck.Core.Notification.Example{
+namespace TweetDuck.Browser.Notification.Example{
     sealed class FormNotificationExample : FormNotificationMain{
         public override bool RequiresResize => true;
         protected override bool CanDragWindow => Config.NotificationPosition == DesktopNotification.Position.Custom;

Browser/Notification/FormNotificationBase.Designer.cs

@@ -1,21 +1,10 @@
-namespace TweetDuck.Core.Notification {
+namespace TweetDuck.Browser.Notification {
     partial class FormNotificationBase {
         /// <summary>
         /// Required designer variable.
         /// </summary>
         private System.ComponentModel.IContainer components = null;
 
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing) {
-            if (disposing && (components != null)) {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
         #region Windows Form Designer generated code
 
         /// <summary>
@@ -34,7 +23,7 @@
             this.BackColor = System.Drawing.SystemColors.Control;
             this.ClientSize = new System.Drawing.Size(284, 122);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
-            this.Location = TweetDuck.Core.Controls.ControlExtensions.InvisibleLocation;
+            this.Location = TweetDuck.Controls.ControlExtensions.InvisibleLocation;
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "FormNotification";

Browser/Notification/FormNotificationBase.cs

@@ -1,20 +1,21 @@
-using CefSharp.WinForms;
+using System.Drawing;
-using System.Drawing;
 using System.Windows.Forms;
-using CefSharp;
+using CefSharp.WinForms;
+using TweetDuck.Browser.Data;
+using TweetDuck.Browser.Handling;
+using TweetDuck.Browser.Handling.General;
 using TweetDuck.Configuration;
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
-using TweetDuck.Core.Handling;
+using TweetDuck.Management.Analytics;
-using TweetDuck.Core.Handling.General;
+using TweetDuck.Utils;
-using TweetDuck.Core.Other.Analytics;
-using TweetDuck.Core.Utils;
-using TweetDuck.Data;
 using TweetLib.Core.Features.Notifications;
 using TweetLib.Core.Features.Twitter;
 
-namespace TweetDuck.Core.Notification{
+namespace TweetDuck.Browser.Notification{
     abstract partial class FormNotificationBase : Form, AnalyticsFile.IProvider{
-        public static readonly ResourceLink AppLogo = new ResourceLink("https://ton.twimg.com/tduck/avatar", ResourceHandler.FromByteArray(Properties.Resources.avatar, "image/png"));
+        public static readonly ResourceLink AppLogo = new ResourceLink("https://ton.twimg.com/tduck/avatar", ResourceHandlers.ForBytes(Properties.Resources.avatar, "image/png"));
+
+        protected const string BlankURL = TwitterUrls.TweetDeck + "/?blank";
 
         public static string FontSize = null;
         public static string HeadLayout = null;
@@ -103,7 +104,10 @@ namespace TweetDuck.Core.Notification{
         protected double SizeScale => DpiScale * Config.ZoomLevel / 100.0;
 
         protected readonly FormBrowser owner;
+
+        #pragma warning disable IDE0069 // Disposable fields should be disposed
         protected readonly ChromiumWebBrowser browser;
+        #pragma warning restore IDE0069 // Disposable fields should be disposed
 
         private readonly ResourceHandlerNotification resourceHandler = new ResourceHandlerNotification();
 
@@ -127,16 +131,19 @@ namespace TweetDuck.Core.Notification{
             this.owner = owner;
             this.owner.FormClosed += owner_FormClosed;
             
-            ResourceHandlerFactory resourceHandlerFactory = new ResourceHandlerFactory();
+            var resourceRequestHandler = new ResourceRequestHandlerBase();
-            resourceHandlerFactory.RegisterHandler(TwitterUrls.TweetDeck, this.resourceHandler);
+            var resourceHandlers = resourceRequestHandler.ResourceHandlers;
-            resourceHandlerFactory.RegisterHandler(AppLogo);
 
-            this.browser = new ChromiumWebBrowser("about:blank"){
+            resourceHandlers.Register(BlankURL, ResourceHandlers.ForString(string.Empty));
+            resourceHandlers.Register(TwitterUrls.TweetDeck, () => this.resourceHandler);
+            resourceHandlers.Register(AppLogo);
+
+            this.browser = new ChromiumWebBrowser(BlankURL){
                 MenuHandler = new ContextMenuNotification(this, enableContextMenu),
                 JsDialogHandler = new JavaScriptDialogHandler(),
                 LifeSpanHandler = new LifeSpanHandler(),
                 RequestHandler = new RequestHandlerBase(false),
-                ResourceHandlerFactory = resourceHandlerFactory
+                ResourceRequestHandlerFactory = resourceRequestHandler.SelfFactory
             };
 
             this.browser.Dock = DockStyle.None;
@@ -146,8 +153,8 @@ namespace TweetDuck.Core.Notification{
             Controls.Add(browser);
 
             Disposed += (sender, args) => {
-                this.browser.Dispose();
                 this.owner.FormClosed -= owner_FormClosed;
+                this.browser.Dispose();
             };
 
             DpiScale = this.GetDPIScale();
@@ -156,6 +163,15 @@ namespace TweetDuck.Core.Notification{
             UpdateTitle();
         }
 
+        protected override void Dispose(bool disposing){
+            if (disposing){
+                components?.Dispose();
+                resourceHandler.Dispose();
+            }
+
+            base.Dispose(disposing);
+        }
+
         protected override void WndProc(ref Message m){
             if (m.Msg == 0x0112 && (m.WParam.ToInt32() & 0xFFF0) == 0xF010 && !CanDragWindow){ // WM_SYSCOMMAND, SC_MOVE
                 return;
@@ -173,7 +189,7 @@ namespace TweetDuck.Core.Notification{
         // notification methods
 
         public virtual void HideNotification(){
-            browser.Load("about:blank");
+            browser.Load(BlankURL);
             DisplayTooltip(null);
 
             Location = ControlExtensions.InvisibleLocation;

Browser/Notification/FormNotificationMain.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDuck.Core.Notification {
+namespace TweetDuck.Browser.Notification {
     partial class FormNotificationMain {
         /// <summary>
         /// Required designer variable.
@@ -26,7 +26,7 @@
             this.components = new System.ComponentModel.Container();
             this.timerDisplayDelay = new System.Windows.Forms.Timer(this.components);
             this.timerProgress = new System.Windows.Forms.Timer(this.components);
-            this.progressBarTimer = new TweetDuck.Core.Controls.FlatProgressBar();
+            this.progressBarTimer = new TweetDuck.Controls.FlatProgressBar();
             this.SuspendLayout();
             // 
             // timerDisplayDelay

Browser/Notification/FormNotificationMain.cs

@@ -1,19 +1,20 @@
-using CefSharp;
+using System;
-using System;
 using System.Drawing;
 using System.Windows.Forms;
-using TweetDuck.Core.Adapters;
+using CefSharp;
-using TweetDuck.Core.Bridge;
+using TweetDuck.Browser.Adapters;
-using TweetDuck.Core.Controls;
+using TweetDuck.Browser.Bridge;
-using TweetDuck.Core.Handling;
+using TweetDuck.Browser.Handling;
-using TweetDuck.Core.Utils;
+using TweetDuck.Controls;
 using TweetDuck.Plugins;
+using TweetDuck.Utils;
 using TweetLib.Core.Data;
 using TweetLib.Core.Features.Notifications;
 using TweetLib.Core.Features.Plugins;
 using TweetLib.Core.Features.Plugins.Enums;
+using TweetLib.Core.Features.Twitter;
 
-namespace TweetDuck.Core.Notification{
+namespace TweetDuck.Browser.Notification{
     abstract partial class FormNotificationMain : FormNotificationBase{
         private readonly PluginManager plugins;
         private readonly int timerBarHeight;
@@ -25,6 +26,8 @@ namespace TweetDuck.Core.Notification{
         private IntPtr mouseHook;
         private bool blockXButtonUp;
 
+        private int currentOpacity;
+
         private bool? prevDisplayTimer;
         private int? prevFontSize;
 
@@ -70,17 +73,26 @@ namespace TweetDuck.Core.Notification{
             this.timerBarHeight = BrowserUtils.Scale(4, DpiScale);
             
             browser.KeyboardHandler = new KeyboardHandlerNotification(this);
-            browser.RegisterAsyncJsObject("$TD", new TweetDeckBridge.Notification(owner, this));
+            browser.RegisterJsBridge("$TD", new TweetDeckBridge.Notification(owner, this));
 
             browser.LoadingStateChanged += Browser_LoadingStateChanged;
             browser.FrameLoadEnd += Browser_FrameLoadEnd;
 
-            plugins.Register(PluginEnvironment.Notification, new PluginDispatcher(browser));
+            plugins.Register(PluginEnvironment.Notification, new PluginDispatcher(browser, url => TwitterUrls.IsTweetDeck(url) && url != BlankURL));
 
             mouseHookDelegate = MouseHookProc;
             Disposed += (sender, args) => StopMouseHook(true);
         }
 
+        // helpers
+
+        private void SetOpacity(int opacity){
+            if (currentOpacity != opacity){
+                currentOpacity = opacity;
+                Opacity = opacity / 100.0;
+            }
+        }
+
         // mouse wheel hook
 
         private void StartMouseHook(){
@@ -102,7 +114,15 @@ namespace TweetDuck.Core.Notification{
                 int eventType = wParam.ToInt32();
 
                 if (eventType == NativeMethods.WM_MOUSEWHEEL && IsCursorOverBrowser){
-                    browser.SendMouseWheelEvent(0, 0, 0, BrowserUtils.Scale(NativeMethods.GetMouseHookData(lParam), Config.NotificationScrollSpeed * 0.01), CefEventFlags.None);
+                    int delta = BrowserUtils.Scale(NativeMethods.GetMouseHookData(lParam), Config.NotificationScrollSpeed * 0.01);
+
+                    if (Config.EnableSmoothScrolling){
+                        browser.ExecuteScriptAsync("window.TDGF_scrollSmoothly", (int)Math.Round(-delta / 0.6));
+                    }
+                    else{
+                        browser.SendMouseWheelEvent(0, 0, 0, delta, CefEventFlags.None);
+                    }
+
                     return NativeMethods.HOOK_HANDLED;
                 }
                 else if (eventType == NativeMethods.WM_XBUTTONDOWN && DesktopBounds.Contains(Cursor.Position)){
@@ -143,7 +163,7 @@ namespace TweetDuck.Core.Notification{
         }
 
         private void Browser_LoadingStateChanged(object sender, LoadingStateChangedEventArgs e){
-            if (!e.IsLoading && browser.Address != "about:blank"){
+            if (!e.IsLoading && browser.Address != BlankURL){
                 this.InvokeSafe(() => {
                     Visible = true; // ensures repaint before moving the window to a visible location
                     timerDisplayDelay.Start();
@@ -154,7 +174,7 @@ namespace TweetDuck.Core.Notification{
         private void Browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
             IFrame frame = e.Frame;
 
-            if (frame.IsMain && browser.Address != "about:blank"){
+            if (frame.IsMain && browser.Address != BlankURL){
                 frame.ExecuteJavaScriptAsync(PropertyBridge.GenerateScript(PropertyBridge.Environment.Notification));
                 CefScriptExecutor.RunFile(frame, "notification.js");
             }
@@ -170,9 +190,11 @@ namespace TweetDuck.Core.Notification{
 
             if (isCursorInside){
                 StartMouseHook();
+                SetOpacity(100);
             }
             else{
                 StopMouseHook(false);
+                SetOpacity(Config.NotificationWindowOpacity);
             }
 
             if (isCursorInside || FreezeTimer || ContextMenuOpen){
@@ -265,6 +287,7 @@ namespace TweetDuck.Core.Notification{
                 SetNotificationSize(BaseClientWidth, BaseClientHeight);
             }
 
+            SetOpacity(IsCursorOverBrowser ? 100 : Config.NotificationWindowOpacity);
             MoveToVisibleLocation();
         }
 

Browser/Notification/FormNotificationTweet.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDuck.Core.Notification {
+namespace TweetDuck.Browser.Notification {
     partial class FormNotificationTweet {
         /// <summary>
         /// Required designer variable.

Browser/Notification/FormNotificationTweet.cs

@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
-using TweetDuck.Core.Utils;
+using TweetDuck.Utils;
 using TweetLib.Core.Features.Notifications;
 using TweetLib.Core.Features.Plugins;
 
-namespace TweetDuck.Core.Notification{
+namespace TweetDuck.Browser.Notification{
     sealed partial class FormNotificationTweet : FormNotificationMain{
         private const int NonIntrusiveIdleLimit = 30;
         private const int TrimMinimum = 32;

Browser/Notification/Screenshot/FormNotificationScreenshotable.cs

@@ -3,15 +3,15 @@ using System.Drawing;
 using System.Drawing.Imaging;
 using System.Windows.Forms;
 using CefSharp;
-using TweetDuck.Core.Adapters;
+using TweetDuck.Browser.Adapters;
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
-using TweetDuck.Core.Other;
+using TweetDuck.Dialogs;
-using TweetDuck.Core.Utils;
+using TweetDuck.Utils;
 using TweetLib.Core.Data;
 using TweetLib.Core.Features.Notifications;
 using TweetLib.Core.Features.Plugins;
 
-namespace TweetDuck.Core.Notification.Screenshot{
+namespace TweetDuck.Browser.Notification.Screenshot{
     sealed class FormNotificationScreenshotable : FormNotificationBase{
         protected override bool CanDragWindow => false;
 
@@ -23,7 +23,7 @@ namespace TweetDuck.Core.Notification.Screenshot{
 
             int realWidth = BrowserUtils.Scale(width, DpiScale);
 
-            browser.RegisterAsyncJsObject("$TD_NotificationScreenshot", new ScreenshotBridge(this, SetScreenshotHeight, callback));
+            browser.RegisterJsBridge("$TD_NotificationScreenshot", new ScreenshotBridge(this, SetScreenshotHeight, callback));
 
             browser.LoadingStateChanged += (sender, args) => {
                 if (args.IsLoading){
@@ -82,16 +82,16 @@ namespace TweetDuck.Core.Notification.Screenshot{
                 return false;
             }
             else{
-                using(Bitmap bmp = new Bitmap(ClientSize.Width, Math.Max(1, height), PixelFormat.Format32bppRgb)){
+                using Bitmap bmp = new Bitmap(ClientSize.Width, Math.Max(1, height), PixelFormat.Format32bppRgb);
-                    try{
-                        NativeMethods.RenderSourceIntoBitmap(context, bmp);
-                    }finally{
-                        NativeMethods.ReleaseDC(this.Handle, context);
-                    }
 
-                    Clipboard.SetImage(bmp);
+                try{
-                    return true;
+                    NativeMethods.RenderSourceIntoBitmap(context, bmp);
+                }finally{
+                    NativeMethods.ReleaseDC(this.Handle, context);
                 }
+
+                Clipboard.SetImage(bmp);
+                return true;
             }
         }
     }

Browser/Notification/Screenshot/ScreenshotBridge.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Windows.Forms;
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
 
-namespace TweetDuck.Core.Notification.Screenshot{
+namespace TweetDuck.Browser.Notification.Screenshot{
     [SuppressMessage("ReSharper", "UnusedMember.Global")]
     sealed class ScreenshotBridge{
         private readonly Control owner;

Browser/Notification/Screenshot/TweetScreenshotManager.cs

@@ -8,7 +8,7 @@
 
 using System;
 using System.Windows.Forms;
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
 using TweetLib.Core.Features.Plugins;
 
 #if GEN_SCREENSHOT_FRAMES
@@ -17,7 +17,7 @@ using System.IO;
 using TweetDuck.Core.Utils;
 #endif
 
-namespace TweetDuck.Core.Notification.Screenshot{
+namespace TweetDuck.Browser.Notification.Screenshot{
     sealed class TweetScreenshotManager : IDisposable{
         private readonly FormBrowser owner;
         private readonly PluginManager plugins;

Browser/Notification/SoundNotification.cs

@@ -0,0 +1,50 @@
+using System;
+using System.Drawing;
+using System.IO;
+using System.Windows.Forms;
+using CefSharp;
+using TweetDuck.Browser.Data;
+using TweetDuck.Controls;
+using TweetDuck.Dialogs;
+using TweetDuck.Dialogs.Settings;
+using TweetDuck.Management;
+
+namespace TweetDuck.Browser.Notification{
+    static class SoundNotification{
+        public const string SupportedFormats = "*.wav;*.ogg;*.mp3;*.flac;*.opus;*.weba;*.webm";
+        
+        public static Func<IResourceHandler> CreateFileHandler(string path){
+            string mimeType = Path.GetExtension(path) switch{
+                ".weba" => "audio/webm",
+                ".webm" => "audio/webm",
+                ".wav"  => "audio/wav",
+                ".ogg"  => "audio/ogg",
+                ".mp3"  => "audio/mp3",
+                ".flac" => "audio/flac",
+                ".opus" => "audio/ogg; codecs=opus",
+                _       => null
+            };
+
+            try{
+                return ResourceHandlers.ForBytes(File.ReadAllBytes(path), mimeType);
+            }catch{
+                FormBrowser browser = FormManager.TryFind<FormBrowser>();
+
+                browser?.InvokeAsyncSafe(() => {
+                    using FormMessage form = new FormMessage("Sound Notification Error", "Could not find custom notification sound file:\n" + path, MessageBoxIcon.Error);
+                    form.AddButton(FormMessage.Ignore, ControlType.Cancel | ControlType.Focused);
+                        
+                    Button btnViewOptions = form.AddButton("View Options");
+                    btnViewOptions.Width += 16;
+                    btnViewOptions.Location = new Point(btnViewOptions.Location.X - 16, btnViewOptions.Location.Y);
+
+                    if (form.ShowDialog() == DialogResult.OK && form.ClickedButton == btnViewOptions){
+                        browser.OpenSettings(typeof(TabSettingsSounds));
+                    }
+                });
+                
+                return null;
+            }
+        }
+    }
+}

Browser/TrayIcon.Designer.cs

@@ -1,21 +1,10 @@
-namespace TweetDuck.Core.Other {
+namespace TweetDuck.Browser {
     partial class TrayIcon {
         /// <summary> 
         /// Required designer variable.
         /// </summary>
         private System.ComponentModel.IContainer components = null;
 
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing) {
-            if (disposing && (components != null)) {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
         #region Component Designer generated code
 
         /// <summary> 

Browser/TrayIcon.cs

@@ -4,7 +4,7 @@ using System.Windows.Forms;
 using TweetDuck.Configuration;
 using Res = TweetDuck.Properties.Resources;
 
-namespace TweetDuck.Core.Other{
+namespace TweetDuck.Browser{
     sealed partial class TrayIcon : Component{
         public enum Behavior{ // keep order
             Disabled, DisplayOnly, MinimizeToTray, CloseToTray, Combined
@@ -63,6 +63,15 @@ namespace TweetDuck.Core.Other{
             container.Add(this);
         }
 
+        protected override void Dispose(bool disposing){
+            if (disposing){
+                components?.Dispose();
+                contextMenu.Dispose();
+            }
+
+            base.Dispose(disposing);
+        }
+
         private void UpdateIcon(){
             if (Visible){
                 notifyIcon.Icon = hasNotifications ? Res.icon_tray_new : Config.MuteNotifications ? Res.icon_tray_muted : Res.icon_tray;

Browser/TweetDeckBrowser.cs

@@ -4,21 +4,22 @@ using System.Text;
 using System.Windows.Forms;
 using CefSharp;
 using CefSharp.WinForms;
+using TweetDuck.Browser.Adapters;
+using TweetDuck.Browser.Bridge;
+using TweetDuck.Browser.Data;
+using TweetDuck.Browser.Handling;
+using TweetDuck.Browser.Handling.General;
+using TweetDuck.Browser.Notification;
 using TweetDuck.Configuration;
-using TweetDuck.Core.Adapters;
+using TweetDuck.Controls;
-using TweetDuck.Core.Bridge;
-using TweetDuck.Core.Controls;
-using TweetDuck.Core.Handling;
-using TweetDuck.Core.Handling.General;
-using TweetDuck.Core.Notification;
-using TweetDuck.Core.Utils;
 using TweetDuck.Plugins;
+using TweetDuck.Utils;
 using TweetLib.Core.Features.Plugins;
 using TweetLib.Core.Features.Plugins.Enums;
 using TweetLib.Core.Features.Twitter;
 using TweetLib.Core.Utils;
 
-namespace TweetDuck.Core{
+namespace TweetDuck.Browser{
     sealed class TweetDeckBrowser : IDisposable{
         private static UserConfig Config => Program.Config.User;
 
@@ -44,13 +45,16 @@ namespace TweetDuck.Core{
         }
         
         private readonly ChromiumWebBrowser browser;
-        private readonly ResourceHandlerFactory resourceHandlerFactory = new ResourceHandlerFactory();
+        private readonly ResourceHandlers resourceHandlers;
 
         private string prevSoundNotificationPath = null;
 
         public TweetDeckBrowser(FormBrowser owner, PluginManager plugins, TweetDeckBridge tdBridge, UpdateBridge updateBridge){
-            resourceHandlerFactory.RegisterHandler(FormNotificationBase.AppLogo);
+            var resourceRequestHandler = new ResourceRequestHandlerBrowser();
-            resourceHandlerFactory.RegisterHandler(TwitterUtils.LoadingSpinner);
+            resourceHandlers = resourceRequestHandler.ResourceHandlers;
+
+            resourceHandlers.Register(FormNotificationBase.AppLogo);
+            resourceHandlers.Register(TwitterUtils.LoadingSpinner);
 
             RequestHandlerBrowser requestHandler = new RequestHandlerBrowser();
             
@@ -62,7 +66,7 @@ namespace TweetDuck.Core{
                 KeyboardHandler = new KeyboardHandlerBrowser(owner),
                 LifeSpanHandler = new LifeSpanHandler(),
                 RequestHandler = requestHandler,
-                ResourceHandlerFactory = resourceHandlerFactory
+                ResourceRequestHandlerFactory = resourceRequestHandler.SelfFactory
             };
 
             this.browser.LoadingStateChanged += browser_LoadingStateChanged;
@@ -70,8 +74,8 @@ namespace TweetDuck.Core{
             this.browser.FrameLoadEnd += browser_FrameLoadEnd;
             this.browser.LoadError += browser_LoadError;
 
-            this.browser.RegisterAsyncJsObject("$TD", tdBridge);
+            this.browser.RegisterJsBridge("$TD", tdBridge);
-            this.browser.RegisterAsyncJsObject("$TDU", updateBridge);
+            this.browser.RegisterJsBridge("$TDU", updateBridge);
             
             this.browser.BrowserSettings.BackgroundColor = (uint)TwitterUtils.BackgroundColor.ToArgb();
             this.browser.Dock = DockStyle.None;
@@ -79,7 +83,7 @@ namespace TweetDuck.Core{
             this.browser.SetupZoomEvents();
             
             owner.Controls.Add(browser);
-            plugins.Register(PluginEnvironment.Browser, new PluginDispatcher(browser));
+            plugins.Register(PluginEnvironment.Browser, new PluginDispatcher(browser, TwitterUrls.IsTweetDeck));
             
             Config.MuteToggled += Config_MuteToggled;
             Config.SoundNotificationChanged += Config_SoundNotificationInfoChanged;
@@ -87,6 +91,12 @@ namespace TweetDuck.Core{
 
         // setup and management
 
+        public void PrepareSize(Size size){
+            if (!Ready){
+                browser.Size = size;
+            }
+        }
+
         private void OnBrowserReady(){
             if (!Ready){
                 browser.Location = Point.Empty;
@@ -127,7 +137,7 @@ namespace TweetDuck.Core{
 
                 if (TwitterUrls.IsTwitter(url)){
                     string css = Program.Resources.Load("styles/twitter.css");
-                    resourceHandlerFactory.RegisterHandler(TwitterStyleUrl, ResourceHandler.FromString(css, mimeType: "text/css"));
+                    resourceHandlers.Register(TwitterStyleUrl, ResourceHandlers.ForString(css, "text/css"));
 
                     CefScriptExecutor.RunFile(frame, "twitter.js");
                 }
@@ -166,7 +176,7 @@ namespace TweetDuck.Core{
             }
 
             if (url == ErrorUrl){
-                resourceHandlerFactory.UnregisterHandler(ErrorUrl);
+                resourceHandlers.Unregister(ErrorUrl);
             }
         }
 
@@ -182,7 +192,7 @@ namespace TweetDuck.Core{
                     string errorName = Enum.GetName(typeof(CefErrorCode), e.ErrorCode);
                     string errorTitle = StringUtils.ConvertPascalCaseToScreamingSnakeCase(errorName ?? string.Empty);
 
-                    resourceHandlerFactory.RegisterHandler(ErrorUrl, ResourceHandler.FromString(errorPage.Replace("{err}", errorTitle)));
+                    resourceHandlers.Register(ErrorUrl, ResourceHandlers.ForString(errorPage.Replace("{err}", errorTitle)));
                     browser.Load(ErrorUrl);
                 }
             }
@@ -202,10 +212,10 @@ namespace TweetDuck.Core{
                 prevSoundNotificationPath = newNotificationPath;
 
                 if (hasCustomSound){
-                    resourceHandlerFactory.RegisterHandler(soundUrl, SoundNotification.CreateFileHandler(newNotificationPath));
+                    resourceHandlers.Register(soundUrl, SoundNotification.CreateFileHandler(newNotificationPath));
                 }
                 else{
-                    resourceHandlerFactory.UnregisterHandler(soundUrl);
+                    resourceHandlers.Unregister(soundUrl);
                 }
             }
 
@@ -273,7 +283,7 @@ namespace TweetDuck.Core{
         }
 
         public void OpenDevTools(){
-            browser.ShowDevTools();
+            browser.OpenDevToolsCustom();
         }
     }
 }

Configuration/ConfigManager.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Drawing;
-using TweetDuck.Data;
+using TweetDuck.Browser.Data;
-using TweetLib.Core.Features.Configuration;
 using TweetLib.Core.Features.Plugins.Config;
 using TweetLib.Core.Serialization.Converters;
+using TweetLib.Core.Systems.Configuration;
 using TweetLib.Core.Utils;
 
 namespace TweetDuck.Configuration{

Configuration/PluginConfig.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
-using TweetLib.Core.Features.Configuration;
 using TweetLib.Core.Features.Plugins;
 using TweetLib.Core.Features.Plugins.Config;
 using TweetLib.Core.Features.Plugins.Events;
+using TweetLib.Core.Systems.Configuration;
 
 namespace TweetDuck.Configuration{
     sealed class PluginConfig : BaseConfig, IPluginConfig{

Configuration/SystemConfig.cs

@@ -1,4 +1,4 @@
-using TweetLib.Core.Features.Configuration;
+using TweetLib.Core.Systems.Configuration;
 
 namespace TweetDuck.Configuration{
     sealed class SystemConfig : BaseConfig{

Configuration/UserConfig.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Drawing;
-using TweetDuck.Core.Controls;
+using TweetDuck.Browser;
-using TweetDuck.Core.Other;
+using TweetDuck.Browser.Data;
-using TweetDuck.Data;
+using TweetDuck.Controls;
-using TweetLib.Core.Features.Configuration;
 using TweetLib.Core.Features.Notifications;
 using TweetLib.Core.Features.Twitter;
+using TweetLib.Core.Systems.Configuration;
 
 namespace TweetDuck.Configuration{
     sealed class UserConfig : BaseConfig{
@@ -30,16 +30,20 @@ namespace TweetDuck.Configuration{
         private string _customCefArgs       = null;
 
         public string BrowserPath            { get; set; } = null;
+        public string BrowserPathArgs        { get; set; } = null;
         public bool IgnoreTrackingUrlWarning { get; set; } = false;
         public string SearchEngineUrl        { get; set; } = null;
         private int _zoomLevel                             = 100;
         
-        public int VideoPlayerVolume { get; set; } = 50;
+        public string VideoPlayerPath     { get; set; } = null;
+        public string VideoPlayerPathArgs { get; set; } = null;
+        public int VideoPlayerVolume      { get; set; } = 50;
         
         public bool EnableSpellCheck { get; set; } = false;
         private string _spellCheckLanguage         = "en-US";
 
         public string TranslationTarget { get; set; } = "en";
+        public int  CalendarFirstDay    { get; set; } = -1;
         
         private TrayIcon.Behavior _trayBehavior       = TrayIcon.Behavior.Disabled;
         public bool EnableTrayHighlight { get; set; } = true;
@@ -61,6 +65,7 @@ namespace TweetDuck.Configuration{
         public Point CustomNotificationPosition                  { get; set; } = ControlExtensions.InvisibleLocation;
         public int NotificationDisplay                           { get; set; } = 0;
         public int NotificationEdgeDistance                      { get; set; } = 8;
+        public int NotificationWindowOpacity                     { get; set; } = 100;
 
         public DesktopNotification.Size NotificationSize { get; set; } = DesktopNotification.Size.Auto;
         public Size CustomNotificationSize               { get; set; } = Size.Empty;
@@ -74,6 +79,8 @@ namespace TweetDuck.Configuration{
         public string CustomBrowserCSS      { get; set; } = null;
         public string CustomNotificationCSS { get; set; } = null;
 
+        public bool DevToolsWindowOnTop     { get; set; } = true;
+        
         // SPECIAL PROPERTIES
 
         public bool IsCustomNotificationPositionSet => CustomNotificationPosition != ControlExtensions.InvisibleLocation;

Controls/ControlExtensions.cs

@@ -3,7 +3,7 @@ using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
 
-namespace TweetDuck.Core.Controls{
+namespace TweetDuck.Controls{
     static class ControlExtensions{
         public static readonly Point InvisibleLocation = new Point(-32000, -32000);
 

Controls/FlatButton.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Forms;
 
-namespace TweetDuck.Core.Controls{
+namespace TweetDuck.Controls{
     sealed class FlatButton : Button{
         protected override bool ShowFocusCues => false;
 

Controls/FlatProgressBar.cs

@@ -2,7 +2,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace TweetDuck.Core.Controls{
+namespace TweetDuck.Controls{
     sealed class FlatProgressBar : ProgressBar{
         private readonly SolidBrush brush;
 

Controls/FlowLayoutPanelNoHScroll.cs

@@ -1,7 +1,7 @@
 using System.Windows.Forms;
-using TweetDuck.Core.Utils;
+using TweetDuck.Utils;
 
-namespace TweetDuck.Core.Controls{
+namespace TweetDuck.Controls{
     sealed class FlowLayoutPanelNoHScroll : FlowLayoutPanel{
         protected override void WndProc(ref Message m){
             if (m.Msg == 0x85){ // WM_NCPAINT

Controls/LabelVertical.cs

@@ -2,7 +2,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace TweetDuck.Core.Controls{
+namespace TweetDuck.Controls{
     sealed class LabelVertical : Label{
         public int LineHeight { get; set; }
 

Controls/NumericUpDownEx.cs

@@ -1,7 +1,7 @@
 using System.ComponentModel;
 using System.Windows.Forms;
 
-namespace TweetDuck.Core.Controls{
+namespace TweetDuck.Controls{
     sealed class NumericUpDownEx : NumericUpDown{
         public string TextSuffix { get; set ; }
 

Core/Handling/RequestHandlerBrowser.cs

@@ -1,69 +0,0 @@
-using System.Collections.Specialized;
-using CefSharp;
-using TweetDuck.Core.Handling.Filters;
-using TweetDuck.Core.Utils;
-using TweetLib.Core.Features.Twitter;
-
-namespace TweetDuck.Core.Handling{
-    sealed class RequestHandlerBrowser : RequestHandlerBase{
-        private const string UrlVendorResource = "/dist/vendor";
-        private const string UrlLoadingSpinner = "/backgrounds/spinner_blue";
-
-        public string BlockNextUserNavUrl { get; set; }
-
-        public RequestHandlerBrowser() : base(true){}
-
-        public override CefReturnValue OnBeforeResourceLoad(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IRequestCallback callback){
-            if (request.ResourceType == ResourceType.MainFrame){
-                if (request.Url.EndsWith("//twitter.com/")){
-                    request.Url = TwitterUrls.TweetDeck; // redirect plain twitter.com requests, fixes bugs with login 2FA
-                }
-            }
-            else if (request.ResourceType == ResourceType.Script){
-                string url = request.Url;
-
-                if (url.Contains("analytics.")){
-                    callback.Dispose();
-                    return CefReturnValue.Cancel;
-                }
-                else if (url.Contains(UrlVendorResource)){
-                    NameValueCollection headers = request.Headers;
-                    headers["Accept-Encoding"] = "identity";
-                    request.Headers = headers;
-                }
-            }
-
-            return base.OnBeforeResourceLoad(browserControl, browser, frame, request, callback);
-        }
-
-        public override bool OnBeforeBrowse(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, bool userGesture, bool isRedirect){
-            if (userGesture && request.TransitionType == TransitionType.LinkClicked){
-                bool block = request.Url == BlockNextUserNavUrl;
-                BlockNextUserNavUrl = string.Empty;
-                return block;
-            }
-            else if (request.TransitionType.HasFlag(TransitionType.ForwardBack) && TwitterUrls.IsTweetDeck(frame.Url)){
-                return true;
-            }
-
-            return base.OnBeforeBrowse(browserControl, browser, frame, request, userGesture, isRedirect);
-        }
-
-        public override bool OnResourceResponse(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response){
-            if (request.ResourceType == ResourceType.Image && request.Url.Contains(UrlLoadingSpinner)){
-                request.Url = TwitterUtils.LoadingSpinner.Url;
-                return true;
-            }
-
-            return base.OnResourceResponse(browserControl, browser, frame, request, response);
-        }
-
-        public override IResponseFilter GetResourceResponseFilter(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response){
-            if (request.ResourceType == ResourceType.Script && request.Url.Contains(UrlVendorResource) && int.TryParse(response.ResponseHeaders["Content-Length"], out int totalBytes)){
-                return new ResponseFilterVendor(totalBytes);
-            }
-
-            return base.GetResourceResponseFilter(browserControl, browser, frame, request, response);
-        }
-    }
-}

Core/Handling/ResourceHandlerFactory.cs

@@ -1,43 +0,0 @@
-using System;
-using System.Collections.Concurrent;
-using CefSharp;
-using TweetDuck.Data;
-
-namespace TweetDuck.Core.Handling{
-    sealed class ResourceHandlerFactory : IResourceHandlerFactory{
-        public bool HasHandlers => !handlers.IsEmpty;
-
-        private readonly ConcurrentDictionary<string, IResourceHandler> handlers = new ConcurrentDictionary<string, IResourceHandler>(StringComparer.OrdinalIgnoreCase);
-
-        public IResourceHandler GetResourceHandler(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request){
-            try{
-                return handlers.TryGetValue(request.Url, out IResourceHandler handler) ? handler : null;
-            }finally{
-                request.Dispose();
-            }
-        }
-
-        // registration
-
-        public bool RegisterHandler(string url, IResourceHandler handler){
-            if (Uri.TryCreate(url, UriKind.Absolute, out Uri uri)){
-                handlers.AddOrUpdate(uri.AbsoluteUri, handler, (key, prev) => handler);
-                return true;
-            }
-
-            return false;
-        }
-
-        public bool RegisterHandler(ResourceLink link){
-            return RegisterHandler(link.Url, link.Handler);
-        }
-
-        public bool UnregisterHandler(string url){
-            return handlers.TryRemove(url, out IResourceHandler _);
-        }
-
-        public bool UnregisterHandler(ResourceLink link){
-            return UnregisterHandler(link.Url);
-        }
-    }
-}

Core/Notification/SoundNotification.cs

@@ -1,48 +0,0 @@
-using System.Drawing;
-using System.IO;
-using System.Windows.Forms;
-using CefSharp;
-using TweetDuck.Core.Controls;
-using TweetDuck.Core.Other;
-using TweetDuck.Core.Other.Settings;
-
-namespace TweetDuck.Core.Notification{
-    static class SoundNotification{
-        public const string SupportedFormats = "*.wav;*.ogg;*.mp3;*.flac;*.opus;*.weba;*.webm";
-        
-        public static IResourceHandler CreateFileHandler(string path){
-            string mimeType = Path.GetExtension(path) switch{
-                ".weba" => "audio/webm",
-                ".webm" => "audio/webm",
-                ".wav"  => "audio/wav",
-                ".ogg"  => "audio/ogg",
-                ".mp3"  => "audio/mp3",
-                ".flac" => "audio/flac",
-                ".opus" => "audio/ogg; codecs=opus",
-                _       => null
-            };
-
-            try{
-                return ResourceHandler.FromFilePath(path, mimeType);
-            }catch{
-                FormBrowser browser = FormManager.TryFind<FormBrowser>();
-
-                browser?.InvokeAsyncSafe(() => {
-                    using(FormMessage form = new FormMessage("Sound Notification Error", "Could not find custom notification sound file:\n" + path, MessageBoxIcon.Error)){
-                        form.AddButton(FormMessage.Ignore, ControlType.Cancel | ControlType.Focused);
-                        
-                        Button btnViewOptions = form.AddButton("View Options");
-                        btnViewOptions.Width += 16;
-                        btnViewOptions.Location = new Point(btnViewOptions.Location.X - 16, btnViewOptions.Location.Y);
-
-                        if (form.ShowDialog() == DialogResult.OK && form.ClickedButton == btnViewOptions){
-                            browser.OpenSettings(typeof(TabSettingsSounds));
-                        }
-                    }
-                });
-                
-                return null;
-            }
-        }
-    }
-}

Core/Other/Settings/BaseTabSettings.cs

@@ -1,36 +0,0 @@
-using System.Collections.Generic;
-using System.Windows.Forms;
-using TweetDuck.Configuration;
-
-namespace TweetDuck.Core.Other.Settings{
-    class BaseTabSettings : UserControl{
-        protected static UserConfig Config => Program.Config.User;
-        protected static SystemConfig SysConfig => Program.Config.System;
-
-        public IEnumerable<Control> InteractiveControls{
-            get{
-                static IEnumerable<Control> FindInteractiveControls(Control parent){
-                    foreach(Control control in parent.Controls){
-                        if (control is Panel subPanel){
-                            foreach(Control subControl in FindInteractiveControls(subPanel)){
-                                yield return subControl;
-                            }
-                        }
-                        else{
-                            yield return control;
-                        }
-                    }
-                }
-
-                return FindInteractiveControls(this);
-            }
-        }
-
-        protected BaseTabSettings(){
-            Padding = new Padding(6);
-        }
-
-        public virtual void OnReady(){}
-        public virtual void OnClosing(){}
-    }
-}

Data/ResourceLink.cs

@@ -1,13 +0,0 @@
-using CefSharp;
-
-namespace TweetDuck.Data{
-    sealed class ResourceLink{
-        public string Url { get; }
-        public IResourceHandler Handler { get; }
-
-        public ResourceLink(string url, IResourceHandler handler){
-            this.Url = url;
-            this.Handler = handler;
-        }
-    }
-}

Dialogs/FormAbout.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDuck.Core.Other {
+namespace TweetDuck.Dialogs {
     sealed partial class FormAbout {
         /// <summary>
         /// Required designer variable.

Dialogs/FormAbout.cs

@@ -2,9 +2,10 @@
 using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
-using TweetDuck.Core.Utils;
+using TweetDuck.Management;
+using TweetDuck.Utils;
 
-namespace TweetDuck.Core.Other{
+namespace TweetDuck.Dialogs{
     sealed partial class FormAbout : Form, FormManager.IAppDialog{
         private const string TipsLink = "https://github.com/chylex/TweetDuck/wiki";
         private const string IssuesLink = "https://github.com/chylex/TweetDuck/issues";

Dialogs/FormGuide.Designer.cs

@@ -1,21 +1,10 @@
-namespace TweetDuck.Core.Other {
+namespace TweetDuck.Dialogs {
     partial class FormGuide {
         /// <summary>
         /// Required designer variable.
         /// </summary>
         private System.ComponentModel.IContainer components = null;
 
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing) {
-            if (disposing && (components != null)) {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
         #region Windows Form Designer generated code
 
         /// <summary>

Dialogs/FormGuide.cs

@@ -1,21 +1,23 @@
 using System.Drawing;
+using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using CefSharp;
 using CefSharp.WinForms;
-using TweetDuck.Core.Controls;
+using TweetDuck.Browser;
-using TweetDuck.Core.Handling;
+using TweetDuck.Browser.Adapters;
-using TweetDuck.Core.Handling.General;
+using TweetDuck.Browser.Data;
-using TweetDuck.Core.Utils;
+using TweetDuck.Browser.Handling;
-using System.Text.RegularExpressions;
+using TweetDuck.Browser.Handling.General;
-using TweetDuck.Core.Adapters;
+using TweetDuck.Controls;
-using TweetDuck.Data;
+using TweetDuck.Management;
+using TweetDuck.Utils;
 
-namespace TweetDuck.Core.Other{
+namespace TweetDuck.Dialogs{
     sealed partial class FormGuide : Form, FormManager.IAppDialog{
         private const string GuideUrl = "https://tweetduck.chylex.com/guide/v2/";
         private const string GuidePathRegex = @"^guide(?:/v\d+)?(?:/(#.*))?";
         
-        private static readonly ResourceLink DummyPage = new ResourceLink("http://td/dummy", ResourceHandler.FromString(""));
+        private static readonly ResourceLink DummyPage = new ResourceLink("http://td/dummy", ResourceHandlers.ForString(string.Empty));
 
         public static bool CheckGuideUrl(string url, out string hash){
             if (!url.Contains("//tweetduck.chylex.com/guide")){
@@ -54,7 +56,10 @@ namespace TweetDuck.Core.Other{
             }
         }
 
+        #pragma warning disable IDE0069 // Disposable fields should be disposed
         private readonly ChromiumWebBrowser browser;
+        #pragma warning restore IDE0069 // Disposable fields should be disposed
+
         private string nextUrl;
 
         private FormGuide(string url, FormBrowser owner){
@@ -64,8 +69,8 @@ namespace TweetDuck.Core.Other{
             Size = new Size(owner.Size.Width * 3 / 4, owner.Size.Height * 3 / 4);
             VisibleChanged += (sender, args) => this.MoveToCenter(owner);
 
-            ResourceHandlerFactory resourceHandlerFactory = new ResourceHandlerFactory();
+            var resourceRequestHandler = new ResourceRequestHandlerBase();
-            resourceHandlerFactory.RegisterHandler(DummyPage);
+            resourceRequestHandler.ResourceHandlers.Register(DummyPage);
             
             this.browser = new ChromiumWebBrowser(url){
                 MenuHandler = new ContextMenuGuide(owner),
@@ -73,7 +78,7 @@ namespace TweetDuck.Core.Other{
                 KeyboardHandler = new KeyboardHandlerBase(),
                 LifeSpanHandler = new LifeSpanHandler(),
                 RequestHandler = new RequestHandlerBase(true),
-                ResourceHandlerFactory = resourceHandlerFactory
+                ResourceRequestHandlerFactory = resourceRequestHandler.SelfFactory
             };
 
             browser.LoadingStateChanged += browser_LoadingStateChanged;
@@ -85,10 +90,15 @@ namespace TweetDuck.Core.Other{
             browser.SetupZoomEvents();
 
             Controls.Add(browser);
+            Disposed += (sender, args) => browser.Dispose();
+        }
 
-            Disposed += (sender, args) => {
+        protected override void Dispose(bool disposing){
-                browser.Dispose();
+            if (disposing){
-            };
+                components?.Dispose();
+            }
+
+            base.Dispose(disposing);
         }
 
         private void Reload(string url){

Dialogs/FormMessage.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDuck.Core.Other {
+namespace TweetDuck.Dialogs {
     partial class FormMessage {
         /// <summary>
         /// Required designer variable.

Dialogs/FormMessage.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Drawing;
 using System.Windows.Forms;
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
-using TweetDuck.Core.Utils;
+using TweetDuck.Utils;
 
-namespace TweetDuck.Core.Other{
+namespace TweetDuck.Dialogs{
     [Flags]
     enum ControlType{
         None = 0,
@@ -43,17 +43,17 @@ namespace TweetDuck.Core.Other{
         }
 
         public static bool Show(string caption, string text, MessageBoxIcon icon, string buttonAccept, string buttonCancel){
-            using(FormMessage message = new FormMessage(caption, text, icon)){
+            using FormMessage message = new FormMessage(caption, text, icon);
-                if (buttonCancel == null){
-                    message.AddButton(buttonAccept, DialogResult.OK, ControlType.Cancel | ControlType.Focused);
-                }
-                else{
-                    message.AddButton(buttonCancel, DialogResult.Cancel, ControlType.Cancel);
-                    message.AddButton(buttonAccept, DialogResult.OK, ControlType.Accept | ControlType.Focused);
-                }
 
-                return message.ShowDialog() == DialogResult.OK;
+            if (buttonCancel == null){
+                message.AddButton(buttonAccept, DialogResult.OK, ControlType.Cancel | ControlType.Focused);
             }
+            else{
+                message.AddButton(buttonCancel, DialogResult.Cancel, ControlType.Cancel);
+                message.AddButton(buttonAccept, DialogResult.OK, ControlType.Accept | ControlType.Focused);
+            }
+
+            return message.ShowDialog() == DialogResult.OK;
         }
 
         // Instance

Dialogs/FormPlugins.Designer.cs

@@ -1,6 +1,6 @@
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
 
-namespace TweetDuck.Core.Other {
+namespace TweetDuck.Dialogs {
     partial class FormPlugins {
         /// <summary>
         /// Required designer variable.

Dialogs/FormPlugins.cs

@@ -3,11 +3,12 @@ using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
+using TweetDuck.Management;
 using TweetDuck.Plugins;
 using TweetLib.Core;
 using TweetLib.Core.Features.Plugins;
 
-namespace TweetDuck.Core.Other{
+namespace TweetDuck.Dialogs{
     sealed partial class FormPlugins : Form, FormManager.IAppDialog{
         private static UserConfig Config => Program.Config.User;
 

Dialogs/FormSettings.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDuck.Core.Other {
+namespace TweetDuck.Dialogs {
     sealed partial class FormSettings {
         /// <summary>
         /// Required designer variable.

Dialogs/FormSettings.cs

@@ -2,17 +2,19 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Windows.Forms;
-using TweetDuck.Core.Controls;
+using TweetDuck.Browser;
-using TweetDuck.Core.Handling.General;
+using TweetDuck.Browser.Handling.General;
-using TweetDuck.Core.Notification.Example;
+using TweetDuck.Browser.Notification.Example;
-using TweetDuck.Core.Other.Analytics;
+using TweetDuck.Configuration;
-using TweetDuck.Core.Other.Settings;
+using TweetDuck.Controls;
-using TweetDuck.Core.Other.Settings.Dialogs;
+using TweetDuck.Dialogs.Settings;
-using TweetDuck.Core.Utils;
+using TweetDuck.Management;
+using TweetDuck.Management.Analytics;
+using TweetDuck.Utils;
 using TweetLib.Core.Features.Plugins;
-using TweetLib.Core.Features.Updates;
+using TweetLib.Core.Systems.Updates;
 
-namespace TweetDuck.Core.Other{
+namespace TweetDuck.Dialogs{
     sealed partial class FormSettings : Form, FormManager.IAppDialog{
         public bool ShouldReloadBrowser { get; private set; }
 
@@ -41,6 +43,7 @@ namespace TweetDuck.Core.Other{
             AddButton("General", () => new TabSettingsGeneral(this.browser.ReloadColumns, updates));
             AddButton("Notifications", () => new TabSettingsNotifications(new FormNotificationExample(this.browser, this.plugins)));
             AddButton("Sounds", () => new TabSettingsSounds(this.browser.PlaySoundNotification));
+            AddButton("Tray", () => new TabSettingsTray());
             AddButton("Feedback", () => new TabSettingsFeedback(analytics, AnalyticsReportGenerator.ExternalInfo.From(this.browser), this.plugins));
             AddButton("Advanced", () => new TabSettingsAdvanced(this.browser.ReinjectCustomCSS, this.browser.OpenDevTools));
 
@@ -79,25 +82,24 @@ namespace TweetDuck.Core.Other{
         private void btnManageOptions_Click(object sender, EventArgs e){
             PrepareUnload();
 
-            using(DialogSettingsManage dialog = new DialogSettingsManage(plugins)){
+            using DialogSettingsManage dialog = new DialogSettingsManage(plugins);
-                FormClosing -= FormSettings_FormClosing;
+            FormClosing -= FormSettings_FormClosing;
             
-                if (dialog.ShowDialog() == DialogResult.OK){
+            if (dialog.ShowDialog() == DialogResult.OK){
-                    if (!dialog.IsRestarting){
+                if (!dialog.IsRestarting){
-                        browser.ResumeNotification();
+                    browser.ResumeNotification();
 
-                        if (dialog.ShouldReloadBrowser){
+                    if (dialog.ShouldReloadBrowser){
-                            BrowserProcessHandler.UpdatePrefs();
+                        BrowserProcessHandler.UpdatePrefs();
-                            ShouldReloadBrowser = true;
+                        ShouldReloadBrowser = true;
-                        }
                     }
+                }
 
-                    Close();
+                Close();
-                }
+            }
-                else{
+            else{
-                    FormClosing += FormSettings_FormClosing;
+                FormClosing += FormSettings_FormClosing;
-                    PrepareLoad();
+                PrepareLoad();
-                }
             }
         }
 
@@ -105,7 +107,7 @@ namespace TweetDuck.Core.Other{
             Close();
         }
 
-        private void AddButton<T>(string title, Func<T> constructor) where T : BaseTabSettings{
+        private void AddButton<T>(string title, Func<T> constructor) where T : BaseTab{
             FlatButton btn = new FlatButton{
                 BackColor = SystemColors.Control,
                 FlatStyle = FlatStyle.Flat,
@@ -135,7 +137,7 @@ namespace TweetDuck.Core.Other{
             btn.Click += (sender, args) => SelectTab<T>();
         }
 
-        private void SelectTab<T>() where T : BaseTabSettings{
+        private void SelectTab<T>() where T : BaseTab{
             SelectTab(tabs[typeof(T)]);
         }
 
@@ -195,16 +197,47 @@ namespace TweetDuck.Core.Other{
         private sealed class SettingsTab{
             public Button Button { get; }
 
-            public BaseTabSettings Control => control ??= constructor();
+            public BaseTab Control => control ??= constructor();
             public bool IsInitialized => control != null;
 
-            private readonly Func<BaseTabSettings> constructor;
+            private readonly Func<BaseTab> constructor;
-            private BaseTabSettings control;
+            private BaseTab control;
 
-            public SettingsTab(Button button, Func<BaseTabSettings> constructor){
+            public SettingsTab(Button button, Func<BaseTab> constructor){
                 this.Button = button;
                 this.constructor = constructor;
             }
         }
+
+        internal abstract class BaseTab : UserControl{
+            protected static UserConfig Config => Program.Config.User;
+            protected static SystemConfig SysConfig => Program.Config.System;
+
+            public IEnumerable<Control> InteractiveControls{
+                get{
+                    static IEnumerable<Control> FindInteractiveControls(Control parent){
+                        foreach(Control control in parent.Controls){
+                            if (control is Panel subPanel){
+                                foreach(Control subControl in FindInteractiveControls(subPanel)){
+                                    yield return subControl;
+                                }
+                            }
+                            else{
+                                yield return control;
+                            }
+                        }
+                    }
+
+                    return FindInteractiveControls(this);
+                }
+            }
+
+            protected BaseTab(){
+                Padding = new Padding(6);
+            }
+
+            public virtual void OnReady(){}
+            public virtual void OnClosing(){}
+        }
     }
 }

Dialogs/Settings/DialogSettingsAnalytics.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDuck.Core.Other.Settings.Dialogs {
+namespace TweetDuck.Dialogs.Settings {
     partial class DialogSettingsAnalytics {
         /// <summary>
         /// Required designer variable.

Dialogs/Settings/DialogSettingsAnalytics.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Windows.Forms;
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
-using TweetDuck.Core.Other.Analytics;
+using TweetDuck.Management.Analytics;
 
-namespace TweetDuck.Core.Other.Settings.Dialogs{
+namespace TweetDuck.Dialogs.Settings{
     sealed partial class DialogSettingsAnalytics : Form{
         public DialogSettingsAnalytics(AnalyticsReport report){
             InitializeComponent();

Dialogs/Settings/DialogSettingsCSS.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDuck.Core.Other.Settings.Dialogs {
+namespace TweetDuck.Dialogs.Settings {
     partial class DialogSettingsCSS {
         /// <summary>
         /// Required designer variable.

Dialogs/Settings/DialogSettingsCSS.cs

@@ -2,10 +2,10 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
-using TweetDuck.Core.Utils;
+using TweetDuck.Utils;
 
-namespace TweetDuck.Core.Other.Settings.Dialogs{
+namespace TweetDuck.Dialogs.Settings{
     sealed partial class DialogSettingsCSS : Form{
         public string BrowserCSS => textBoxBrowserCSS.Text;
         public string NotificationCSS => textBoxNotificationCSS.Text;

Dialogs/Settings/DialogSettingsCefArgs.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDuck.Core.Other.Settings.Dialogs {
+namespace TweetDuck.Dialogs.Settings {
     partial class DialogSettingsCefArgs {
         /// <summary>
         /// Required designer variable.

Dialogs/Settings/DialogSettingsCefArgs.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Windows.Forms;
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
-using TweetDuck.Core.Utils;
+using TweetDuck.Utils;
 using TweetLib.Core.Collections;
 
-namespace TweetDuck.Core.Other.Settings.Dialogs{
+namespace TweetDuck.Dialogs.Settings{
     sealed partial class DialogSettingsCefArgs : Form{
         public string CefArgs => textBoxArgs.Text;
 

Dialogs/Settings/DialogSettingsExternalProgram.Designer.cs

@@ -0,0 +1,154 @@
+namespace TweetDuck.Dialogs.Settings {
+    partial class DialogSettingsExternalProgram {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing) {
+            if (disposing && (components != null)) {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent() {
+            this.textBoxPath = new System.Windows.Forms.TextBox();
+            this.btnCancel = new System.Windows.Forms.Button();
+            this.btnApply = new System.Windows.Forms.Button();
+            this.labelPath = new System.Windows.Forms.Label();
+            this.labelArgs = new System.Windows.Forms.Label();
+            this.textBoxArgs = new System.Windows.Forms.TextBox();
+            this.btnBrowse = new System.Windows.Forms.Button();
+            this.SuspendLayout();
+            // 
+            // textBoxPath
+            // 
+            this.textBoxPath.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.textBoxPath.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.textBoxPath.Location = new System.Drawing.Point(12, 30);
+            this.textBoxPath.Name = "textBoxPath";
+            this.textBoxPath.Size = new System.Drawing.Size(336, 23);
+            this.textBoxPath.TabIndex = 1;
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnCancel.AutoSize = true;
+            this.btnCancel.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.btnCancel.Location = new System.Drawing.Point(307, 118);
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.btnCancel.Size = new System.Drawing.Size(57, 25);
+            this.btnCancel.TabIndex = 6;
+            this.btnCancel.Text = "Cancel";
+            this.btnCancel.UseVisualStyleBackColor = true;
+            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+            // 
+            // btnApply
+            // 
+            this.btnApply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnApply.AutoSize = true;
+            this.btnApply.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.btnApply.Location = new System.Drawing.Point(370, 118);
+            this.btnApply.Name = "btnApply";
+            this.btnApply.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.btnApply.Size = new System.Drawing.Size(52, 25);
+            this.btnApply.TabIndex = 5;
+            this.btnApply.Text = "Apply";
+            this.btnApply.UseVisualStyleBackColor = true;
+            this.btnApply.Click += new System.EventHandler(this.btnApply_Click);
+            // 
+            // labelPath
+            // 
+            this.labelPath.AutoSize = true;
+            this.labelPath.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.labelPath.Location = new System.Drawing.Point(12, 9);
+            this.labelPath.Margin = new System.Windows.Forms.Padding(3, 0, 3, 3);
+            this.labelPath.Name = "labelPath";
+            this.labelPath.Size = new System.Drawing.Size(109, 15);
+            this.labelPath.TabIndex = 0;
+            this.labelPath.Text = "Path to Application";
+            // 
+            // labelArgs
+            // 
+            this.labelArgs.AutoSize = true;
+            this.labelArgs.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.labelArgs.Location = new System.Drawing.Point(12, 68);
+            this.labelArgs.Margin = new System.Windows.Forms.Padding(3, 12, 3, 3);
+            this.labelArgs.Name = "labelArgs";
+            this.labelArgs.Size = new System.Drawing.Size(124, 15);
+            this.labelArgs.TabIndex = 3;
+            this.labelArgs.Text = "Additional Arguments";
+            // 
+            // textBoxArgs
+            // 
+            this.textBoxArgs.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.textBoxArgs.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.textBoxArgs.Location = new System.Drawing.Point(12, 89);
+            this.textBoxArgs.Name = "textBoxArgs";
+            this.textBoxArgs.Size = new System.Drawing.Size(410, 23);
+            this.textBoxArgs.TabIndex = 4;
+            // 
+            // btnBrowse
+            // 
+            this.btnBrowse.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnBrowse.AutoSize = true;
+            this.btnBrowse.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.btnBrowse.Location = new System.Drawing.Point(354, 28);
+            this.btnBrowse.Name = "btnBrowse";
+            this.btnBrowse.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.btnBrowse.Size = new System.Drawing.Size(68, 25);
+            this.btnBrowse.TabIndex = 2;
+            this.btnBrowse.Text = "Browse...";
+            this.btnBrowse.UseVisualStyleBackColor = true;
+            this.btnBrowse.Click += new System.EventHandler(this.btnBrowse_Click);
+            // 
+            // DialogSettingsExternalProgram
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(434, 155);
+            this.Controls.Add(this.btnBrowse);
+            this.Controls.Add(this.textBoxArgs);
+            this.Controls.Add(this.labelArgs);
+            this.Controls.Add(this.labelPath);
+            this.Controls.Add(this.btnApply);
+            this.Controls.Add(this.btnCancel);
+            this.Controls.Add(this.textBoxPath);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "DialogSettingsExternalProgram";
+            this.ShowIcon = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.TextBox textBoxPath;
+        private System.Windows.Forms.Button btnCancel;
+        private System.Windows.Forms.Button btnApply;
+        private System.Windows.Forms.Label labelPath;
+        private System.Windows.Forms.Label labelArgs;
+        private System.Windows.Forms.TextBox textBoxArgs;
+        private System.Windows.Forms.Button btnBrowse;
+    }
+}

Dialogs/Settings/DialogSettingsExternalProgram.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Windows.Forms;
+using TweetLib.Core.Utils;
+using IOPath = System.IO.Path;
+
+namespace TweetDuck.Dialogs.Settings{
+    sealed partial class DialogSettingsExternalProgram : Form{
+        public string Path{
+            get => StringUtils.NullIfEmpty(textBoxPath.Text);
+            set => textBoxPath.Text = value ?? string.Empty;
+        }
+
+        public string Args{
+            get => StringUtils.NullIfEmpty(textBoxArgs.Text);
+            set => textBoxArgs.Text = value ?? string.Empty;
+        }
+
+        private readonly string fileDialogTitle;
+
+        public DialogSettingsExternalProgram(string windowTitle, string fileDialogTitle){
+            InitializeComponent();
+            
+            Text = Program.BrandName + " Options - " + windowTitle;
+            AcceptButton = btnApply;
+            CancelButton = btnCancel;
+
+            this.fileDialogTitle = fileDialogTitle;
+        }
+
+        private void btnBrowse_Click(object sender, EventArgs e){
+            using OpenFileDialog dialog = new OpenFileDialog{
+                AutoUpgradeEnabled = true,
+                DereferenceLinks = true,
+                InitialDirectory = IOPath.GetDirectoryName(Path), // returns null if argument is null
+                Title = fileDialogTitle,
+                Filter = "Executables (*.exe;*.bat;*.cmd)|*.exe;*.bat;*.cmd|All Files (*.*)|*.*"
+            };
+
+            if (dialog.ShowDialog() == DialogResult.OK && Path != dialog.FileName){
+                Path = dialog.FileName;
+                Args = string.Empty;
+            }
+        }
+        
+        private void btnApply_Click(object sender, EventArgs e){
+            DialogResult = DialogResult.OK;
+            Close();
+        }
+
+        private void btnCancel_Click(object sender, EventArgs e){
+            DialogResult = DialogResult.Cancel;
+            Close();
+        }
+    }
+}

Dialogs/Settings/DialogSettingsManage.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDuck.Core.Other.Settings.Dialogs {
+namespace TweetDuck.Dialogs.Settings {
     partial class DialogSettingsManage {
         /// <summary>
         /// Required designer variable.

Dialogs/Settings/DialogSettingsManage.cs

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.IO;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
-using TweetDuck.Core.Management;
+using TweetDuck.Management;
 using TweetLib.Core.Features.Plugins;
 using TweetLib.Core.Utils;
 
-namespace TweetDuck.Core.Other.Settings.Dialogs{
+namespace TweetDuck.Dialogs.Settings{
     sealed partial class DialogSettingsManage : Form{
         private enum State{
             Deciding, Reset, Import, Export

Dialogs/Settings/DialogSettingsRestart.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDuck.Core.Other.Settings.Dialogs {
+namespace TweetDuck.Dialogs.Settings {
     partial class DialogSettingsRestart {
         /// <summary>
         /// Required designer variable.

Dialogs/Settings/DialogSettingsRestart.cs

@@ -3,7 +3,7 @@ using System.Windows.Forms;
 using TweetDuck.Configuration;
 using TweetLib.Core.Collections;
 
-namespace TweetDuck.Core.Other.Settings.Dialogs{
+namespace TweetDuck.Dialogs.Settings{
     sealed partial class DialogSettingsRestart : Form{
         public CommandLineArgs Args { get; private set; }
 
@@ -38,7 +38,7 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
                 Args.SetValue(Arguments.ArgDataFolder, tbDataFolder.Text);
             }
 
-            tbShortcutTarget.Text = $@"""{Application.ExecutablePath}""{(Args.Count > 0 ? " " : "")}{Args}";
+            tbShortcutTarget.Text = $@"""{Program.ExecutablePath}""{(Args.Count > 0 ? " " : "")}{Args}";
             tbShortcutTarget.Select(tbShortcutTarget.Text.Length, 0);
         }
 

Dialogs/Settings/DialogSettingsSearchEngine.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDuck.Core.Other.Settings.Dialogs {
+namespace TweetDuck.Dialogs.Settings {
     partial class DialogSettingsSearchEngine {
         /// <summary>
         /// Required designer variable.

Dialogs/Settings/DialogSettingsSearchEngine.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Forms;
 
-namespace TweetDuck.Core.Other.Settings.Dialogs{
+namespace TweetDuck.Dialogs.Settings{
     sealed partial class DialogSettingsSearchEngine : Form{
         public string Url => textBoxUrl.Text;
 

Dialogs/Settings/TabSettingsAdvanced.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDuck.Core.Other.Settings {
+namespace TweetDuck.Dialogs.Settings {
     partial class TabSettingsAdvanced {
         /// <summary> 
         /// Required designer variable.
@@ -32,7 +32,7 @@
             this.btnRestart = new System.Windows.Forms.Button();
             this.btnOpenAppFolder = new System.Windows.Forms.Button();
             this.btnOpenDataFolder = new System.Windows.Forms.Button();
-            this.numClearCacheThreshold = new TweetDuck.Core.Controls.NumericUpDownEx();
+            this.numClearCacheThreshold = new TweetDuck.Controls.NumericUpDownEx();
             this.checkClearCacheAuto = new System.Windows.Forms.CheckBox();
             this.labelApp = new System.Windows.Forms.Label();
             this.panelAppButtons = new System.Windows.Forms.Panel();
@@ -41,6 +41,8 @@
             this.panelConfiguration = new System.Windows.Forms.Panel();
             this.labelConfiguration = new System.Windows.Forms.Label();
             this.flowPanel = new System.Windows.Forms.FlowLayoutPanel();
+            this.labelDevTools = new System.Windows.Forms.Label();
+            this.checkDevToolsWindowOnTop = new System.Windows.Forms.CheckBox();
             ((System.ComponentModel.ISupportInitialize)(this.numClearCacheThreshold)).BeginInit();
             this.panelAppButtons.SuspendLayout();
             this.panelClearCacheAuto.SuspendLayout();
@@ -240,6 +242,8 @@
             this.flowPanel.Controls.Add(this.panelClearCacheAuto);
             this.flowPanel.Controls.Add(this.labelConfiguration);
             this.flowPanel.Controls.Add(this.panelConfiguration);
+            this.flowPanel.Controls.Add(this.labelDevTools);
+            this.flowPanel.Controls.Add(this.checkDevToolsWindowOnTop);
             this.flowPanel.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
             this.flowPanel.Location = new System.Drawing.Point(9, 9);
             this.flowPanel.Name = "flowPanel";
@@ -247,6 +251,29 @@
             this.flowPanel.TabIndex = 0;
             this.flowPanel.WrapContents = false;
             // 
+            // labelDevTools
+            // 
+            this.labelDevTools.AutoSize = true;
+            this.labelDevTools.Font = new System.Drawing.Font("Segoe UI Semibold", 10.5F, System.Drawing.FontStyle.Bold);
+            this.labelDevTools.Location = new System.Drawing.Point(0, 302);
+            this.labelDevTools.Margin = new System.Windows.Forms.Padding(0, 30, 0, 1);
+            this.labelDevTools.Name = "labelDevTools";
+            this.labelDevTools.Size = new System.Drawing.Size(156, 19);
+            this.labelDevTools.TabIndex = 7;
+            this.labelDevTools.Text = "DEVELOPMENT TOOLS";
+            // 
+            // checkDevToolsWindowOnTop
+            // 
+            this.checkDevToolsWindowOnTop.AutoSize = true;
+            this.checkDevToolsWindowOnTop.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.checkDevToolsWindowOnTop.Location = new System.Drawing.Point(6, 328);
+            this.checkDevToolsWindowOnTop.Margin = new System.Windows.Forms.Padding(6, 6, 0, 2);
+            this.checkDevToolsWindowOnTop.Name = "checkDevToolsWindowOnTop";
+            this.checkDevToolsWindowOnTop.Size = new System.Drawing.Size(168, 19);
+            this.checkDevToolsWindowOnTop.TabIndex = 8;
+            this.checkDevToolsWindowOnTop.Text = "Dev Tools Window On Top";
+            this.checkDevToolsWindowOnTop.UseVisualStyleBackColor = true;
+            // 
             // TabSettingsAdvanced
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -284,5 +311,7 @@
         private Controls.NumericUpDownEx numClearCacheThreshold;
         private System.Windows.Forms.CheckBox checkClearCacheAuto;
         private System.Windows.Forms.FlowLayoutPanel flowPanel;
+        private System.Windows.Forms.Label labelDevTools;
+        private System.Windows.Forms.CheckBox checkDevToolsWindowOnTop;
     }
 }

Dialogs/Settings/TabSettingsAdvanced.cs

@@ -2,14 +2,13 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
-using TweetDuck.Core.Controls;
+using TweetDuck.Controls;
-using TweetDuck.Core.Management;
+using TweetDuck.Management;
-using TweetDuck.Core.Other.Settings.Dialogs;
+using TweetDuck.Utils;
-using TweetDuck.Core.Utils;
 using TweetLib.Core;
 
-namespace TweetDuck.Core.Other.Settings{
+namespace TweetDuck.Dialogs.Settings{
-    sealed partial class TabSettingsAdvanced : BaseTabSettings{
+    sealed partial class TabSettingsAdvanced : FormSettings.BaseTab{
         private readonly Action<string> reinjectBrowserCSS;
         private readonly Action openDevTools;
 
@@ -44,6 +43,16 @@ namespace TweetDuck.Core.Other.Settings{
 
             toolTip.SetToolTip(btnEditCefArgs, "Set custom command line arguments for Chromium Embedded Framework.");
             toolTip.SetToolTip(btnEditCSS, "Set custom CSS for browser and notification windows.");
+
+            // development tools
+
+            toolTip.SetToolTip(checkDevToolsWindowOnTop, "Sets whether dev tool windows appears on top of other windows.");
+
+            checkDevToolsWindowOnTop.Checked = Config.DevToolsWindowOnTop;
+
+            if (!BrowserUtils.HasDevTools){
+                checkDevToolsWindowOnTop.Enabled = false;
+            }
         }
 
         public override void OnReady(){
@@ -57,6 +66,8 @@ namespace TweetDuck.Core.Other.Settings{
             
             btnEditCefArgs.Click += btnEditCefArgs_Click;
             btnEditCSS.Click += btnEditCSS_Click;
+
+            checkDevToolsWindowOnTop.CheckedChanged += checkDevToolsWindowOnTop_CheckedChanged;
         }
 
         public override void OnClosing(){
@@ -79,10 +90,10 @@ namespace TweetDuck.Core.Other.Settings{
         }
 
         private void btnRestartArgs_Click(object sender, EventArgs e){
-            using(DialogSettingsRestart dialog = new DialogSettingsRestart(Arguments.GetCurrentClean())){
+            using DialogSettingsRestart dialog = new DialogSettingsRestart(Arguments.GetCurrentClean());
-                if (dialog.ShowDialog() == DialogResult.OK){
+
-                    Program.RestartWithArgs(dialog.Args);
+            if (dialog.ShowDialog() == DialogResult.OK){
-                }
+                Program.RestartWithArgs(dialog.Args);
             }
         }
 
@@ -152,6 +163,13 @@ namespace TweetDuck.Core.Other.Settings{
             }
         }
 
+        #endregion
+        #region Development Tools
+
+        private void checkDevToolsWindowOnTop_CheckedChanged(object sender, EventArgs e){
+            Config.DevToolsWindowOnTop = checkDevToolsWindowOnTop.Checked;
+        }
+
         #endregion
     }
 }

Dialogs/Settings/TabSettingsFeedback.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDuck.Core.Other.Settings {
+namespace TweetDuck.Dialogs.Settings {
     partial class TabSettingsFeedback {
         /// <summary> 
         /// Required designer variable.

Dialogs/Settings/TabSettingsFeedback.cs

@@ -1,12 +1,11 @@
 using System;
 using System.Windows.Forms;
-using TweetDuck.Core.Other.Analytics;
+using TweetDuck.Management.Analytics;
-using TweetDuck.Core.Other.Settings.Dialogs;
+using TweetDuck.Utils;
-using TweetDuck.Core.Utils;
 using TweetLib.Core.Features.Plugins;
 
-namespace TweetDuck.Core.Other.Settings{
+namespace TweetDuck.Dialogs.Settings{
-    sealed partial class TabSettingsFeedback : BaseTabSettings{
+    sealed partial class TabSettingsFeedback : FormSettings.BaseTab{
         private readonly AnalyticsFile analyticsFile;
         private readonly AnalyticsReportGenerator.ExternalInfo analyticsInfo;
         private readonly PluginManager plugins;
@@ -50,9 +49,8 @@ namespace TweetDuck.Core.Other.Settings{
         }
 
         private void btnViewReport_Click(object sender, EventArgs e){
-            using(DialogSettingsAnalytics dialog = new DialogSettingsAnalytics(AnalyticsReportGenerator.Create(analyticsFile, analyticsInfo, plugins))){
+            using DialogSettingsAnalytics dialog = new DialogSettingsAnalytics(AnalyticsReportGenerator.Create(analyticsFile, analyticsInfo, plugins));
-                dialog.ShowDialog();
+            dialog.ShowDialog();
-            }
         }
 
         #endregion

Dialogs/Settings/TabSettingsGeneral.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDuck.Core.Other.Settings {
+namespace TweetDuck.Dialogs.Settings {
     partial class TabSettingsGeneral {
         /// <summary> 
         /// Required designer variable.
@@ -41,30 +41,37 @@
             this.flowPanelLeft = new System.Windows.Forms.FlowLayoutPanel();
             this.checkFocusDmInput = new System.Windows.Forms.CheckBox();
             this.checkKeepLikeFollowDialogsOpen = new System.Windows.Forms.CheckBox();
-            this.labelTray = new System.Windows.Forms.Label();
-            this.comboBoxTrayType = new System.Windows.Forms.ComboBox();
-            this.labelTrayIcon = new System.Windows.Forms.Label();
-            this.checkTrayHighlight = new System.Windows.Forms.CheckBox();
             this.labelBrowserSettings = new System.Windows.Forms.Label();
             this.checkSmoothScrolling = new System.Windows.Forms.CheckBox();
             this.checkTouchAdjustment = new System.Windows.Forms.CheckBox();
+            this.checkHardwareAcceleration = new System.Windows.Forms.CheckBox();
             this.labelBrowserPath = new System.Windows.Forms.Label();
-            this.comboBoxBrowserPath = new System.Windows.Forms.ComboBox();
+            this.comboBoxCustomBrowser = new System.Windows.Forms.ComboBox();
             this.labelSearchEngine = new System.Windows.Forms.Label();
             this.comboBoxSearchEngine = new System.Windows.Forms.ComboBox();
             this.flowPanelRight = new System.Windows.Forms.FlowLayoutPanel();
-            this.checkHardwareAcceleration = new System.Windows.Forms.CheckBox();
             this.labelLocales = new System.Windows.Forms.Label();
             this.checkSpellCheck = new System.Windows.Forms.CheckBox();
             this.labelSpellCheckLanguage = new System.Windows.Forms.Label();
             this.comboBoxSpellCheckLanguage = new System.Windows.Forms.ComboBox();
             this.labelTranslationTarget = new System.Windows.Forms.Label();
             this.comboBoxTranslationTarget = new System.Windows.Forms.ComboBox();
+            this.labelFirstDayOfWeek = new System.Windows.Forms.Label();
+            this.comboBoxFirstDayOfWeek = new System.Windows.Forms.ComboBox();
+            this.labelExternalApplications = new System.Windows.Forms.Label();
+            this.panelCustomBrowser = new System.Windows.Forms.Panel();
+            this.btnCustomBrowserChange = new System.Windows.Forms.Button();
+            this.labelVideoPlayerPath = new System.Windows.Forms.Label();
+            this.panelCustomVideoPlayer = new System.Windows.Forms.Panel();
+            this.comboBoxCustomVideoPlayer = new System.Windows.Forms.ComboBox();
+            this.btnCustomVideoPlayerChange = new System.Windows.Forms.Button();
             this.panelSeparator = new System.Windows.Forms.Panel();
             ((System.ComponentModel.ISupportInitialize)(this.trackBarZoom)).BeginInit();
             this.panelZoom.SuspendLayout();
             this.flowPanelLeft.SuspendLayout();
             this.flowPanelRight.SuspendLayout();
+            this.panelCustomBrowser.SuspendLayout();
+            this.panelCustomVideoPlayer.SuspendLayout();
             this.SuspendLayout();
             // 
             // checkExpandLinks
@@ -83,7 +90,7 @@
             // 
             this.checkUpdateNotifications.AutoSize = true;
             this.checkUpdateNotifications.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.checkUpdateNotifications.Location = new System.Drawing.Point(6, 409);
+            this.checkUpdateNotifications.Location = new System.Drawing.Point(6, 403);
             this.checkUpdateNotifications.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
             this.checkUpdateNotifications.Name = "checkUpdateNotifications";
             this.checkUpdateNotifications.Size = new System.Drawing.Size(182, 19);
@@ -95,7 +102,7 @@
             // 
             this.btnCheckUpdates.AutoSize = true;
             this.btnCheckUpdates.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.btnCheckUpdates.Location = new System.Drawing.Point(5, 433);
+            this.btnCheckUpdates.Location = new System.Drawing.Point(5, 427);
             this.btnCheckUpdates.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.btnCheckUpdates.Name = "btnCheckUpdates";
             this.btnCheckUpdates.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
@@ -108,7 +115,7 @@
             // 
             this.labelZoomValue.BackColor = System.Drawing.Color.Transparent;
             this.labelZoomValue.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.labelZoomValue.Location = new System.Drawing.Point(147, 4);
+            this.labelZoomValue.Location = new System.Drawing.Point(176, 4);
             this.labelZoomValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelZoomValue.Name = "labelZoomValue";
             this.labelZoomValue.Size = new System.Drawing.Size(38, 13);
@@ -149,7 +156,7 @@
             this.trackBarZoom.Maximum = 200;
             this.trackBarZoom.Minimum = 50;
             this.trackBarZoom.Name = "trackBarZoom";
-            this.trackBarZoom.Size = new System.Drawing.Size(148, 30);
+            this.trackBarZoom.Size = new System.Drawing.Size(177, 30);
             this.trackBarZoom.SmallChange = 5;
             this.trackBarZoom.TabIndex = 0;
             this.trackBarZoom.TickFrequency = 25;
@@ -159,11 +166,11 @@
             // 
             this.labelZoom.AutoSize = true;
             this.labelZoom.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold);
-            this.labelZoom.Location = new System.Drawing.Point(3, 179);
+            this.labelZoom.Location = new System.Drawing.Point(3, 299);
             this.labelZoom.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelZoom.Name = "labelZoom";
             this.labelZoom.Size = new System.Drawing.Size(39, 15);
-            this.labelZoom.TabIndex = 7;
+            this.labelZoom.TabIndex = 11;
             this.labelZoom.Text = "Zoom";
             // 
             // zoomUpdateTimer
@@ -186,11 +193,11 @@
             // 
             this.panelZoom.Controls.Add(this.trackBarZoom);
             this.panelZoom.Controls.Add(this.labelZoomValue);
-            this.panelZoom.Location = new System.Drawing.Point(0, 195);
+            this.panelZoom.Location = new System.Drawing.Point(0, 315);
             this.panelZoom.Margin = new System.Windows.Forms.Padding(0, 1, 0, 0);
             this.panelZoom.Name = "panelZoom";
             this.panelZoom.Size = new System.Drawing.Size(300, 35);
-            this.panelZoom.TabIndex = 8;
+            this.panelZoom.TabIndex = 12;
             // 
             // checkAnimatedAvatars
             // 
@@ -208,7 +215,7 @@
             // 
             this.labelUpdates.AutoSize = true;
             this.labelUpdates.Font = new System.Drawing.Font("Segoe UI Semibold", 10.5F, System.Drawing.FontStyle.Bold);
-            this.labelUpdates.Location = new System.Drawing.Point(0, 383);
+            this.labelUpdates.Location = new System.Drawing.Point(0, 377);
             this.labelUpdates.Margin = new System.Windows.Forms.Padding(0, 27, 0, 1);
             this.labelUpdates.Name = "labelUpdates";
             this.labelUpdates.Size = new System.Drawing.Size(69, 19);
@@ -226,12 +233,12 @@
             this.flowPanelLeft.Controls.Add(this.checkKeepLikeFollowDialogsOpen);
             this.flowPanelLeft.Controls.Add(this.checkBestImageQuality);
             this.flowPanelLeft.Controls.Add(this.checkAnimatedAvatars);
+            this.flowPanelLeft.Controls.Add(this.labelBrowserSettings);
+            this.flowPanelLeft.Controls.Add(this.checkSmoothScrolling);
+            this.flowPanelLeft.Controls.Add(this.checkTouchAdjustment);
+            this.flowPanelLeft.Controls.Add(this.checkHardwareAcceleration);
             this.flowPanelLeft.Controls.Add(this.labelZoom);
             this.flowPanelLeft.Controls.Add(this.panelZoom);
-            this.flowPanelLeft.Controls.Add(this.labelTray);
-            this.flowPanelLeft.Controls.Add(this.comboBoxTrayType);
-            this.flowPanelLeft.Controls.Add(this.labelTrayIcon);
-            this.flowPanelLeft.Controls.Add(this.checkTrayHighlight);
             this.flowPanelLeft.Controls.Add(this.labelUpdates);
             this.flowPanelLeft.Controls.Add(this.checkUpdateNotifications);
             this.flowPanelLeft.Controls.Add(this.btnCheckUpdates);
@@ -266,71 +273,26 @@
             this.checkKeepLikeFollowDialogsOpen.Text = "Keep Like/Follow Dialogs Open";
             this.checkKeepLikeFollowDialogsOpen.UseVisualStyleBackColor = true;
             // 
-            // labelTray
-            // 
-            this.labelTray.AutoSize = true;
-            this.labelTray.Font = new System.Drawing.Font("Segoe UI Semibold", 10.5F, System.Drawing.FontStyle.Bold);
-            this.labelTray.Location = new System.Drawing.Point(0, 255);
-            this.labelTray.Margin = new System.Windows.Forms.Padding(0, 25, 0, 1);
-            this.labelTray.Name = "labelTray";
-            this.labelTray.Size = new System.Drawing.Size(99, 19);
-            this.labelTray.TabIndex = 9;
-            this.labelTray.Text = "SYSTEM TRAY";
-            // 
-            // comboBoxTrayType
-            // 
-            this.comboBoxTrayType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxTrayType.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.comboBoxTrayType.FormattingEnabled = true;
-            this.comboBoxTrayType.Location = new System.Drawing.Point(5, 279);
-            this.comboBoxTrayType.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
-            this.comboBoxTrayType.Name = "comboBoxTrayType";
-            this.comboBoxTrayType.Size = new System.Drawing.Size(144, 23);
-            this.comboBoxTrayType.TabIndex = 10;
-            // 
-            // labelTrayIcon
-            // 
-            this.labelTrayIcon.AutoSize = true;
-            this.labelTrayIcon.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold);
-            this.labelTrayIcon.Location = new System.Drawing.Point(3, 314);
-            this.labelTrayIcon.Margin = new System.Windows.Forms.Padding(3, 9, 3, 0);
-            this.labelTrayIcon.Name = "labelTrayIcon";
-            this.labelTrayIcon.Size = new System.Drawing.Size(56, 15);
-            this.labelTrayIcon.TabIndex = 11;
-            this.labelTrayIcon.Text = "Tray Icon";
-            // 
-            // checkTrayHighlight
-            // 
-            this.checkTrayHighlight.AutoSize = true;
-            this.checkTrayHighlight.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.checkTrayHighlight.Location = new System.Drawing.Point(6, 335);
-            this.checkTrayHighlight.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
-            this.checkTrayHighlight.Name = "checkTrayHighlight";
-            this.checkTrayHighlight.Size = new System.Drawing.Size(114, 19);
-            this.checkTrayHighlight.TabIndex = 12;
-            this.checkTrayHighlight.Text = "Enable Highlight";
-            this.checkTrayHighlight.UseVisualStyleBackColor = true;
-            // 
             // labelBrowserSettings
             // 
             this.labelBrowserSettings.AutoSize = true;
             this.labelBrowserSettings.Font = new System.Drawing.Font("Segoe UI Semibold", 10.5F, System.Drawing.FontStyle.Bold);
-            this.labelBrowserSettings.Location = new System.Drawing.Point(0, 0);
+            this.labelBrowserSettings.Location = new System.Drawing.Point(0, 192);
-            this.labelBrowserSettings.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1);
+            this.labelBrowserSettings.Margin = new System.Windows.Forms.Padding(0, 25, 0, 1);
             this.labelBrowserSettings.Name = "labelBrowserSettings";
             this.labelBrowserSettings.Size = new System.Drawing.Size(143, 19);
-            this.labelBrowserSettings.TabIndex = 0;
+            this.labelBrowserSettings.TabIndex = 7;
             this.labelBrowserSettings.Text = "BROWSER SETTINGS";
             // 
             // checkSmoothScrolling
             // 
             this.checkSmoothScrolling.AutoSize = true;
             this.checkSmoothScrolling.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.checkSmoothScrolling.Location = new System.Drawing.Point(6, 26);
+            this.checkSmoothScrolling.Location = new System.Drawing.Point(6, 218);
             this.checkSmoothScrolling.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
             this.checkSmoothScrolling.Name = "checkSmoothScrolling";
             this.checkSmoothScrolling.Size = new System.Drawing.Size(117, 19);
-            this.checkSmoothScrolling.TabIndex = 1;
+            this.checkSmoothScrolling.TabIndex = 8;
             this.checkSmoothScrolling.Text = "Smooth Scrolling";
             this.checkSmoothScrolling.UseVisualStyleBackColor = true;
             // 
@@ -338,45 +300,57 @@
             // 
             this.checkTouchAdjustment.AutoSize = true;
             this.checkTouchAdjustment.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.checkTouchAdjustment.Location = new System.Drawing.Point(6, 50);
+            this.checkTouchAdjustment.Location = new System.Drawing.Point(6, 242);
             this.checkTouchAdjustment.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkTouchAdjustment.Name = "checkTouchAdjustment";
             this.checkTouchAdjustment.Size = new System.Drawing.Size(163, 19);
-            this.checkTouchAdjustment.TabIndex = 2;
+            this.checkTouchAdjustment.TabIndex = 9;
             this.checkTouchAdjustment.Text = "Touch Screen Adjustment";
             this.checkTouchAdjustment.UseVisualStyleBackColor = true;
             // 
+            // checkHardwareAcceleration
+            // 
+            this.checkHardwareAcceleration.AutoSize = true;
+            this.checkHardwareAcceleration.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.checkHardwareAcceleration.Location = new System.Drawing.Point(6, 266);
+            this.checkHardwareAcceleration.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
+            this.checkHardwareAcceleration.Name = "checkHardwareAcceleration";
+            this.checkHardwareAcceleration.Size = new System.Drawing.Size(146, 19);
+            this.checkHardwareAcceleration.TabIndex = 10;
+            this.checkHardwareAcceleration.Text = "Hardware Acceleration";
+            this.checkHardwareAcceleration.UseVisualStyleBackColor = true;
+            // 
             // labelBrowserPath
             // 
             this.labelBrowserPath.AutoSize = true;
             this.labelBrowserPath.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold);
-            this.labelBrowserPath.Location = new System.Drawing.Point(3, 107);
+            this.labelBrowserPath.Location = new System.Drawing.Point(3, 275);
             this.labelBrowserPath.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelBrowserPath.Name = "labelBrowserPath";
             this.labelBrowserPath.Size = new System.Drawing.Size(104, 15);
-            this.labelBrowserPath.TabIndex = 4;
+            this.labelBrowserPath.TabIndex = 9;
             this.labelBrowserPath.Text = "Open Links With...";
             // 
-            // comboBoxBrowserPath
+            // comboBoxCustomBrowser
             // 
-            this.comboBoxBrowserPath.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxCustomBrowser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxBrowserPath.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.comboBoxCustomBrowser.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.comboBoxBrowserPath.FormattingEnabled = true;
+            this.comboBoxCustomBrowser.FormattingEnabled = true;
-            this.comboBoxBrowserPath.Location = new System.Drawing.Point(5, 126);
+            this.comboBoxCustomBrowser.Location = new System.Drawing.Point(5, 1);
-            this.comboBoxBrowserPath.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
+            this.comboBoxCustomBrowser.Margin = new System.Windows.Forms.Padding(5, 1, 3, 0);
-            this.comboBoxBrowserPath.Name = "comboBoxBrowserPath";
+            this.comboBoxCustomBrowser.Name = "comboBoxCustomBrowser";
-            this.comboBoxBrowserPath.Size = new System.Drawing.Size(173, 23);
+            this.comboBoxCustomBrowser.Size = new System.Drawing.Size(173, 23);
-            this.comboBoxBrowserPath.TabIndex = 5;
+            this.comboBoxCustomBrowser.TabIndex = 0;
             // 
             // labelSearchEngine
             // 
             this.labelSearchEngine.AutoSize = true;
             this.labelSearchEngine.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold);
-            this.labelSearchEngine.Location = new System.Drawing.Point(3, 164);
+            this.labelSearchEngine.Location = new System.Drawing.Point(3, 389);
             this.labelSearchEngine.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelSearchEngine.Name = "labelSearchEngine";
             this.labelSearchEngine.Size = new System.Drawing.Size(82, 15);
-            this.labelSearchEngine.TabIndex = 6;
+            this.labelSearchEngine.TabIndex = 13;
             this.labelSearchEngine.Text = "Search Engine";
             // 
             // comboBoxSearchEngine
@@ -384,30 +358,31 @@
             this.comboBoxSearchEngine.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBoxSearchEngine.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.comboBoxSearchEngine.FormattingEnabled = true;
-            this.comboBoxSearchEngine.Location = new System.Drawing.Point(5, 183);
+            this.comboBoxSearchEngine.Location = new System.Drawing.Point(5, 408);
             this.comboBoxSearchEngine.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
             this.comboBoxSearchEngine.Name = "comboBoxSearchEngine";
             this.comboBoxSearchEngine.Size = new System.Drawing.Size(173, 23);
-            this.comboBoxSearchEngine.TabIndex = 7;
+            this.comboBoxSearchEngine.TabIndex = 14;
             // 
             // flowPanelRight
             // 
             this.flowPanelRight.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left)));
-            this.flowPanelRight.Controls.Add(this.labelBrowserSettings);
-            this.flowPanelRight.Controls.Add(this.checkSmoothScrolling);
-            this.flowPanelRight.Controls.Add(this.checkTouchAdjustment);
-            this.flowPanelRight.Controls.Add(this.checkHardwareAcceleration);
-            this.flowPanelRight.Controls.Add(this.labelBrowserPath);
-            this.flowPanelRight.Controls.Add(this.comboBoxBrowserPath);
-            this.flowPanelRight.Controls.Add(this.labelSearchEngine);
-            this.flowPanelRight.Controls.Add(this.comboBoxSearchEngine);
             this.flowPanelRight.Controls.Add(this.labelLocales);
             this.flowPanelRight.Controls.Add(this.checkSpellCheck);
             this.flowPanelRight.Controls.Add(this.labelSpellCheckLanguage);
             this.flowPanelRight.Controls.Add(this.comboBoxSpellCheckLanguage);
             this.flowPanelRight.Controls.Add(this.labelTranslationTarget);
             this.flowPanelRight.Controls.Add(this.comboBoxTranslationTarget);
+            this.flowPanelRight.Controls.Add(this.labelFirstDayOfWeek);
+            this.flowPanelRight.Controls.Add(this.comboBoxFirstDayOfWeek);
+            this.flowPanelRight.Controls.Add(this.labelExternalApplications);
+            this.flowPanelRight.Controls.Add(this.labelBrowserPath);
+            this.flowPanelRight.Controls.Add(this.panelCustomBrowser);
+            this.flowPanelRight.Controls.Add(this.labelVideoPlayerPath);
+            this.flowPanelRight.Controls.Add(this.panelCustomVideoPlayer);
+            this.flowPanelRight.Controls.Add(this.labelSearchEngine);
+            this.flowPanelRight.Controls.Add(this.comboBoxSearchEngine);
             this.flowPanelRight.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
             this.flowPanelRight.Location = new System.Drawing.Point(322, 9);
             this.flowPanelRight.Name = "flowPanelRight";
@@ -415,38 +390,26 @@
             this.flowPanelRight.TabIndex = 1;
             this.flowPanelRight.WrapContents = false;
             // 
-            // checkHardwareAcceleration
-            // 
-            this.checkHardwareAcceleration.AutoSize = true;
-            this.checkHardwareAcceleration.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.checkHardwareAcceleration.Location = new System.Drawing.Point(6, 74);
-            this.checkHardwareAcceleration.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
-            this.checkHardwareAcceleration.Name = "checkHardwareAcceleration";
-            this.checkHardwareAcceleration.Size = new System.Drawing.Size(146, 19);
-            this.checkHardwareAcceleration.TabIndex = 3;
-            this.checkHardwareAcceleration.Text = "Hardware Acceleration";
-            this.checkHardwareAcceleration.UseVisualStyleBackColor = true;
-            // 
             // labelLocales
             // 
             this.labelLocales.AutoSize = true;
             this.labelLocales.Font = new System.Drawing.Font("Segoe UI Semibold", 10.5F, System.Drawing.FontStyle.Bold);
-            this.labelLocales.Location = new System.Drawing.Point(0, 236);
+            this.labelLocales.Location = new System.Drawing.Point(0, 0);
-            this.labelLocales.Margin = new System.Windows.Forms.Padding(0, 27, 0, 1);
+            this.labelLocales.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1);
             this.labelLocales.Name = "labelLocales";
             this.labelLocales.Size = new System.Drawing.Size(67, 19);
-            this.labelLocales.TabIndex = 8;
+            this.labelLocales.TabIndex = 0;
             this.labelLocales.Text = "LOCALES";
             // 
             // checkSpellCheck
             // 
             this.checkSpellCheck.AutoSize = true;
             this.checkSpellCheck.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.checkSpellCheck.Location = new System.Drawing.Point(6, 262);
+            this.checkSpellCheck.Location = new System.Drawing.Point(6, 26);
             this.checkSpellCheck.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
             this.checkSpellCheck.Name = "checkSpellCheck";
             this.checkSpellCheck.Size = new System.Drawing.Size(125, 19);
-            this.checkSpellCheck.TabIndex = 9;
+            this.checkSpellCheck.TabIndex = 1;
             this.checkSpellCheck.Text = "Enable Spell Check";
             this.checkSpellCheck.UseVisualStyleBackColor = true;
             // 
@@ -454,11 +417,11 @@
             // 
             this.labelSpellCheckLanguage.AutoSize = true;
             this.labelSpellCheckLanguage.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold);
-            this.labelSpellCheckLanguage.Location = new System.Drawing.Point(3, 295);
+            this.labelSpellCheckLanguage.Location = new System.Drawing.Point(3, 59);
             this.labelSpellCheckLanguage.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelSpellCheckLanguage.Name = "labelSpellCheckLanguage";
             this.labelSpellCheckLanguage.Size = new System.Drawing.Size(123, 15);
-            this.labelSpellCheckLanguage.TabIndex = 10;
+            this.labelSpellCheckLanguage.TabIndex = 2;
             this.labelSpellCheckLanguage.Text = "Spell Check Language";
             // 
             // comboBoxSpellCheckLanguage
@@ -466,21 +429,21 @@
             this.comboBoxSpellCheckLanguage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBoxSpellCheckLanguage.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.comboBoxSpellCheckLanguage.FormattingEnabled = true;
-            this.comboBoxSpellCheckLanguage.Location = new System.Drawing.Point(5, 314);
+            this.comboBoxSpellCheckLanguage.Location = new System.Drawing.Point(5, 78);
             this.comboBoxSpellCheckLanguage.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
             this.comboBoxSpellCheckLanguage.Name = "comboBoxSpellCheckLanguage";
             this.comboBoxSpellCheckLanguage.Size = new System.Drawing.Size(290, 23);
-            this.comboBoxSpellCheckLanguage.TabIndex = 11;
+            this.comboBoxSpellCheckLanguage.TabIndex = 3;
             // 
             // labelTranslationTarget
             // 
             this.labelTranslationTarget.AutoSize = true;
             this.labelTranslationTarget.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold);
-            this.labelTranslationTarget.Location = new System.Drawing.Point(3, 352);
+            this.labelTranslationTarget.Location = new System.Drawing.Point(3, 116);
             this.labelTranslationTarget.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelTranslationTarget.Name = "labelTranslationTarget";
             this.labelTranslationTarget.Size = new System.Drawing.Size(142, 15);
-            this.labelTranslationTarget.TabIndex = 12;
+            this.labelTranslationTarget.TabIndex = 4;
             this.labelTranslationTarget.Text = "Bing Translator Language";
             // 
             // comboBoxTranslationTarget
@@ -488,11 +451,114 @@
             this.comboBoxTranslationTarget.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBoxTranslationTarget.Font = new System.Drawing.Font("Segoe UI", 9F);
             this.comboBoxTranslationTarget.FormattingEnabled = true;
-            this.comboBoxTranslationTarget.Location = new System.Drawing.Point(5, 371);
+            this.comboBoxTranslationTarget.Location = new System.Drawing.Point(5, 135);
             this.comboBoxTranslationTarget.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
             this.comboBoxTranslationTarget.Name = "comboBoxTranslationTarget";
             this.comboBoxTranslationTarget.Size = new System.Drawing.Size(290, 23);
-            this.comboBoxTranslationTarget.TabIndex = 13;
+            this.comboBoxTranslationTarget.TabIndex = 5;
+            // 
+            // labelFirstDayOfWeek
+            // 
+            this.labelFirstDayOfWeek.AutoSize = true;
+            this.labelFirstDayOfWeek.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold);
+            this.labelFirstDayOfWeek.Location = new System.Drawing.Point(3, 173);
+            this.labelFirstDayOfWeek.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
+            this.labelFirstDayOfWeek.Name = "labelFirstDayOfWeek";
+            this.labelFirstDayOfWeek.Size = new System.Drawing.Size(125, 15);
+            this.labelFirstDayOfWeek.TabIndex = 6;
+            this.labelFirstDayOfWeek.Text = "First Day Of The Week";
+            // 
+            // comboBoxFirstDayOfWeek
+            // 
+            this.comboBoxFirstDayOfWeek.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxFirstDayOfWeek.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.comboBoxFirstDayOfWeek.FormattingEnabled = true;
+            this.comboBoxFirstDayOfWeek.Location = new System.Drawing.Point(5, 192);
+            this.comboBoxFirstDayOfWeek.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
+            this.comboBoxFirstDayOfWeek.Name = "comboBoxFirstDayOfWeek";
+            this.comboBoxFirstDayOfWeek.Size = new System.Drawing.Size(173, 23);
+            this.comboBoxFirstDayOfWeek.TabIndex = 7;
+            // 
+            // labelExternalApplications
+            // 
+            this.labelExternalApplications.AutoSize = true;
+            this.labelExternalApplications.Font = new System.Drawing.Font("Segoe UI Semibold", 10.5F, System.Drawing.FontStyle.Bold);
+            this.labelExternalApplications.Location = new System.Drawing.Point(0, 243);
+            this.labelExternalApplications.Margin = new System.Windows.Forms.Padding(0, 25, 0, 1);
+            this.labelExternalApplications.Name = "labelExternalApplications";
+            this.labelExternalApplications.Size = new System.Drawing.Size(176, 19);
+            this.labelExternalApplications.TabIndex = 8;
+            this.labelExternalApplications.Text = "EXTERNAL APPLICATIONS";
+            // 
+            // panelCustomBrowser
+            // 
+            this.panelCustomBrowser.Controls.Add(this.comboBoxCustomBrowser);
+            this.panelCustomBrowser.Controls.Add(this.btnCustomBrowserChange);
+            this.panelCustomBrowser.Location = new System.Drawing.Point(0, 293);
+            this.panelCustomBrowser.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
+            this.panelCustomBrowser.Name = "panelCustomBrowser";
+            this.panelCustomBrowser.Size = new System.Drawing.Size(300, 24);
+            this.panelCustomBrowser.TabIndex = 10;
+            // 
+            // btnCustomBrowserChange
+            // 
+            this.btnCustomBrowserChange.AutoSize = true;
+            this.btnCustomBrowserChange.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.btnCustomBrowserChange.Location = new System.Drawing.Point(186, 0);
+            this.btnCustomBrowserChange.Margin = new System.Windows.Forms.Padding(5, 0, 3, 0);
+            this.btnCustomBrowserChange.Name = "btnCustomBrowserChange";
+            this.btnCustomBrowserChange.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.btnCustomBrowserChange.Size = new System.Drawing.Size(71, 25);
+            this.btnCustomBrowserChange.TabIndex = 1;
+            this.btnCustomBrowserChange.Text = "Change...";
+            this.btnCustomBrowserChange.UseVisualStyleBackColor = true;
+            this.btnCustomBrowserChange.Visible = false;
+            // 
+            // labelVideoPlayerPath
+            // 
+            this.labelVideoPlayerPath.AutoSize = true;
+            this.labelVideoPlayerPath.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold);
+            this.labelVideoPlayerPath.Location = new System.Drawing.Point(3, 332);
+            this.labelVideoPlayerPath.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
+            this.labelVideoPlayerPath.Name = "labelVideoPlayerPath";
+            this.labelVideoPlayerPath.Size = new System.Drawing.Size(106, 15);
+            this.labelVideoPlayerPath.TabIndex = 11;
+            this.labelVideoPlayerPath.Text = "Play Videos With...";
+            // 
+            // panelCustomVideoPlayer
+            // 
+            this.panelCustomVideoPlayer.Controls.Add(this.comboBoxCustomVideoPlayer);
+            this.panelCustomVideoPlayer.Controls.Add(this.btnCustomVideoPlayerChange);
+            this.panelCustomVideoPlayer.Location = new System.Drawing.Point(0, 350);
+            this.panelCustomVideoPlayer.Margin = new System.Windows.Forms.Padding(0, 3, 0, 3);
+            this.panelCustomVideoPlayer.Name = "panelCustomVideoPlayer";
+            this.panelCustomVideoPlayer.Size = new System.Drawing.Size(300, 24);
+            this.panelCustomVideoPlayer.TabIndex = 12;
+            // 
+            // comboBoxCustomVideoPlayer
+            // 
+            this.comboBoxCustomVideoPlayer.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxCustomVideoPlayer.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.comboBoxCustomVideoPlayer.FormattingEnabled = true;
+            this.comboBoxCustomVideoPlayer.Location = new System.Drawing.Point(5, 1);
+            this.comboBoxCustomVideoPlayer.Margin = new System.Windows.Forms.Padding(5, 1, 3, 0);
+            this.comboBoxCustomVideoPlayer.Name = "comboBoxCustomVideoPlayer";
+            this.comboBoxCustomVideoPlayer.Size = new System.Drawing.Size(173, 23);
+            this.comboBoxCustomVideoPlayer.TabIndex = 0;
+            // 
+            // btnCustomVideoPlayerChange
+            // 
+            this.btnCustomVideoPlayerChange.AutoSize = true;
+            this.btnCustomVideoPlayerChange.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.btnCustomVideoPlayerChange.Location = new System.Drawing.Point(186, 0);
+            this.btnCustomVideoPlayerChange.Margin = new System.Windows.Forms.Padding(5, 0, 3, 0);
+            this.btnCustomVideoPlayerChange.Name = "btnCustomVideoPlayerChange";
+            this.btnCustomVideoPlayerChange.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.btnCustomVideoPlayerChange.Size = new System.Drawing.Size(71, 25);
+            this.btnCustomVideoPlayerChange.TabIndex = 1;
+            this.btnCustomVideoPlayerChange.Text = "Change...";
+            this.btnCustomVideoPlayerChange.UseVisualStyleBackColor = true;
+            this.btnCustomVideoPlayerChange.Visible = false;
             // 
             // panelSeparator
             // 
@@ -520,6 +586,10 @@
             this.flowPanelLeft.PerformLayout();
             this.flowPanelRight.ResumeLayout(false);
             this.flowPanelRight.PerformLayout();
+            this.panelCustomBrowser.ResumeLayout(false);
+            this.panelCustomBrowser.PerformLayout();
+            this.panelCustomVideoPlayer.ResumeLayout(false);
+            this.panelCustomVideoPlayer.PerformLayout();
             this.ResumeLayout(false);
 
         }
@@ -543,7 +613,7 @@
         private System.Windows.Forms.FlowLayoutPanel flowPanelLeft;
         private System.Windows.Forms.CheckBox checkKeepLikeFollowDialogsOpen;
         private System.Windows.Forms.Label labelBrowserPath;
-        private System.Windows.Forms.ComboBox comboBoxBrowserPath;
+        private System.Windows.Forms.ComboBox comboBoxCustomBrowser;
         private System.Windows.Forms.Label labelBrowserSettings;
         private System.Windows.Forms.CheckBox checkSmoothScrolling;
         private System.Windows.Forms.Label labelSearchEngine;
@@ -551,10 +621,6 @@
         private System.Windows.Forms.CheckBox checkTouchAdjustment;
         private System.Windows.Forms.FlowLayoutPanel flowPanelRight;
         private System.Windows.Forms.Panel panelSeparator;
-        private System.Windows.Forms.Label labelTray;
-        private System.Windows.Forms.ComboBox comboBoxTrayType;
-        private System.Windows.Forms.Label labelTrayIcon;
-        private System.Windows.Forms.CheckBox checkTrayHighlight;
         private System.Windows.Forms.Label labelLocales;
         private System.Windows.Forms.CheckBox checkSpellCheck;
         private System.Windows.Forms.Label labelSpellCheckLanguage;
@@ -563,5 +629,14 @@
         private System.Windows.Forms.ComboBox comboBoxTranslationTarget;
         private System.Windows.Forms.CheckBox checkHardwareAcceleration;
         private System.Windows.Forms.CheckBox checkFocusDmInput;
+        private System.Windows.Forms.Panel panelCustomBrowser;
+        private System.Windows.Forms.Button btnCustomBrowserChange;
+        private System.Windows.Forms.Label labelVideoPlayerPath;
+        private System.Windows.Forms.Panel panelCustomVideoPlayer;
+        private System.Windows.Forms.ComboBox comboBoxCustomVideoPlayer;
+        private System.Windows.Forms.Button btnCustomVideoPlayerChange;
+        private System.Windows.Forms.Label labelExternalApplications;
+        private System.Windows.Forms.Label labelFirstDayOfWeek;
+        private System.Windows.Forms.ComboBox comboBoxFirstDayOfWeek;
     }
 }

Dialogs/Settings/TabSettingsGeneral.cs

@@ -2,15 +2,14 @@
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
-using TweetDuck.Core.Controls;
+using TweetDuck.Browser.Handling.General;
-using TweetDuck.Core.Handling.General;
+using TweetDuck.Controls;
-using TweetDuck.Core.Other.Settings.Dialogs;
+using TweetDuck.Utils;
-using TweetDuck.Core.Utils;
+using TweetLib.Core.Systems.Updates;
-using TweetLib.Core.Features.Updates;
 using TweetLib.Core.Utils;
 
-namespace TweetDuck.Core.Other.Settings{
+namespace TweetDuck.Dialogs.Settings{
-    sealed partial class TabSettingsGeneral : BaseTabSettings{
+    sealed partial class TabSettingsGeneral : FormSettings.BaseTab{
         private readonly Action reloadColumns;
 
         private readonly UpdateHandler updates;
@@ -19,6 +18,9 @@ namespace TweetDuck.Core.Other.Settings{
         private readonly int browserListIndexDefault;
         private readonly int browserListIndexCustom;
 
+        private readonly int videoPlayerListIndexDefault;
+        private readonly int videoPlayerListIndexCustom;
+
         private readonly int searchEngineIndexDefault;
         private readonly int searchEngineIndexCustom;
 
@@ -53,21 +55,6 @@ namespace TweetDuck.Core.Other.Settings{
             trackBarZoom.SetValueSafe(Config.ZoomLevel);
             labelZoomValue.Text = trackBarZoom.Value + "%";
 
-            // system tray
-            
-            toolTip.SetToolTip(comboBoxTrayType, "Changes behavior of the Tray icon.\r\nRight-click the icon for an action menu.");
-            toolTip.SetToolTip(checkTrayHighlight, "Highlights the tray icon if there are new tweets.\r\nOnly works for columns with popup or audio notifications.\r\nThe icon resets when the main window is restored.");
-
-            comboBoxTrayType.Items.Add("Disabled");
-            comboBoxTrayType.Items.Add("Display Icon Only");
-            comboBoxTrayType.Items.Add("Minimize to Tray");
-            comboBoxTrayType.Items.Add("Close to Tray");
-            comboBoxTrayType.Items.Add("Combined");
-            comboBoxTrayType.SelectedIndex = Math.Min(Math.Max((int)Config.TrayBehavior, 0), comboBoxTrayType.Items.Count - 1);
-
-            checkTrayHighlight.Enabled = Config.TrayBehavior.ShouldDisplayIcon();
-            checkTrayHighlight.Checked = Config.EnableTrayHighlight;
-
             // updates
             
             toolTip.SetToolTip(checkUpdateNotifications, "Checks for updates every hour.\r\nIf an update is dismissed, it will not appear again.");
@@ -80,7 +67,8 @@ namespace TweetDuck.Core.Other.Settings{
             toolTip.SetToolTip(checkSmoothScrolling, "Toggles smooth mouse wheel scrolling.");
             toolTip.SetToolTip(checkTouchAdjustment, "Toggles Chromium touch screen adjustment.\r\nDisabled by default, because it is very imprecise with TweetDeck.");
             toolTip.SetToolTip(checkHardwareAcceleration, "Uses graphics card to improve performance.\r\nDisable if you experience visual glitches, or to save a small amount of RAM.");
-            toolTip.SetToolTip(comboBoxBrowserPath, "Sets the default browser for opening links.");
+            toolTip.SetToolTip(comboBoxCustomBrowser, "Sets the default browser for opening links.");
+            toolTip.SetToolTip(comboBoxCustomVideoPlayer, "Sets the default application for playing videos.");
             toolTip.SetToolTip(comboBoxSearchEngine, "Sets the default website for opening searches.");
             
             checkSmoothScrolling.Checked = Config.EnableSmoothScrolling;
@@ -88,13 +76,17 @@ namespace TweetDuck.Core.Other.Settings{
             checkHardwareAcceleration.Checked = SysConfig.HardwareAcceleration;
 
             foreach(WindowsUtils.Browser browserInfo in WindowsUtils.FindInstalledBrowsers()){
-                comboBoxBrowserPath.Items.Add(browserInfo);
+                comboBoxCustomBrowser.Items.Add(browserInfo);
             }
             
-            browserListIndexDefault = comboBoxBrowserPath.Items.Add("(default browser)");
+            browserListIndexDefault = comboBoxCustomBrowser.Items.Add("(default browser)");
-            browserListIndexCustom = comboBoxBrowserPath.Items.Add("(custom program...)");
+            browserListIndexCustom = comboBoxCustomBrowser.Items.Add("(custom program...)");
             UpdateBrowserPathSelection();
 
+            videoPlayerListIndexDefault = comboBoxCustomVideoPlayer.Items.Add("(default TweetDuck player)");
+            videoPlayerListIndexCustom = comboBoxCustomVideoPlayer.Items.Add("(custom program...)");
+            UpdateVideoPlayerPathSelection();
+
             comboBoxSearchEngine.Items.Add(new SearchEngine("DuckDuckGo", "https://duckduckgo.com/?q="));
             comboBoxSearchEngine.Items.Add(new SearchEngine("Google", "https://www.google.com/search?q="));
             comboBoxSearchEngine.Items.Add(new SearchEngine("Bing", "https://www.bing.com/search?q="));
@@ -108,6 +100,7 @@ namespace TweetDuck.Core.Other.Settings{
             toolTip.SetToolTip(checkSpellCheck, "Underlines words that are spelled incorrectly.");
             toolTip.SetToolTip(comboBoxSpellCheckLanguage, "Language used for spell check.");
             toolTip.SetToolTip(comboBoxTranslationTarget, "Language tweets are translated into.");
+            toolTip.SetToolTip(comboBoxFirstDayOfWeek, "First day of week used in the date picker.");
             
             checkSpellCheck.Checked = Config.EnableSpellCheck;
 
@@ -126,6 +119,17 @@ namespace TweetDuck.Core.Other.Settings{
             }
 
             comboBoxTranslationTarget.SelectedItem = new LocaleUtils.Item(Config.TranslationTarget);
+
+            var daysOfWeek = comboBoxFirstDayOfWeek.Items;
+            daysOfWeek.Add("(based on system locale)");
+            daysOfWeek.Add(new DayOfWeekItem("Monday", DayOfWeek.Monday));
+            daysOfWeek.Add(new DayOfWeekItem("Tuesday", DayOfWeek.Tuesday));
+            daysOfWeek.Add(new DayOfWeekItem("Wednesday", DayOfWeek.Wednesday));
+            daysOfWeek.Add(new DayOfWeekItem("Thursday", DayOfWeek.Thursday));
+            daysOfWeek.Add(new DayOfWeekItem("Friday", DayOfWeek.Friday));
+            daysOfWeek.Add(new DayOfWeekItem("Saturday", DayOfWeek.Saturday));
+            daysOfWeek.Add(new DayOfWeekItem("Sunday", DayOfWeek.Sunday));
+            comboBoxFirstDayOfWeek.SelectedItem = daysOfWeek.OfType<DayOfWeekItem>().FirstOrDefault(dow => dow.Id == Config.CalendarFirstDay) ?? daysOfWeek[0];
         }
 
         public override void OnReady(){
@@ -137,21 +141,22 @@ namespace TweetDuck.Core.Other.Settings{
             checkAnimatedAvatars.CheckedChanged += checkAnimatedAvatars_CheckedChanged;
             trackBarZoom.ValueChanged += trackBarZoom_ValueChanged;
 
-            comboBoxTrayType.SelectedIndexChanged += comboBoxTrayType_SelectedIndexChanged;
-            checkTrayHighlight.CheckedChanged += checkTrayHighlight_CheckedChanged;
-            
             checkUpdateNotifications.CheckedChanged += checkUpdateNotifications_CheckedChanged;
             btnCheckUpdates.Click += btnCheckUpdates_Click;
 
             checkSmoothScrolling.CheckedChanged += checkSmoothScrolling_CheckedChanged;
             checkTouchAdjustment.CheckedChanged += checkTouchAdjustment_CheckedChanged;
             checkHardwareAcceleration.CheckedChanged += checkHardwareAcceleration_CheckedChanged;
-            comboBoxBrowserPath.SelectedIndexChanged += comboBoxBrowserPath_SelectedIndexChanged;
+            comboBoxCustomBrowser.SelectedIndexChanged += comboBoxCustomBrowser_SelectedIndexChanged;
+            btnCustomBrowserChange.Click += btnCustomBrowserChange_Click;
+            comboBoxCustomVideoPlayer.SelectedIndexChanged += comboBoxCustomVideoPlayer_SelectedIndexChanged;
+            btnCustomVideoPlayerChange.Click += btnCustomVideoPlayerChange_Click;
             comboBoxSearchEngine.SelectedIndexChanged += comboBoxSearchEngine_SelectedIndexChanged;
 
             checkSpellCheck.CheckedChanged += checkSpellCheck_CheckedChanged;
             comboBoxSpellCheckLanguage.SelectedValueChanged += comboBoxSpellCheckLanguage_SelectedValueChanged;
             comboBoxTranslationTarget.SelectedValueChanged += comboBoxTranslationTarget_SelectedValueChanged;
+            comboBoxFirstDayOfWeek.SelectedValueChanged += comboBoxFirstDayOfWeek_SelectedValueChanged;
         }
 
         public override void OnClosing(){
@@ -198,18 +203,6 @@ namespace TweetDuck.Core.Other.Settings{
             zoomUpdateTimer.Stop();
         }
 
-        #endregion
-        #region System Tray
-        
-        private void comboBoxTrayType_SelectedIndexChanged(object sender, EventArgs e){
-            Config.TrayBehavior = (TrayIcon.Behavior)comboBoxTrayType.SelectedIndex;
-            checkTrayHighlight.Enabled = Config.TrayBehavior.ShouldDisplayIcon();
-        }
-
-        private void checkTrayHighlight_CheckedChanged(object sender, EventArgs e){
-            Config.EnableTrayHighlight = checkTrayHighlight.Checked;
-        }
-
         #endregion
         #region Updates
         
@@ -253,43 +246,95 @@ namespace TweetDuck.Core.Other.Settings{
             SysConfig.HardwareAcceleration = checkHardwareAcceleration.Checked;
         }
 
+        private void UpdateBrowserChangeButton(){
+            btnCustomBrowserChange.Visible = comboBoxCustomBrowser.SelectedIndex == browserListIndexCustom;
+        }
+
         private void UpdateBrowserPathSelection(){
             if (string.IsNullOrEmpty(Config.BrowserPath) || !File.Exists(Config.BrowserPath)){
-                comboBoxBrowserPath.SelectedIndex = browserListIndexDefault;
+                comboBoxCustomBrowser.SelectedIndex = browserListIndexDefault;
             }
             else{
-                WindowsUtils.Browser browserInfo = comboBoxBrowserPath.Items.OfType<WindowsUtils.Browser>().FirstOrDefault(browser => browser.Path == Config.BrowserPath);
+                WindowsUtils.Browser browserInfo = comboBoxCustomBrowser.Items.OfType<WindowsUtils.Browser>().FirstOrDefault(browser => browser.Path == Config.BrowserPath);
 
-                if (browserInfo == null){
+                if (browserInfo == null || Config.BrowserPathArgs != null){
-                    comboBoxBrowserPath.SelectedIndex = browserListIndexCustom;
+                    comboBoxCustomBrowser.SelectedIndex = browserListIndexCustom;
                 }
                 else{
-                    comboBoxBrowserPath.SelectedItem = browserInfo;
+                    comboBoxCustomBrowser.SelectedItem = browserInfo;
                 }
             }
+
+            UpdateBrowserChangeButton();
+        }
+
+        private void comboBoxCustomBrowser_SelectedIndexChanged(object sender, EventArgs e){
+            if (comboBoxCustomBrowser.SelectedIndex == browserListIndexCustom){
+                btnCustomBrowserChange_Click(sender, e);
+            }
+            else{
+                Config.BrowserPath = (comboBoxCustomBrowser.SelectedItem as WindowsUtils.Browser)?.Path; // default browser item is a string and casts to null
+                Config.BrowserPathArgs = null;
+                UpdateBrowserChangeButton();
+            }
         }
 
-        private void comboBoxBrowserPath_SelectedIndexChanged(object sender, EventArgs e){
+        private void btnCustomBrowserChange_Click(object sender, EventArgs e){
-            if (comboBoxBrowserPath.SelectedIndex == browserListIndexCustom){
+            using(DialogSettingsExternalProgram dialog = new DialogSettingsExternalProgram("External Browser", "Open Links With..."){
-                using(OpenFileDialog dialog = new OpenFileDialog{
+                Path = Config.BrowserPath,
-                    AutoUpgradeEnabled = true,
+                Args = Config.BrowserPathArgs
-                    DereferenceLinks = true,
+            }){
-                    InitialDirectory = Path.GetDirectoryName(Config.BrowserPath), // returns null if argument is null
+                if (dialog.ShowDialog() == DialogResult.OK){
-                    Title = "Open Links With...",
+                    Config.BrowserPath = dialog.Path;
-                    Filter = "Executables (*.exe;*.bat;*.cmd)|*.exe;*.bat;*.cmd|All Files (*.*)|*.*"
+                    Config.BrowserPathArgs = dialog.Args;
-                }){
-                    if (dialog.ShowDialog() == DialogResult.OK){
-                        Config.BrowserPath = dialog.FileName;
-                    }
                 }
+            }
 
-                comboBoxBrowserPath.SelectedIndexChanged -= comboBoxBrowserPath_SelectedIndexChanged;
+            comboBoxCustomBrowser.SelectedIndexChanged -= comboBoxCustomBrowser_SelectedIndexChanged;
-                UpdateBrowserPathSelection();
+            UpdateBrowserPathSelection();
-                comboBoxBrowserPath.SelectedIndexChanged += comboBoxBrowserPath_SelectedIndexChanged;
+            comboBoxCustomBrowser.SelectedIndexChanged += comboBoxCustomBrowser_SelectedIndexChanged;
+        }
+
+        private void UpdateVideoPlayerChangeButton(){
+            btnCustomVideoPlayerChange.Visible = comboBoxCustomVideoPlayer.SelectedIndex == videoPlayerListIndexCustom;
+        }
+
+        private void UpdateVideoPlayerPathSelection(){
+            if (string.IsNullOrEmpty(Config.VideoPlayerPath) || !File.Exists(Config.VideoPlayerPath)){
+                comboBoxCustomVideoPlayer.SelectedIndex = videoPlayerListIndexDefault;
             }
             else{
-                Config.BrowserPath = (comboBoxBrowserPath.SelectedItem as WindowsUtils.Browser)?.Path; // default browser item is a string and casts to null
+                comboBoxCustomVideoPlayer.SelectedIndex = videoPlayerListIndexCustom;
             }
+
+            UpdateVideoPlayerChangeButton();
+        }
+
+        private void comboBoxCustomVideoPlayer_SelectedIndexChanged(object sender, EventArgs e){
+            if (comboBoxCustomVideoPlayer.SelectedIndex == videoPlayerListIndexCustom){
+                btnCustomVideoPlayerChange_Click(sender, e);
+            }
+            else{
+                Config.VideoPlayerPath = null;
+                Config.VideoPlayerPathArgs = null;
+                UpdateVideoPlayerChangeButton();
+            }
+        }
+
+        private void btnCustomVideoPlayerChange_Click(object sender, EventArgs e){
+            using(DialogSettingsExternalProgram dialog = new DialogSettingsExternalProgram("External Video Player", "Play Videos With..."){
+                Path = Config.VideoPlayerPath,
+                Args = Config.VideoPlayerPathArgs
+            }){
+                if (dialog.ShowDialog() == DialogResult.OK){
+                    Config.VideoPlayerPath = dialog.Path;
+                    Config.VideoPlayerPathArgs = dialog.Args;
+                }
+            }
+
+            comboBoxCustomVideoPlayer.SelectedIndexChanged -= comboBoxCustomVideoPlayer_SelectedIndexChanged;
+            UpdateVideoPlayerPathSelection();
+            comboBoxCustomVideoPlayer.SelectedIndexChanged += comboBoxCustomVideoPlayer_SelectedIndexChanged;
         }
 
         private void comboBoxSearchEngine_SelectedIndexChanged(object sender, EventArgs e){
@@ -355,6 +400,24 @@ namespace TweetDuck.Core.Other.Settings{
             Config.TranslationTarget = (comboBoxTranslationTarget.SelectedItem as LocaleUtils.Item)?.Code ?? "en";
         }
 
+        private void comboBoxFirstDayOfWeek_SelectedValueChanged(object sender, EventArgs e){
+            Config.CalendarFirstDay = (comboBoxFirstDayOfWeek.SelectedItem as DayOfWeekItem)?.Id ?? -1;
+        }
+
+        private sealed class DayOfWeekItem{
+            private string Name { get; }
+            public int Id { get; }
+
+            public DayOfWeekItem(string name, DayOfWeek dow){
+                Name = name;
+                Id = LocaleUtils.GetJQueryDayOfWeek(dow);
+            }
+            
+            public override int GetHashCode() => Name.GetHashCode();
+            public override bool Equals(object obj) => obj is DayOfWeekItem other && Name == other.Name;
+            public override string ToString() => Name;
+        }
+
         #endregion
     }
 }

Dialogs/Settings/TabSettingsNotifications.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDuck.Core.Other.Settings {
+namespace TweetDuck.Dialogs.Settings {
     partial class TabSettingsNotifications {
         /// <summary> 
         /// Required designer variable.
@@ -35,9 +35,9 @@
             this.radioLocTL = new System.Windows.Forms.RadioButton();
             this.trackBarEdgeDistance = new System.Windows.Forms.TrackBar();
             this.tableLayoutDurationButtons = new System.Windows.Forms.TableLayoutPanel();
-            this.btnDurationMedium = new TweetDuck.Core.Controls.FlatButton();
+            this.btnDurationMedium = new TweetDuck.Controls.FlatButton();
-            this.btnDurationLong = new TweetDuck.Core.Controls.FlatButton();
+            this.btnDurationLong = new TweetDuck.Controls.FlatButton();
-            this.btnDurationShort = new TweetDuck.Core.Controls.FlatButton();
+            this.btnDurationShort = new TweetDuck.Controls.FlatButton();
             this.labelDurationValue = new System.Windows.Forms.Label();
             this.trackBarDuration = new System.Windows.Forms.TrackBar();
             this.checkSkipOnLinkClick = new System.Windows.Forms.CheckBox();
@@ -65,6 +65,10 @@
             this.panelSize = new System.Windows.Forms.Panel();
             this.durationUpdateTimer = new System.Windows.Forms.Timer(this.components);
             this.flowPanelLeft = new System.Windows.Forms.FlowLayoutPanel();
+            this.labelOpacity = new System.Windows.Forms.Label();
+            this.panelOpacity = new System.Windows.Forms.Panel();
+            this.labelOpacityValue = new System.Windows.Forms.Label();
+            this.trackBarOpacity = new System.Windows.Forms.TrackBar();
             this.panelScrollSpeed = new System.Windows.Forms.Panel();
             this.flowPanelRight = new System.Windows.Forms.FlowLayoutPanel();
             this.panelSeparator = new System.Windows.Forms.Panel();
@@ -77,6 +81,8 @@
             this.panelTimer.SuspendLayout();
             this.panelSize.SuspendLayout();
             this.flowPanelLeft.SuspendLayout();
+            this.panelOpacity.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.trackBarOpacity)).BeginInit();
             this.panelScrollSpeed.SuspendLayout();
             this.flowPanelRight.SuspendLayout();
             this.SuspendLayout();
@@ -84,7 +90,7 @@
             // labelEdgeDistanceValue
             // 
             this.labelEdgeDistanceValue.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.labelEdgeDistanceValue.Location = new System.Drawing.Point(145, 4);
+            this.labelEdgeDistanceValue.Location = new System.Drawing.Point(175, 4);
             this.labelEdgeDistanceValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelEdgeDistanceValue.Name = "labelEdgeDistanceValue";
             this.labelEdgeDistanceValue.Size = new System.Drawing.Size(40, 15);
@@ -193,7 +199,7 @@
             this.trackBarEdgeDistance.Maximum = 40;
             this.trackBarEdgeDistance.Minimum = 8;
             this.trackBarEdgeDistance.Name = "trackBarEdgeDistance";
-            this.trackBarEdgeDistance.Size = new System.Drawing.Size(148, 30);
+            this.trackBarEdgeDistance.Size = new System.Drawing.Size(177, 30);
             this.trackBarEdgeDistance.SmallChange = 2;
             this.trackBarEdgeDistance.TabIndex = 0;
             this.trackBarEdgeDistance.TickFrequency = 4;
@@ -208,12 +214,12 @@
             this.tableLayoutDurationButtons.Controls.Add(this.btnDurationMedium, 0, 0);
             this.tableLayoutDurationButtons.Controls.Add(this.btnDurationLong, 1, 0);
             this.tableLayoutDurationButtons.Controls.Add(this.btnDurationShort, 0, 0);
-            this.tableLayoutDurationButtons.Location = new System.Drawing.Point(3, 353);
+            this.tableLayoutDurationButtons.Location = new System.Drawing.Point(3, 401);
             this.tableLayoutDurationButtons.Name = "tableLayoutDurationButtons";
             this.tableLayoutDurationButtons.RowCount = 1;
             this.tableLayoutDurationButtons.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
             this.tableLayoutDurationButtons.Size = new System.Drawing.Size(180, 27);
-            this.tableLayoutDurationButtons.TabIndex = 12;
+            this.tableLayoutDurationButtons.TabIndex = 14;
             // 
             // btnDurationMedium
             // 
@@ -267,7 +273,7 @@
             // 
             this.labelDurationValue.BackColor = System.Drawing.Color.Transparent;
             this.labelDurationValue.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.labelDurationValue.Location = new System.Drawing.Point(147, 4);
+            this.labelDurationValue.Location = new System.Drawing.Point(177, 4);
             this.labelDurationValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelDurationValue.Name = "labelDurationValue";
             this.labelDurationValue.Size = new System.Drawing.Size(52, 15);
@@ -282,7 +288,7 @@
             this.trackBarDuration.Maximum = 60;
             this.trackBarDuration.Minimum = 10;
             this.trackBarDuration.Name = "trackBarDuration";
-            this.trackBarDuration.Size = new System.Drawing.Size(148, 30);
+            this.trackBarDuration.Size = new System.Drawing.Size(177, 30);
             this.trackBarDuration.TabIndex = 0;
             this.trackBarDuration.TickFrequency = 5;
             this.trackBarDuration.Value = 25;
@@ -349,11 +355,11 @@
             // 
             this.checkTimerCountDown.AutoSize = true;
             this.checkTimerCountDown.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.checkTimerCountDown.Location = new System.Drawing.Point(6, 266);
+            this.checkTimerCountDown.Location = new System.Drawing.Point(6, 314);
             this.checkTimerCountDown.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkTimerCountDown.Name = "checkTimerCountDown";
             this.checkTimerCountDown.Size = new System.Drawing.Size(132, 19);
-            this.checkTimerCountDown.TabIndex = 9;
+            this.checkTimerCountDown.TabIndex = 11;
             this.checkTimerCountDown.Text = "Timer Counts Down";
             this.checkTimerCountDown.UseVisualStyleBackColor = true;
             // 
@@ -361,11 +367,11 @@
             // 
             this.checkNotificationTimer.AutoSize = true;
             this.checkNotificationTimer.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.checkNotificationTimer.Location = new System.Drawing.Point(6, 242);
+            this.checkNotificationTimer.Location = new System.Drawing.Point(6, 290);
             this.checkNotificationTimer.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
             this.checkNotificationTimer.Name = "checkNotificationTimer";
             this.checkNotificationTimer.Size = new System.Drawing.Size(164, 19);
-            this.checkNotificationTimer.TabIndex = 8;
+            this.checkNotificationTimer.TabIndex = 10;
             this.checkNotificationTimer.Text = "Display Notification Timer";
             this.checkNotificationTimer.UseVisualStyleBackColor = true;
             // 
@@ -429,7 +435,7 @@
             // labelScrollSpeedValue
             // 
             this.labelScrollSpeedValue.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.labelScrollSpeedValue.Location = new System.Drawing.Point(145, 4);
+            this.labelScrollSpeedValue.Location = new System.Drawing.Point(176, 4);
             this.labelScrollSpeedValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelScrollSpeedValue.Name = "labelScrollSpeedValue";
             this.labelScrollSpeedValue.Size = new System.Drawing.Size(38, 15);
@@ -445,7 +451,7 @@
             this.trackBarScrollSpeed.Maximum = 200;
             this.trackBarScrollSpeed.Minimum = 25;
             this.trackBarScrollSpeed.Name = "trackBarScrollSpeed";
-            this.trackBarScrollSpeed.Size = new System.Drawing.Size(148, 30);
+            this.trackBarScrollSpeed.Size = new System.Drawing.Size(177, 30);
             this.trackBarScrollSpeed.SmallChange = 5;
             this.trackBarScrollSpeed.TabIndex = 0;
             this.trackBarScrollSpeed.TickFrequency = 25;
@@ -490,32 +496,32 @@
             // 
             this.panelTimer.Controls.Add(this.labelDurationValue);
             this.panelTimer.Controls.Add(this.trackBarDuration);
-            this.panelTimer.Location = new System.Drawing.Point(0, 315);
+            this.panelTimer.Location = new System.Drawing.Point(0, 363);
             this.panelTimer.Margin = new System.Windows.Forms.Padding(0, 1, 0, 0);
             this.panelTimer.Name = "panelTimer";
             this.panelTimer.Size = new System.Drawing.Size(300, 35);
-            this.panelTimer.TabIndex = 11;
+            this.panelTimer.TabIndex = 13;
             // 
             // labelDuration
             // 
             this.labelDuration.AutoSize = true;
             this.labelDuration.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold);
-            this.labelDuration.Location = new System.Drawing.Point(3, 299);
+            this.labelDuration.Location = new System.Drawing.Point(3, 347);
             this.labelDuration.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelDuration.Name = "labelDuration";
             this.labelDuration.Size = new System.Drawing.Size(54, 15);
-            this.labelDuration.TabIndex = 10;
+            this.labelDuration.TabIndex = 12;
             this.labelDuration.Text = "Duration";
             // 
             // labelTimer
             // 
             this.labelTimer.AutoSize = true;
             this.labelTimer.Font = new System.Drawing.Font("Segoe UI Semibold", 10.5F, System.Drawing.FontStyle.Bold);
-            this.labelTimer.Location = new System.Drawing.Point(0, 216);
+            this.labelTimer.Location = new System.Drawing.Point(0, 264);
-            this.labelTimer.Margin = new System.Windows.Forms.Padding(0, 40, 0, 1);
+            this.labelTimer.Margin = new System.Windows.Forms.Padding(0, 25, 0, 1);
             this.labelTimer.Name = "labelTimer";
             this.labelTimer.Size = new System.Drawing.Size(50, 19);
-            this.labelTimer.TabIndex = 7;
+            this.labelTimer.TabIndex = 9;
             this.labelTimer.Text = "TIMER";
             // 
             // labelSize
@@ -555,6 +561,8 @@
             this.flowPanelLeft.Controls.Add(this.checkNonIntrusive);
             this.flowPanelLeft.Controls.Add(this.labelIdlePause);
             this.flowPanelLeft.Controls.Add(this.comboBoxIdlePause);
+            this.flowPanelLeft.Controls.Add(this.labelOpacity);
+            this.flowPanelLeft.Controls.Add(this.panelOpacity);
             this.flowPanelLeft.Controls.Add(this.labelTimer);
             this.flowPanelLeft.Controls.Add(this.checkNotificationTimer);
             this.flowPanelLeft.Controls.Add(this.checkTimerCountDown);
@@ -568,6 +576,52 @@
             this.flowPanelLeft.TabIndex = 0;
             this.flowPanelLeft.WrapContents = false;
             // 
+            // labelOpacity
+            // 
+            this.labelOpacity.AutoSize = true;
+            this.labelOpacity.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold);
+            this.labelOpacity.Location = new System.Drawing.Point(3, 188);
+            this.labelOpacity.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
+            this.labelOpacity.Name = "labelOpacity";
+            this.labelOpacity.Size = new System.Drawing.Size(48, 15);
+            this.labelOpacity.TabIndex = 7;
+            this.labelOpacity.Text = "Opacity";
+            // 
+            // panelOpacity
+            // 
+            this.panelOpacity.Controls.Add(this.labelOpacityValue);
+            this.panelOpacity.Controls.Add(this.trackBarOpacity);
+            this.panelOpacity.Location = new System.Drawing.Point(0, 204);
+            this.panelOpacity.Margin = new System.Windows.Forms.Padding(0, 1, 0, 0);
+            this.panelOpacity.Name = "panelOpacity";
+            this.panelOpacity.Size = new System.Drawing.Size(300, 35);
+            this.panelOpacity.TabIndex = 8;
+            // 
+            // labelOpacityValue
+            // 
+            this.labelOpacityValue.BackColor = System.Drawing.SystemColors.Control;
+            this.labelOpacityValue.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.labelOpacityValue.Location = new System.Drawing.Point(176, 4);
+            this.labelOpacityValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
+            this.labelOpacityValue.Name = "labelOpacityValue";
+            this.labelOpacityValue.Size = new System.Drawing.Size(38, 15);
+            this.labelOpacityValue.TabIndex = 1;
+            this.labelOpacityValue.Text = "100%";
+            this.labelOpacityValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            // 
+            // trackBarOpacity
+            // 
+            this.trackBarOpacity.AutoSize = false;
+            this.trackBarOpacity.Location = new System.Drawing.Point(3, 3);
+            this.trackBarOpacity.Maximum = 100;
+            this.trackBarOpacity.Minimum = 20;
+            this.trackBarOpacity.Name = "trackBarOpacity";
+            this.trackBarOpacity.Size = new System.Drawing.Size(177, 30);
+            this.trackBarOpacity.SmallChange = 5;
+            this.trackBarOpacity.TabIndex = 0;
+            this.trackBarOpacity.TickFrequency = 10;
+            this.trackBarOpacity.Value = 100;
+            // 
             // panelScrollSpeed
             // 
             this.panelScrollSpeed.Controls.Add(this.trackBarScrollSpeed);
@@ -630,6 +684,8 @@
             this.panelSize.ResumeLayout(false);
             this.flowPanelLeft.ResumeLayout(false);
             this.flowPanelLeft.PerformLayout();
+            this.panelOpacity.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.trackBarOpacity)).EndInit();
             this.panelScrollSpeed.ResumeLayout(false);
             this.flowPanelRight.ResumeLayout(false);
             this.flowPanelRight.PerformLayout();
@@ -652,9 +708,9 @@
         private System.Windows.Forms.Label labelDurationValue;
         private System.Windows.Forms.TrackBar trackBarDuration;
         private System.Windows.Forms.TableLayoutPanel tableLayoutDurationButtons;
-        private TweetDuck.Core.Controls.FlatButton btnDurationMedium;
+        private TweetDuck.Controls.FlatButton btnDurationMedium;
-        private TweetDuck.Core.Controls.FlatButton btnDurationLong;
+        private TweetDuck.Controls.FlatButton btnDurationLong;
-        private TweetDuck.Core.Controls.FlatButton btnDurationShort;
+        private TweetDuck.Controls.FlatButton btnDurationShort;
         private System.Windows.Forms.CheckBox checkNonIntrusive;
         private System.Windows.Forms.Label labelIdlePause;
         private System.Windows.Forms.ComboBox comboBoxIdlePause;
@@ -682,5 +738,9 @@
         private System.Windows.Forms.Panel panelScrollSpeed;
         private System.Windows.Forms.FlowLayoutPanel flowPanelRight;
         private System.Windows.Forms.Panel panelSeparator;
+        private System.Windows.Forms.Label labelOpacity;
+        private System.Windows.Forms.Panel panelOpacity;
+        private System.Windows.Forms.Label labelOpacityValue;
+        private System.Windows.Forms.TrackBar trackBarOpacity;
     }
 }

Dialogs/Settings/TabSettingsNotifications.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Windows.Forms;
-using TweetDuck.Core.Controls;
+using TweetDuck.Browser.Notification.Example;
-using TweetDuck.Core.Notification.Example;
+using TweetDuck.Controls;
 using TweetLib.Core.Features.Notifications;
 
-namespace TweetDuck.Core.Other.Settings{
+namespace TweetDuck.Dialogs.Settings{
-    sealed partial class TabSettingsNotifications : BaseTabSettings{
+    sealed partial class TabSettingsNotifications : FormSettings.BaseTab{
         private static readonly int[] IdlePauseSeconds = { 0, 30, 60, 120, 300 };
 
         private readonly FormNotificationExample notification;
@@ -23,7 +23,6 @@ namespace TweetDuck.Core.Other.Settings{
                 });
             };
 
-            this.notification.Activated += notification_Activated;
             this.notification.Show();
             
             Disposed += (sender, args) => this.notification.Dispose();
@@ -48,6 +47,9 @@ namespace TweetDuck.Core.Other.Settings{
             comboBoxIdlePause.Items.Add("5 minutes");
             comboBoxIdlePause.SelectedIndex = Math.Max(0, Array.FindIndex(IdlePauseSeconds, val => val == Config.NotificationIdlePauseSeconds));
 
+            trackBarOpacity.SetValueSafe(Config.NotificationWindowOpacity);
+            labelOpacityValue.Text = Config.NotificationWindowOpacity + "%";
+
             // timer
 
             toolTip.SetToolTip(checkTimerCountDown, "The notification timer counts down instead of up.");
@@ -105,6 +107,7 @@ namespace TweetDuck.Core.Other.Settings{
             checkSkipOnLinkClick.CheckedChanged += checkSkipOnLinkClick_CheckedChanged;
             checkNonIntrusive.CheckedChanged += checkNonIntrusive_CheckedChanged;
             comboBoxIdlePause.SelectedValueChanged += comboBoxIdlePause_SelectedValueChanged;
+            trackBarOpacity.ValueChanged += trackBarOpacity_ValueChanged;
 
             checkNotificationTimer.CheckedChanged += checkNotificationTimer_CheckedChanged;
             checkTimerCountDown.CheckedChanged += checkTimerCountDown_CheckedChanged;
@@ -135,11 +138,6 @@ namespace TweetDuck.Core.Other.Settings{
             }
         }
 
-        private void notification_Activated(object sender, EventArgs e){
-            notification.Hide();
-            notification.Activated -= notification_Activated;
-        }
-
         private void notification_Move(object sender, EventArgs e){
             if (radioLocCustom.Checked && notification.Location != ControlExtensions.InvisibleLocation){
                 Config.CustomNotificationPosition = notification.Location;
@@ -176,6 +174,13 @@ namespace TweetDuck.Core.Other.Settings{
             Config.NotificationIdlePauseSeconds = IdlePauseSeconds[comboBoxIdlePause.SelectedIndex];
         }
 
+        private void trackBarOpacity_ValueChanged(object sender, EventArgs e){
+            if (trackBarOpacity.AlignValueToTick()){
+                Config.NotificationWindowOpacity = trackBarOpacity.Value;
+                labelOpacityValue.Text = Config.NotificationWindowOpacity + "%";
+            }
+        }
+
         #endregion
         #region Timer
 
@@ -219,10 +224,18 @@ namespace TweetDuck.Core.Other.Settings{
         #region Location
 
         private void radioLoc_CheckedChanged(object sender, EventArgs e){
-            if (radioLocTL.Checked)Config.NotificationPosition = DesktopNotification.Position.TopLeft;
+            if (radioLocTL.Checked){
-            else if (radioLocTR.Checked)Config.NotificationPosition = DesktopNotification.Position.TopRight;
+                Config.NotificationPosition = DesktopNotification.Position.TopLeft;
-            else if (radioLocBL.Checked)Config.NotificationPosition = DesktopNotification.Position.BottomLeft;
+            }
-            else if (radioLocBR.Checked)Config.NotificationPosition = DesktopNotification.Position.BottomRight;
+            else if (radioLocTR.Checked){
+                Config.NotificationPosition = DesktopNotification.Position.TopRight;
+            }
+            else if (radioLocBL.Checked){
+                Config.NotificationPosition = DesktopNotification.Position.BottomLeft;
+            }
+            else if (radioLocBR.Checked){
+                Config.NotificationPosition = DesktopNotification.Position.BottomRight;
+            }
 
             comboBoxDisplay.Enabled = trackBarEdgeDistance.Enabled = true;
             notification.ShowExampleNotification(false);

Dialogs/Settings/TabSettingsSounds.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDuck.Core.Other.Settings {
+namespace TweetDuck.Dialogs.Settings {
     partial class TabSettingsSounds {
         /// <summary> 
         /// Required designer variable.
@@ -57,7 +57,7 @@
             // 
             this.labelVolumeValue.BackColor = System.Drawing.Color.Transparent;
             this.labelVolumeValue.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.labelVolumeValue.Location = new System.Drawing.Point(147, 4);
+            this.labelVolumeValue.Location = new System.Drawing.Point(176, 4);
             this.labelVolumeValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelVolumeValue.Name = "labelVolumeValue";
             this.labelVolumeValue.Size = new System.Drawing.Size(38, 15);
@@ -144,7 +144,7 @@
             this.trackBarVolume.Location = new System.Drawing.Point(3, 3);
             this.trackBarVolume.Maximum = 100;
             this.trackBarVolume.Name = "trackBarVolume";
-            this.trackBarVolume.Size = new System.Drawing.Size(148, 30);
+            this.trackBarVolume.Size = new System.Drawing.Size(177, 30);
             this.trackBarVolume.TabIndex = 0;
             this.trackBarVolume.TickFrequency = 10;
             this.trackBarVolume.Value = 100;

Dialogs/Settings/TabSettingsSounds.cs

@@ -2,12 +2,12 @@
 using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
-using TweetDuck.Core.Controls;
+using TweetDuck.Browser.Notification;
-using TweetDuck.Core.Notification;
+using TweetDuck.Controls;
-using TweetDuck.Core.Utils;
+using TweetDuck.Utils;
 
-namespace TweetDuck.Core.Other.Settings{
+namespace TweetDuck.Dialogs.Settings{
-    sealed partial class TabSettingsSounds : BaseTabSettings{
+    sealed partial class TabSettingsSounds : FormSettings.BaseTab{
         private readonly Action playSoundNotification;
 
         public TabSettingsSounds(Action playSoundNotification){
@@ -64,15 +64,23 @@ namespace TweetDuck.Core.Other.Settings{
         }
 
         private void btnBrowseSound_Click(object sender, EventArgs e){
-            using(OpenFileDialog dialog = new OpenFileDialog{
+            using OpenFileDialog dialog = new OpenFileDialog{
                 AutoUpgradeEnabled = true,
                 DereferenceLinks = true,
                 Title = "Custom Notification Sound",
                 Filter = $"Sound file ({SoundNotification.SupportedFormats})|{SoundNotification.SupportedFormats}|All files (*.*)|*.*"
-            }){
+            };
-                if (dialog.ShowDialog() == DialogResult.OK){
+
-                    tbCustomSound.Text = dialog.FileName;
+            if (dialog.ShowDialog() == DialogResult.OK){
+                try{
+                    if (new FileInfo(dialog.FileName).Length > (1024 * 1024) && !FormMessage.Warning("Sound Notification", "The sound file is larger than 1 MB, this will cause increased memory usage. Use this file anyway?", FormMessage.Yes, FormMessage.No)){
+                        return;
+                    }
+                }catch{
+                    // ignore
                 }
+
+                tbCustomSound.Text = dialog.FileName;
             }
         }
 

Dialogs/Settings/TabSettingsTray.Designer.cs

@@ -0,0 +1,131 @@
+namespace TweetDuck.Dialogs.Settings {
+    partial class TabSettingsTray {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing) {
+            if (disposing && (components != null)) {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Component Designer generated code
+
+        /// <summary> 
+        /// Required method for Designer support - do not modify 
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent() {
+            this.components = new System.ComponentModel.Container();
+            this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+            this.flowPanelLeft = new System.Windows.Forms.FlowLayoutPanel();
+            this.labelTray = new System.Windows.Forms.Label();
+            this.comboBoxTrayType = new System.Windows.Forms.ComboBox();
+            this.labelTrayIcon = new System.Windows.Forms.Label();
+            this.checkTrayHighlight = new System.Windows.Forms.CheckBox();
+            this.flowPanelRight = new System.Windows.Forms.FlowLayoutPanel();
+            this.flowPanelLeft.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // flowPanelLeft
+            // 
+            this.flowPanelLeft.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
+            this.flowPanelLeft.Controls.Add(this.labelTray);
+            this.flowPanelLeft.Controls.Add(this.comboBoxTrayType);
+            this.flowPanelLeft.Controls.Add(this.labelTrayIcon);
+            this.flowPanelLeft.Controls.Add(this.checkTrayHighlight);
+            this.flowPanelLeft.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
+            this.flowPanelLeft.Location = new System.Drawing.Point(9, 9);
+            this.flowPanelLeft.Name = "flowPanelLeft";
+            this.flowPanelLeft.Size = new System.Drawing.Size(300, 462);
+            this.flowPanelLeft.TabIndex = 0;
+            this.flowPanelLeft.WrapContents = false;
+            // 
+            // labelTray
+            // 
+            this.labelTray.AutoSize = true;
+            this.labelTray.Font = new System.Drawing.Font("Segoe UI Semibold", 10.5F, System.Drawing.FontStyle.Bold);
+            this.labelTray.Location = new System.Drawing.Point(0, 0);
+            this.labelTray.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1);
+            this.labelTray.Name = "labelTray";
+            this.labelTray.Size = new System.Drawing.Size(99, 19);
+            this.labelTray.TabIndex = 0;
+            this.labelTray.Text = "SYSTEM TRAY";
+            // 
+            // comboBoxTrayType
+            // 
+            this.comboBoxTrayType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxTrayType.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.comboBoxTrayType.FormattingEnabled = true;
+            this.comboBoxTrayType.Location = new System.Drawing.Point(5, 24);
+            this.comboBoxTrayType.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
+            this.comboBoxTrayType.Name = "comboBoxTrayType";
+            this.comboBoxTrayType.Size = new System.Drawing.Size(144, 23);
+            this.comboBoxTrayType.TabIndex = 1;
+            // 
+            // labelTrayIcon
+            // 
+            this.labelTrayIcon.AutoSize = true;
+            this.labelTrayIcon.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold);
+            this.labelTrayIcon.Location = new System.Drawing.Point(3, 59);
+            this.labelTrayIcon.Margin = new System.Windows.Forms.Padding(3, 9, 3, 0);
+            this.labelTrayIcon.Name = "labelTrayIcon";
+            this.labelTrayIcon.Size = new System.Drawing.Size(56, 15);
+            this.labelTrayIcon.TabIndex = 2;
+            this.labelTrayIcon.Text = "Tray Icon";
+            // 
+            // checkTrayHighlight
+            // 
+            this.checkTrayHighlight.AutoSize = true;
+            this.checkTrayHighlight.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.checkTrayHighlight.Location = new System.Drawing.Point(6, 80);
+            this.checkTrayHighlight.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
+            this.checkTrayHighlight.Name = "checkTrayHighlight";
+            this.checkTrayHighlight.Size = new System.Drawing.Size(114, 19);
+            this.checkTrayHighlight.TabIndex = 3;
+            this.checkTrayHighlight.Text = "Enable Highlight";
+            this.checkTrayHighlight.UseVisualStyleBackColor = true;
+            // 
+            // flowPanelRight
+            // 
+            this.flowPanelRight.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
+            this.flowPanelRight.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
+            this.flowPanelRight.Location = new System.Drawing.Point(322, 9);
+            this.flowPanelRight.Name = "flowPanelRight";
+            this.flowPanelRight.Size = new System.Drawing.Size(300, 462);
+            this.flowPanelRight.TabIndex = 1;
+            this.flowPanelRight.WrapContents = false;
+            // 
+            // TabSettingsTray
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.flowPanelRight);
+            this.Controls.Add(this.flowPanelLeft);
+            this.Name = "TabSettingsTray";
+            this.Size = new System.Drawing.Size(631, 480);
+            this.flowPanelLeft.ResumeLayout(false);
+            this.flowPanelLeft.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+        private System.Windows.Forms.ToolTip toolTip;
+        private System.Windows.Forms.FlowLayoutPanel flowPanelLeft;
+        private System.Windows.Forms.Label labelTray;
+        private System.Windows.Forms.ComboBox comboBoxTrayType;
+        private System.Windows.Forms.Label labelTrayIcon;
+        private System.Windows.Forms.CheckBox checkTrayHighlight;
+        private System.Windows.Forms.FlowLayoutPanel flowPanelRight;
+    }
+}

Dialogs/Settings/TabSettingsTray.cs

@@ -0,0 +1,43 @@
+using System;
+using TweetDuck.Browser;
+
+namespace TweetDuck.Dialogs.Settings{
+    sealed partial class TabSettingsTray : FormSettings.BaseTab{
+        public TabSettingsTray(){
+            InitializeComponent();
+
+            // system tray
+            
+            toolTip.SetToolTip(comboBoxTrayType, "Changes behavior of the Tray icon.\r\nRight-click the icon for an action menu.");
+            toolTip.SetToolTip(checkTrayHighlight, "Highlights the tray icon if there are new tweets.\r\nOnly works for columns with popup or audio notifications.\r\nThe icon resets when the main window is restored.");
+
+            comboBoxTrayType.Items.Add("Disabled");
+            comboBoxTrayType.Items.Add("Display Icon Only");
+            comboBoxTrayType.Items.Add("Minimize to Tray");
+            comboBoxTrayType.Items.Add("Close to Tray");
+            comboBoxTrayType.Items.Add("Combined");
+            comboBoxTrayType.SelectedIndex = Math.Min(Math.Max((int)Config.TrayBehavior, 0), comboBoxTrayType.Items.Count - 1);
+
+            checkTrayHighlight.Enabled = Config.TrayBehavior.ShouldDisplayIcon();
+            checkTrayHighlight.Checked = Config.EnableTrayHighlight;
+        }
+
+        public override void OnReady(){
+            comboBoxTrayType.SelectedIndexChanged += comboBoxTrayType_SelectedIndexChanged;
+            checkTrayHighlight.CheckedChanged += checkTrayHighlight_CheckedChanged;
+        }
+
+        #region System Tray
+        
+        private void comboBoxTrayType_SelectedIndexChanged(object sender, EventArgs e){
+            Config.TrayBehavior = (TrayIcon.Behavior)comboBoxTrayType.SelectedIndex;
+            checkTrayHighlight.Enabled = Config.TrayBehavior.ShouldDisplayIcon();
+        }
+
+        private void checkTrayHighlight_CheckedChanged(object sender, EventArgs e){
+            Config.EnableTrayHighlight = checkTrayHighlight.Checked;
+        }
+
+        #endregion
+    }
+}

Impl/SystemHandler.cs

@@ -1,16 +0,0 @@
-using System.Diagnostics;
-using System.IO;
-using TweetLib.Core.Application;
-
-namespace TweetDuck.Impl{
-    class SystemHandler : IAppSystemHandler{
-        void IAppSystemHandler.OpenFileExplorer(string path){
-            if (File.Exists(path)){
-                using(Process.Start("explorer.exe", "/select,\"" + path.Replace('/', '\\') + "\"")){}
-            }
-            else if (Directory.Exists(path)){
-                using(Process.Start("explorer.exe", '"' + path.Replace('/', '\\') + '"')){}
-            }
-        }
-    }
-}