Release 1.18.3

Closes #276

Configuration/UserConfig.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Drawing;
 using TweetDuck.Core.Controls;
-using TweetDuck.Core.Notification;
 using TweetDuck.Core.Other;
 using TweetDuck.Data;
 using TweetLib.Core.Features.Configuration;
+using TweetLib.Core.Features.Notifications;
 using TweetLib.Core.Features.Twitter;
 
 namespace TweetDuck.Configuration{
@@ -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 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;
@@ -57,12 +61,12 @@ namespace TweetDuck.Configuration{
         public bool NotificationTimerCountDown { get; set; } = false;
         public int NotificationDurationValue   { get; set; } = 25;
 
-        public TweetNotification.Position NotificationPosition { get; set; } = TweetNotification.Position.TopRight;
+        public DesktopNotification.Position NotificationPosition { get; set; } = DesktopNotification.Position.TopRight;
         public Point CustomNotificationPosition                  { get; set; } = ControlExtensions.InvisibleLocation;
         public int NotificationDisplay                           { get; set; } = 0;
         public int NotificationEdgeDistance                      { get; set; } = 8;
 
-        public TweetNotification.Size NotificationSize { get; set; } = TweetNotification.Size.Auto;
+        public DesktopNotification.Size NotificationSize { get; set; } = DesktopNotification.Size.Auto;
         public Size CustomNotificationSize               { get; set; } = Size.Empty;
         public int NotificationScrollSpeed               { get; set; } = 100;
         
@@ -74,6 +78,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;

Core/Adapters/CefScriptExecutor.cs

@@ -0,0 +1,41 @@
+using System.IO;
+using CefSharp;
+using TweetLib.Core.Browser;
+
+namespace TweetDuck.Core.Adapters{
+    sealed class CefScriptExecutor : IScriptExecutor{
+        private readonly IWebBrowser browser;
+
+        public CefScriptExecutor(IWebBrowser browser){
+            this.browser = browser;
+        }
+
+        public void RunFunction(string name, params object[] args){
+            browser.ExecuteScriptAsync(name, args);
+        }
+
+        public void RunScript(string identifier, string script){
+            using IFrame frame = browser.GetMainFrame();
+            RunScript(frame, script, identifier);
+        }
+
+        public bool RunFile(string file){
+            using IFrame frame = browser.GetMainFrame();
+            return RunFile(frame, file);
+        }
+
+        // Helpers
+
+        public static void RunScript(IFrame frame, string script, string identifier){
+            if (script != null){
+                frame.ExecuteJavaScriptAsync(script, identifier, 1);
+            }
+        }
+
+        public static bool RunFile(IFrame frame, string file){
+            string script = Program.Resources.Load(file);
+            RunScript(frame, script, "root:" + Path.GetFileNameWithoutExtension(file));
+            return script != null;
+        }
+    }
+}

Core/Bridge/PropertyBridge.cs

@@ -1,5 +1,7 @@
 using System.Text;
 using TweetDuck.Configuration;
+using TweetLib.Core;
+using TweetLib.Core.Utils;
 
 namespace TweetDuck.Core.Bridge{
     static class PropertyBridge{
@@ -8,11 +10,11 @@ namespace TweetDuck.Core.Bridge{
         }
 
         public static string GenerateScript(Environment environment){
-            string Bool(bool value) => value ? "true;" : "false;";
+            static string Bool(bool value) => value ? "true;" : "false;";
-            string Str(string value) => '"'+value+"\";";
+            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();
         }
     }
 }

Core/Bridge/TweetDeckBridge.cs

@@ -1,20 +1,19 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Windows.Forms;
+using CefSharp;
 using TweetDuck.Core.Controls;
-using TweetDuck.Core.Management;
+using TweetDuck.Core.Handling;
 using TweetDuck.Core.Notification;
 using TweetDuck.Core.Other;
 using TweetDuck.Core.Utils;
+using TweetLib.Core.Features.Notifications;
 
 namespace TweetDuck.Core.Bridge{
     [SuppressMessage("ReSharper", "UnusedMember.Global")]
     class TweetDeckBridge{
-        public static string FontSize { get; private set; }
-        public static string NotificationHeadLayout { get; private set; }
-        public static readonly ContextInfo ContextInfo = new ContextInfo();
-
         public static void ResetStaticProperties(){
-            FontSize = NotificationHeadLayout = null;
+            FormNotificationBase.FontSize = null;
+            FormNotificationBase.HeadLayout = null;
         }
 
         private readonly FormBrowser form;
@@ -46,17 +45,17 @@ namespace TweetDuck.Core.Bridge{
 
             public void LoadNotificationLayout(string fontSize, string headLayout){
                 form.InvokeAsyncSafe(() => {
-                    FontSize = fontSize;
+                    FormNotificationBase.FontSize = fontSize;
-                    NotificationHeadLayout = headLayout;
+                    FormNotificationBase.HeadLayout = headLayout;
                 });
             }
 
             public void SetRightClickedLink(string type, string url){
-                ContextInfo.SetLink(type, url);
+                ContextMenuBase.CurrentInfo.SetLink(type, url);
             }
 
             public void SetRightClickedChirp(string tweetUrl, string quoteUrl, string chirpAuthors, string chirpImages){
-                ContextInfo.SetChirp(tweetUrl, quoteUrl, chirpAuthors, chirpImages);
+                ContextMenuBase.CurrentInfo.SetChirp(tweetUrl, quoteUrl, chirpAuthors, chirpImages);
             }
 
             public void DisplayTooltip(string text){
@@ -87,7 +86,7 @@ namespace TweetDuck.Core.Bridge{
         public void OnTweetPopup(string columnId, string chirpId, string columnName, string tweetHtml, int tweetCharacters, string tweetUrl, string quoteUrl){
             notification.InvokeAsyncSafe(() => {
                 form.OnTweetNotification();
-                notification.ShowNotification(new TweetNotification(columnId, chirpId, columnName, tweetHtml, tweetCharacters, tweetUrl, quoteUrl));
+                notification.ShowNotification(new DesktopNotification(columnId, chirpId, columnName, tweetHtml, tweetCharacters, tweetUrl, quoteUrl));
             });
         }
 
@@ -102,8 +101,12 @@ 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(){

Core/Bridge/UpdateBridge.cs

@@ -13,7 +13,6 @@ namespace TweetDuck.Core.Bridge{
         private UpdateInfo nextUpdate = null;
 
         public event EventHandler<UpdateInfo> UpdateAccepted;
-        public event EventHandler<UpdateInfo> UpdateDelayed;
         public event EventHandler<UpdateInfo> UpdateDismissed;
 
         public UpdateBridge(UpdateHandler updates, Control sync){
@@ -56,10 +55,6 @@ namespace TweetDuck.Core.Bridge{
             HandleInteractionEvent(UpdateAccepted);
         }
 
-        public void OnUpdateDelayed(){
-            HandleInteractionEvent(UpdateDelayed);
-        }
-
         public void OnUpdateDismissed(){
             HandleInteractionEvent(UpdateDismissed);
 

Core/Controls/ControlExtensions.cs

@@ -21,17 +21,16 @@ namespace TweetDuck.Core.Controls{
         }
 
         public static float GetDPIScale(this Control control){
-            using(Graphics graphics = control.CreateGraphics()){
+            using Graphics graphics = control.CreateGraphics();
             return graphics.DpiY / 96F;
         }
-        }
 
         public static bool IsFullyOutsideView(this Form form){
             return !Screen.AllScreens.Any(screen => screen.WorkingArea.IntersectsWith(form.Bounds));
         }
 
         public static void MoveToCenter(this Form targetForm, Form parentForm){
-            targetForm.Location = new Point(parentForm.Location.X+parentForm.Width/2-targetForm.Width/2, parentForm.Location.Y+parentForm.Height/2-targetForm.Height/2);
+            targetForm.Location = new Point(parentForm.Location.X + (parentForm.Width / 2) - (targetForm.Width / 2), parentForm.Location.Y + (parentForm.Height / 2) - (targetForm.Height / 2));
         }
 
         public static void SetValueInstant(this ProgressBar bar, int value){
@@ -63,7 +62,8 @@ namespace TweetDuck.Core.Controls{
                 trackBar.Value = trackBar.SmallChange * (int)Math.Floor(((double)trackBar.Value / trackBar.SmallChange) + 0.5);
                 return false;
             }
-            else return true;
+
+            return true;
         }
 
         public static void EnableMultilineShortcuts(this TextBox textBox){

Core/Controls/FlowLayoutPanelNoHScroll.cs

@@ -1,13 +1,8 @@
 using System.Windows.Forms;
 using TweetDuck.Core.Utils;
 
-namespace TweetDuck.Plugins{
+namespace TweetDuck.Core.Controls{
-    sealed class PluginListFlowLayout : FlowLayoutPanel{
+    sealed class FlowLayoutPanelNoHScroll : FlowLayoutPanel{
-        public PluginListFlowLayout(){
-            FlowDirection = FlowDirection.TopDown;
-            WrapContents = false;
-        }
-
         protected override void WndProc(ref Message m){
             if (m.Msg == 0x85){ // WM_NCPAINT
                 NativeMethods.ShowScrollBar(Handle, NativeMethods.SB_HORZ, false); // basically fuck the horizontal scrollbar very much

Core/Controls/LabelVertical.cs

@@ -8,8 +8,8 @@ namespace TweetDuck.Core.Controls{
 
         protected override void OnPaint(PaintEventArgs e){
             int y = (int)Math.Floor((ClientRectangle.Height - Text.Length * LineHeight) / 2F) - 1;
+            using Brush brush = new SolidBrush(ForeColor);
 
-            using(Brush brush = new SolidBrush(ForeColor)){
             foreach(char chr in Text){
                 string str = chr.ToString();
                 float x = (ClientRectangle.Width - e.Graphics.MeasureString(str, Font).Width) / 2F;
@@ -20,4 +20,3 @@ namespace TweetDuck.Core.Controls{
         }
     }
 }
-}

Core/FormBrowser.cs

@@ -1,7 +1,10 @@
 using System;
+using System.Diagnostics;
 using System.Drawing;
+using System.IO;
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using CefSharp;
 using TweetDuck.Configuration;
 using TweetDuck.Core.Bridge;
 using TweetDuck.Core.Controls;
@@ -14,9 +17,8 @@ using TweetDuck.Core.Other;
 using TweetDuck.Core.Other.Analytics;
 using TweetDuck.Core.Other.Settings.Dialogs;
 using TweetDuck.Core.Utils;
-using TweetDuck.Plugins;
-using TweetDuck.Resources;
 using TweetDuck.Updates;
+using TweetLib.Core.Features.Plugins;
 using TweetLib.Core.Features.Plugins.Events;
 using TweetLib.Core.Features.Updates;
 
@@ -65,7 +67,7 @@ namespace TweetDuck.Core{
 
             Text = Program.BrandName;
             
-            this.plugins = new PluginManager(this, Program.Config.Plugins, Program.PluginPath, Program.PluginDataPath);
+            this.plugins = new PluginManager(Program.Config.Plugins, Program.PluginPath, Program.PluginDataPath);
             this.plugins.Reloaded += plugins_Reloaded;
             this.plugins.Executed += plugins_Executed;
             this.plugins.Reload();
@@ -78,7 +80,6 @@ namespace TweetDuck.Core{
 
             this.updateBridge = new UpdateBridge(updates, this);
             this.updateBridge.UpdateAccepted += updateBridge_UpdateAccepted;
-            this.updateBridge.UpdateDelayed += updateBridge_UpdateDelayed;
             this.updateBridge.UpdateDismissed += updateBridge_UpdateDismissed;
 
             this.browser = new TweetDeckBrowser(this, plugins, new TweetDeckBridge.Browser(this, notification), updateBridge);
@@ -236,7 +237,9 @@ 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);
+                });
             }
 
             if (isLoaded){
@@ -244,9 +247,11 @@ namespace TweetDuck.Core{
             }
         }
         
-        private static void plugins_Executed(object sender, PluginErrorEventArgs e){
+        private void plugins_Executed(object sender, PluginErrorEventArgs e){
             if (e.HasErrors){
+                this.InvokeAsyncSafe(() => {
                     FormMessage.Error("Error Executing Plugins", "Failed to execute the following plugins:\n\n" + string.Join("\n\n", e.Errors), FormMessage.OK);
+                });
             }
         }
 
@@ -319,10 +324,6 @@ namespace TweetDuck.Core{
             }
         }
 
-        private void updateBridge_UpdateDelayed(object sender, UpdateInfo update){
-            // stops the timer
-        }
-
         private void updateBridge_UpdateDismissed(object sender, UpdateInfo update){
             Config.DismissedUpdate = update.VersionTag;
             Config.Save();
@@ -330,7 +331,9 @@ namespace TweetDuck.Core{
 
         protected override void WndProc(ref Message m){
             if (isLoaded && m.Msg == Program.WindowRestoreMessage){
-                if (WindowsUtils.CurrentProcessID == m.WParam.ToInt32()){
+                using Process me = Process.GetCurrentProcess();
+
+                if (me.Id == m.WParam.ToInt32()){
                     trayIcon_ClickRestore(trayIcon, EventArgs.Empty);
                 }
 
@@ -367,14 +370,7 @@ namespace TweetDuck.Core{
         }
 
         public void ReloadToTweetDeck(){
-            #if DEBUG
+            Program.Resources.OnReloadTriggered();
-            ScriptLoader.HotSwap();
-            #else
-            if (ModifierKeys.HasFlag(Keys.Shift)){
-                ScriptLoader.ClearCache();
-            }
-            #endif
-
             ignoreUpdateCheckError = false;
             browser.ReloadToTweetDeck();
             AnalyticsFile.BrowserReloads.Trigger();
@@ -514,12 +510,10 @@ 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);
 
@@ -528,10 +522,31 @@ namespace TweetDuck.Core{
                     };
                 }
                 
-            videoPlayer.Launch(url, username);
+                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);
+                }
+            }
+            
             AnalyticsFile.VideoPlays.Trigger();
         }
 
+        public void StopVideo(){
+            videoPlayer?.Close();
+        }
+
         public bool ProcessBrowserKey(Keys key){
             if (videoPlayer != null && videoPlayer.Running){
                 videoPlayer.SendKeyEvent(key);

Core/Handling/ContextMenuBase.cs

@@ -6,19 +6,19 @@ using TweetDuck.Core.Controls;
 using TweetDuck.Core.Utils;
 using System.Linq;
 using TweetDuck.Configuration;
-using TweetDuck.Core.Bridge;
+using TweetDuck.Core.Adapters;
 using TweetDuck.Core.Management;
 using TweetDuck.Core.Notification;
 using TweetDuck.Core.Other;
 using TweetDuck.Core.Other.Analytics;
-using TweetDuck.Resources;
 using TweetLib.Core.Features.Twitter;
 using TweetLib.Core.Utils;
 
 namespace TweetDuck.Core.Handling{
     abstract class ContextMenuBase : IContextMenuHandler{
-        protected static UserConfig Config => Program.Config.User;
+        public static ContextInfo CurrentInfo { get; } = new ContextInfo();
 
+        protected static UserConfig Config => Program.Config.User;
         private static ImageQuality ImageQuality => Config.TwitterImageQuality;
         
         private const CefMenuCommand MenuOpenLinkUrl     = (CefMenuCommand)26500;
@@ -42,11 +42,11 @@ namespace TweetDuck.Core.Handling{
         }
 
         public virtual void OnBeforeContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model){
-            if (!TwitterUtils.IsTweetDeckWebsite(frame) || browser.IsLoading){
+            if (!TwitterUrls.IsTweetDeck(frame.Url) || browser.IsLoading){
-                Context = TweetDeckBridge.ContextInfo.Reset();
+                Context = CurrentInfo.Reset();
             }
             else{
-                Context = TweetDeckBridge.ContextInfo.Create(parameters);
+                Context = CurrentInfo.Create(parameters);
             }
             
             if (parameters.TypeFlags.HasFlag(ContextMenuType.Selection) && !parameters.TypeFlags.HasFlag(ContextMenuType.Editable)){
@@ -56,12 +56,12 @@ namespace TweetDuck.Core.Handling{
                 model.AddSeparator();
             }
 
-            string TextOpen(string name) => "Open "+name+" in browser";
+            static string TextOpen(string name) => "Open " + name + " in browser";
-            string TextCopy(string name) => "Copy "+name+" address";
+            static string TextCopy(string name) => "Copy " + name + " address";
-            string TextSave(string name) => "Save "+name+" as...";
+            static string TextSave(string name) => "Save " + name + " as...";
             
             if (Context.Types.HasFlag(ContextInfo.ContextType.Link) && !Context.UnsafeLinkUrl.EndsWith("tweetdeck.twitter.com/#", StringComparison.Ordinal)){
-                if (TwitterUtils.RegexAccount.IsMatch(Context.UnsafeLinkUrl)){
+                if (TwitterUrls.RegexAccount.IsMatch(Context.UnsafeLinkUrl)){
                     model.AddItem(MenuOpenLinkUrl, TextOpen("account"));
                     model.AddItem(MenuCopyLinkUrl, TextCopy("account"));
                     model.AddItem(MenuCopyUsername, "Copy account username");
@@ -80,7 +80,7 @@ namespace TweetDuck.Core.Handling{
                 model.AddItem(MenuSaveMedia, TextSave("video"));
                 model.AddSeparator();
             }
-            else if (Context.Types.HasFlag(ContextInfo.ContextType.Image) && Context.MediaUrl != TweetNotification.AppLogo.Url){
+            else if (Context.Types.HasFlag(ContextInfo.ContextType.Image) && Context.MediaUrl != FormNotificationBase.AppLogo.Url){
                 model.AddItem(MenuViewImage, "View image in photo viewer");
                 model.AddItem(MenuOpenMediaUrl, TextOpen("image"));
                 model.AddItem(MenuCopyMediaUrl, TextCopy("image"));
@@ -108,7 +108,7 @@ namespace TweetDuck.Core.Handling{
 
                 case MenuCopyUsername: {
                     string url = Context.UnsafeLinkUrl;
-                    Match match = TwitterUtils.RegexAccount.Match(url);
+                    Match match = TwitterUrls.RegexAccount.Match(url);
 
                     SetClipboardText(control, match.Success ? match.Groups[1].Value : url);
                     control.InvokeAsyncSafe(analytics.AnalyticsFile.CopiedUsernames.Trigger);
@@ -116,11 +116,11 @@ namespace TweetDuck.Core.Handling{
                 }
 
                 case MenuOpenMediaUrl:
-                    OpenBrowser(control, TwitterUtils.GetMediaLink(Context.MediaUrl, ImageQuality));
+                    OpenBrowser(control, TwitterUrls.GetMediaLink(Context.MediaUrl, ImageQuality));
                     break;
 
                 case MenuCopyMediaUrl:
-                    SetClipboardText(control, TwitterUtils.GetMediaLink(Context.MediaUrl, ImageQuality));
+                    SetClipboardText(control, TwitterUrls.GetMediaLink(Context.MediaUrl, ImageQuality));
                     break;
 
                 case MenuViewImage: {
@@ -178,7 +178,7 @@ namespace TweetDuck.Core.Handling{
                     break;
                     
                 case MenuOpenDevTools:
-                    browserControl.ShowDevTools();
+                    browserControl.OpenDevToolsCustom();
                     break;
             }
 
@@ -186,7 +186,7 @@ namespace TweetDuck.Core.Handling{
         }
 
         public virtual void OnContextMenuDismissed(IWebBrowser browserControl, IBrowser browser, IFrame frame){
-            Context = TweetDeckBridge.ContextInfo.Reset();
+            Context = CurrentInfo.Reset();
         }
 
         public virtual bool RunContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model, IRunContextMenuCallback callback){
@@ -194,7 +194,7 @@ namespace TweetDuck.Core.Handling{
         }
 
         protected static void DeselectAll(IFrame frame){
-            ScriptLoader.ExecuteScript(frame, "window.getSelection().removeAllRanges()", "gen:deselect");
+            CefScriptExecutor.RunScript(frame, "window.getSelection().removeAllRanges()", "gen:deselect");
         }
 
         protected static void OpenBrowser(Control control, string url){

Core/Handling/ContextMenuBrowser.cs

@@ -2,7 +2,7 @@
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Management;
-using TweetDuck.Core.Utils;
+using TweetLib.Core.Features.Twitter;
 
 namespace TweetDuck.Core.Handling{
     sealed class ContextMenuBrowser : ContextMenuBase{
@@ -53,7 +53,7 @@ namespace TweetDuck.Core.Handling{
 
             base.OnBeforeContextMenu(browserControl, browser, frame, parameters, model);
 
-            if (isSelecting && !isEditing && TwitterUtils.IsTweetDeckWebsite(frame)){
+            if (isSelecting && !isEditing && TwitterUrls.IsTweetDeck(frame.Url)){
                 InsertSelectionSearchItem(model, MenuSearchInColumn, "Search in a column");
             }
 

Core/Handling/General/BrowserProcessHandler.cs

@@ -11,13 +11,12 @@ namespace TweetDuck.Core.Handling.General{
 
         private static void UpdatePrefsInternal(){
             UserConfig config = Program.Config.User;
+            using IRequestContext ctx = Cef.GetGlobalRequestContext();
 
-            using(IRequestContext ctx = Cef.GetGlobalRequestContext()){
             ctx.SetPreference("browser.enable_spellchecking", config.EnableSpellCheck, out string _);
             ctx.SetPreference("spellcheck.dictionary", config.SpellCheckLanguage, out string _);
             ctx.SetPreference("settings.a11y.animation_policy", config.EnableAnimatedImages ? "allowed" : "none", out string _);
         }
-        }
 
         void IBrowserProcessHandler.OnContextInitialized(){
             UpdatePrefsInternal();

Core/Handling/KeyboardHandlerBase.cs

@@ -9,7 +9,7 @@ namespace TweetDuck.Core.Handling{
         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(() => {

Core/Handling/RequestHandlerBase.cs

@@ -11,7 +11,7 @@ using TweetLib.Core.Utils;
 
 namespace TweetDuck.Core.Handling{
     class RequestHandlerBase : DefaultRequestHandler{
-        private static readonly Regex TweetDeckResourceUrl = new Regex(@"/dist/(.*?)\.(.*?)\.(css|js)$", RegexOptions.Compiled);
+        private static readonly Regex TweetDeckResourceUrl = new Regex(@"/dist/(.*?)\.(.*?)\.(css|js)$");
         private static readonly SortedList<string, string> TweetDeckHashes = new SortedList<string, string>(4);
 
         public static void LoadResourceRewriteRules(string rules){

Core/Handling/RequestHandlerBrowser.cs

@@ -2,6 +2,7 @@
 using CefSharp;
 using TweetDuck.Core.Handling.Filters;
 using TweetDuck.Core.Utils;
+using TweetLib.Core.Features.Twitter;
 
 namespace TweetDuck.Core.Handling{
     sealed class RequestHandlerBrowser : RequestHandlerBase{
@@ -15,7 +16,7 @@ namespace TweetDuck.Core.Handling{
         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 = TwitterUtils.TweetDeckURL; // redirect plain twitter.com requests, fixes bugs with login 2FA
+                    request.Url = TwitterUrls.TweetDeck; // redirect plain twitter.com requests, fixes bugs with login 2FA
                 }
             }
             else if (request.ResourceType == ResourceType.Script){
@@ -41,6 +42,9 @@ namespace TweetDuck.Core.Handling{
                 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);
         }

Core/Management/ProfileManager.cs

@@ -3,7 +3,6 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using TweetDuck.Core.Other;
-using TweetDuck.Plugins;
 using TweetLib.Core.Data;
 using TweetLib.Core.Features.Plugins;
 using TweetLib.Core.Features.Plugins.Enums;
@@ -74,7 +73,7 @@ namespace TweetDuck.Core.Management{
             Items items = Items.None;
 
             try{
-                using(CombinedFileStream stream = new CombinedFileStream(new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.None))){
+                using CombinedFileStream stream = new CombinedFileStream(new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.None));
                 string key;
 
                 while((key = stream.SkipFile()) != null){
@@ -97,7 +96,6 @@ namespace TweetDuck.Core.Management{
                             break;
                     }
                 }
-                }
             }catch(Exception){
                 items = Items.None;
             }
@@ -141,7 +139,7 @@ namespace TweetDuck.Core.Management{
 
                                     entry.WriteToFile(Path.Combine(Program.PluginDataPath, value[0], value[1]), true);
 
-                                    if (!plugins.IsPluginInstalled(value[0])){
+                                    if (!plugins.Plugins.Any(plugin => plugin.Identifier.Equals(value[0]))){
                                         missingPlugins.Add(value[0]);
                                     }
                                 }

Core/Management/VideoPlayer.cs

@@ -26,7 +26,7 @@ namespace TweetDuck.Core.Management{
             this.owner.FormClosing += owner_FormClosing;
         }
 
-        public void Launch(string url, string username){
+        public void Launch(string videoUrl, string tweetUrl, string username){
             if (Running){
                 Destroy();
                 isClosing = false;
@@ -40,11 +40,11 @@ namespace TweetDuck.Core.Management{
 
                 if ((process = Process.Start(new ProcessStartInfo{
                     FileName = Path.Combine(Program.ProgramPath, "TweetDuck.Video.exe"),
-                    Arguments = $"{owner.Handle} {(int)Math.Floor(100F*owner.GetDPIScale())} {Config.VideoPlayerVolume} \"{url}\" \"{pipe.GenerateToken()}\"",
+                    Arguments = $"{owner.Handle} {(int)Math.Floor(100F * owner.GetDPIScale())} {Config.VideoPlayerVolume} \"{videoUrl}\" \"{pipe.GenerateToken()}\"",
                     UseShellExecute = false,
                     RedirectStandardOutput = true
                 })) != null){
-                    currentInstance = new Instance(process, pipe, url, username);
+                    currentInstance = new Instance(process, pipe, videoUrl, tweetUrl, username);
 
                     process.EnableRaisingEvents = true;
                     process.Exited += process_Exited;
@@ -81,7 +81,7 @@ namespace TweetDuck.Core.Management{
                     case "download":
                         if (currentInstance != null){
                             owner.AnalyticsFile.DownloadedVideos.Trigger();
-                            TwitterUtils.DownloadVideo(currentInstance.Url, currentInstance.Username);
+                            TwitterUtils.DownloadVideo(currentInstance.VideoUrl, currentInstance.Username);
                         }
 
                         break;
@@ -145,7 +145,7 @@ namespace TweetDuck.Core.Management{
             }
 
             int exitCode = currentInstance.Process.ExitCode;
-            string url = currentInstance.Url;
+            string tweetUrl = currentInstance.TweetUrl;
 
             currentInstance.Dispose();
             currentInstance = null;
@@ -153,14 +153,14 @@ namespace TweetDuck.Core.Management{
             switch(exitCode){
                 case 3: // CODE_LAUNCH_FAIL
                     if (FormMessage.Error("Video Playback Error", "Error launching video player, this may be caused by missing Windows Media Player. Do you want to open the video in your browser?", FormMessage.Yes, FormMessage.No)){
-                        BrowserUtils.OpenExternalBrowser(url);
+                        BrowserUtils.OpenExternalBrowser(tweetUrl);
                     }
 
                     break;
 
                 case 4: // CODE_MEDIA_ERROR
                     if (FormMessage.Error("Video Playback Error", "The video could not be loaded, most likely due to unknown format. Do you want to open the video in your browser?", FormMessage.Yes, FormMessage.No)){
-                        BrowserUtils.OpenExternalBrowser(url);
+                        BrowserUtils.OpenExternalBrowser(tweetUrl);
                     }
 
                     break;
@@ -184,13 +184,15 @@ namespace TweetDuck.Core.Management{
             public Process Process { get; }
             public DuplexPipe.Server Pipe { get; }
 
-            public string Url { get; }
+            public string VideoUrl { get; }
+            public string TweetUrl { get; }
             public string Username { get; }
 
-            public Instance(Process process, DuplexPipe.Server pipe, string url, string username){
+            public Instance(Process process, DuplexPipe.Server pipe, string videoUrl, string tweetUrl, string username){
                 this.Process = process;
                 this.Pipe = pipe;
-                this.Url = url;
+                this.VideoUrl = videoUrl;
+                this.TweetUrl = tweetUrl;
                 this.Username = username;
             }
 

Core/Notification/Example/FormNotificationExample.cs

@@ -2,17 +2,17 @@
 using System.Windows.Forms;
 using CefSharp;
 using TweetDuck.Core.Controls;
-using TweetDuck.Plugins;
+using TweetLib.Core.Features.Notifications;
-using TweetDuck.Resources;
+using TweetLib.Core.Features.Plugins;
 
 namespace TweetDuck.Core.Notification.Example{
     sealed class FormNotificationExample : FormNotificationMain{
         public override bool RequiresResize => true;
-        protected override bool CanDragWindow => Config.NotificationPosition == TweetNotification.Position.Custom;
+        protected override bool CanDragWindow => Config.NotificationPosition == DesktopNotification.Position.Custom;
 
         protected override FormBorderStyle NotificationBorderStyle{
             get{
-                if (Config.NotificationSize == TweetNotification.Size.Custom){
+                if (Config.NotificationSize == DesktopNotification.Size.Custom){
                     switch(base.NotificationBorderStyle){
                         case FormBorderStyle.FixedSingle: return FormBorderStyle.Sizable;
                         case FormBorderStyle.FixedToolWindow: return FormBorderStyle.SizableToolWindow;
@@ -27,18 +27,18 @@ namespace TweetDuck.Core.Notification.Example{
 
         public event EventHandler Ready;
 
-        private readonly TweetNotification exampleNotification;
+        private readonly DesktopNotification exampleNotification;
 
         public FormNotificationExample(FormBrowser owner, PluginManager pluginManager) : base(owner, pluginManager, false){
             browser.LoadingStateChanged += browser_LoadingStateChanged;
 
-            string exampleTweetHTML = ScriptLoader.LoadResourceSilent("pages/example.html")?.Replace("{avatar}", TweetNotification.AppLogo.Url) ?? string.Empty;
+            string exampleTweetHTML = Program.Resources.LoadSilent("pages/example.html")?.Replace("{avatar}", AppLogo.Url) ?? string.Empty;
 
             #if DEBUG
             exampleTweetHTML = exampleTweetHTML.Replace("</p>", @"</p><div style='margin-top:256px'>Scrollbar test padding...</div>");
             #endif
 
-            exampleNotification = new TweetNotification(string.Empty, string.Empty, "Home", exampleTweetHTML, 176, string.Empty, string.Empty);
+            exampleNotification = new DesktopNotification(string.Empty, string.Empty, "Home", exampleTweetHTML, 176, string.Empty, string.Empty);
         }
 
         private void browser_LoadingStateChanged(object sender, LoadingStateChangedEventArgs e){

Core/Notification/FormNotificationBase.cs

@@ -1,20 +1,28 @@
 using CefSharp.WinForms;
 using System.Drawing;
 using System.Windows.Forms;
+using CefSharp;
 using TweetDuck.Configuration;
-using TweetDuck.Core.Bridge;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Handling;
 using TweetDuck.Core.Handling.General;
 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{
     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 string FontSize = null;
+        public static string HeadLayout = null;
+
         protected static UserConfig Config => Program.Config.User;
         
         protected static int FontSizeLevel{
-            get => TweetDeckBridge.FontSize switch{
+            get => FontSize switch{
                 "largest"  => 4,
                 "large"    => 3,
                 "small"    => 1,
@@ -37,19 +45,19 @@ namespace TweetDuck.Core.Notification{
                 int edgeDist = Config.NotificationEdgeDistance;
 
                 switch(Config.NotificationPosition){
-                    case TweetNotification.Position.TopLeft:
+                    case DesktopNotification.Position.TopLeft:
                         return new Point(screen.WorkingArea.X + edgeDist, screen.WorkingArea.Y + edgeDist);
 
-                    case TweetNotification.Position.TopRight:
+                    case DesktopNotification.Position.TopRight:
                         return new Point(screen.WorkingArea.X + screen.WorkingArea.Width - edgeDist - Width, screen.WorkingArea.Y + edgeDist);
 
-                    case TweetNotification.Position.BottomLeft:
+                    case DesktopNotification.Position.BottomLeft:
                         return new Point(screen.WorkingArea.X + edgeDist, screen.WorkingArea.Y + screen.WorkingArea.Height - edgeDist - Height);
 
-                    case TweetNotification.Position.BottomRight:
+                    case DesktopNotification.Position.BottomRight:
                         return new Point(screen.WorkingArea.X + screen.WorkingArea.Width - edgeDist - Width, screen.WorkingArea.Y + screen.WorkingArea.Height - edgeDist - Height);
 
-                    case TweetNotification.Position.Custom:
+                    case DesktopNotification.Position.Custom:
                         if (!Config.IsCustomNotificationPositionSet){
                             Config.CustomNotificationPosition = new Point(screen.WorkingArea.X + screen.WorkingArea.Width - edgeDist - Width, screen.WorkingArea.Y + edgeDist);
                             Config.Save();
@@ -99,7 +107,7 @@ namespace TweetDuck.Core.Notification{
         
         private readonly ResourceHandlerNotification resourceHandler = new ResourceHandlerNotification();
 
-        private TweetNotification currentNotification;
+        private DesktopNotification currentNotification;
         private int pauseCounter;
         
         public string CurrentTweetUrl => currentNotification?.TweetUrl;
@@ -120,8 +128,8 @@ namespace TweetDuck.Core.Notification{
             this.owner.FormClosed += owner_FormClosed;
 
             ResourceHandlerFactory resourceHandlerFactory = new ResourceHandlerFactory();
-            resourceHandlerFactory.RegisterHandler(TwitterUtils.TweetDeckURL, this.resourceHandler);
+            resourceHandlerFactory.RegisterHandler(TwitterUrls.TweetDeck, this.resourceHandler);
-            resourceHandlerFactory.RegisterHandler(TweetNotification.AppLogo);
+            resourceHandlerFactory.RegisterHandler(AppLogo);
 
             this.browser = new ChromiumWebBrowser("about:blank"){
                 MenuHandler = new ContextMenuNotification(this, enableContextMenu),
@@ -186,13 +194,13 @@ namespace TweetDuck.Core.Notification{
             }
         }
 
-        protected abstract string GetTweetHTML(TweetNotification tweet);
+        protected abstract string GetTweetHTML(DesktopNotification tweet);
 
-        protected virtual void LoadTweet(TweetNotification tweet){
+        protected virtual void LoadTweet(DesktopNotification tweet){
             currentNotification = tweet;
             resourceHandler.SetHTML(GetTweetHTML(tweet));
 
-            browser.Load(TwitterUtils.TweetDeckURL);
+            browser.Load(TwitterUrls.TweetDeck);
             DisplayTooltip(null);
         }
 

Core/Notification/FormNotificationMain.cs

@@ -2,13 +2,15 @@
 using System;
 using System.Drawing;
 using System.Windows.Forms;
+using TweetDuck.Core.Adapters;
 using TweetDuck.Core.Bridge;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Handling;
 using TweetDuck.Core.Utils;
 using TweetDuck.Plugins;
-using TweetDuck.Resources;
 using TweetLib.Core.Data;
+using TweetLib.Core.Features.Notifications;
+using TweetLib.Core.Features.Plugins;
 using TweetLib.Core.Features.Plugins.Enums;
 
 namespace TweetDuck.Core.Notification{
@@ -45,14 +47,14 @@ namespace TweetDuck.Core.Notification{
 
         private int BaseClientWidth{
             get => Config.NotificationSize switch{
-                TweetNotification.Size.Custom => Config.CustomNotificationSize.Width,
+                DesktopNotification.Size.Custom => Config.CustomNotificationSize.Width,
                 _ => BrowserUtils.Scale(284, SizeScale * (1.0 + 0.05 * FontSizeLevel))
             };
         }
 
         private int BaseClientHeight{
             get => Config.NotificationSize switch{
-                TweetNotification.Size.Custom => Config.CustomNotificationSize.Height,
+                DesktopNotification.Size.Custom => Config.CustomNotificationSize.Height,
                 _ => BrowserUtils.Scale(122, SizeScale * (1.0 + 0.08 * FontSizeLevel))
             };
         }
@@ -73,7 +75,7 @@ namespace TweetDuck.Core.Notification{
             browser.LoadingStateChanged += Browser_LoadingStateChanged;
             browser.FrameLoadEnd += Browser_FrameLoadEnd;
 
-            plugins.Register(browser, PluginEnvironment.Notification);
+            plugins.Register(PluginEnvironment.Notification, new PluginDispatcher(browser));
 
             mouseHookDelegate = MouseHookProc;
             Disposed += (sender, args) => StopMouseHook(true);
@@ -154,7 +156,7 @@ namespace TweetDuck.Core.Notification{
 
             if (frame.IsMain && browser.Address != "about:blank"){
                 frame.ExecuteJavaScriptAsync(PropertyBridge.GenerateScript(PropertyBridge.Environment.Notification));
-                ScriptLoader.ExecuteFile(frame, "notification.js", this);
+                CefScriptExecutor.RunFile(frame, "notification.js");
             }
         }
 
@@ -164,7 +166,16 @@ namespace TweetDuck.Core.Notification{
         }
 
         private void timerHideProgress_Tick(object sender, EventArgs e){
-            if (Bounds.Contains(Cursor.Position) || FreezeTimer || ContextMenuOpen){
+            bool isCursorInside = Bounds.Contains(Cursor.Position);
+
+            if (isCursorInside){
+                StartMouseHook();
+            }
+            else{
+                StopMouseHook(false);
+            }
+
+            if (isCursorInside || FreezeTimer || ContextMenuOpen){
                 return;
             }
 
@@ -180,7 +191,7 @@ namespace TweetDuck.Core.Notification{
 
         // notification methods
 
-        public virtual void ShowNotification(TweetNotification notification){
+        public virtual void ShowNotification(DesktopNotification notification){
             LoadTweet(notification);
         }
 
@@ -217,8 +228,8 @@ namespace TweetDuck.Core.Notification{
             }
         }
 
-        protected override string GetTweetHTML(TweetNotification tweet){
+        protected override string GetTweetHTML(DesktopNotification tweet){
-            string html = tweet.GenerateHtml(BodyClasses, this);
+            string html = tweet.GenerateHtml(BodyClasses, HeadLayout, Config.CustomNotificationCSS);
 
             foreach(InjectedHTML injection in plugins.NotificationInjections){
                 html = injection.InjectInto(html);
@@ -227,7 +238,7 @@ namespace TweetDuck.Core.Notification{
             return html;
         }
 
-        protected override void LoadTweet(TweetNotification tweet){
+        protected override void LoadTweet(DesktopNotification tweet){
             timerProgress.Stop();
             totalTime = timeLeft = tweet.GetDisplayDuration(Config.NotificationDurationValue);
             progressBarTimer.Value = Config.NotificationTimerCountDown ? progressBarTimer.Maximum : progressBarTimer.Minimum;
@@ -255,7 +266,6 @@ namespace TweetDuck.Core.Notification{
             }
             
             MoveToVisibleLocation();
-            StartMouseHook();
         }
 
         protected virtual void OnNotificationReady(){

Core/Notification/FormNotificationTweet.cs

@@ -1,9 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
-using TweetDuck.Plugins;
 using System.Windows.Forms;
 using TweetDuck.Core.Utils;
+using TweetLib.Core.Features.Notifications;
+using TweetLib.Core.Features.Plugins;
 
 namespace TweetDuck.Core.Notification{
     sealed partial class FormNotificationTweet : FormNotificationMain{
@@ -25,7 +26,7 @@ namespace TweetDuck.Core.Notification{
             }
         }
 
-        private readonly Queue<TweetNotification> tweetQueue = new Queue<TweetNotification>(4);
+        private readonly Queue<DesktopNotification> tweetQueue = new Queue<DesktopNotification>(4);
         private bool needsTrim;
         private bool hasTemporarilyMoved;
 
@@ -81,7 +82,7 @@ namespace TweetDuck.Core.Notification{
 
         // notification methods
 
-        public override void ShowNotification(TweetNotification notification){
+        public override void ShowNotification(DesktopNotification notification){
             tweetQueue.Enqueue(notification);
             
             if (!IsPaused){

Core/Notification/Screenshot/FormNotificationScreenshotable.cs

@@ -3,12 +3,13 @@ using System.Drawing;
 using System.Drawing.Imaging;
 using System.Windows.Forms;
 using CefSharp;
+using TweetDuck.Core.Adapters;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Other;
 using TweetDuck.Core.Utils;
-using TweetDuck.Plugins;
-using TweetDuck.Resources;
 using TweetLib.Core.Data;
+using TweetLib.Core.Features.Notifications;
+using TweetLib.Core.Features.Plugins;
 
 namespace TweetDuck.Core.Notification.Screenshot{
     sealed class FormNotificationScreenshotable : FormNotificationBase{
@@ -29,24 +30,23 @@ namespace TweetDuck.Core.Notification.Screenshot{
                     return;
                 }
 
-                string script = ScriptLoader.LoadResourceSilent("screenshot.js");
+                string script = Program.Resources.LoadSilent("screenshot.js");
                 
                 if (script == null){
                     this.InvokeAsyncSafe(callback);
                     return;
                 }
 
-                using(IFrame frame = args.Browser.MainFrame){
+                using IFrame frame = args.Browser.MainFrame;
-                    ScriptLoader.ExecuteScript(frame, script.Replace("{width}", realWidth.ToString()).Replace("{frames}", TweetScreenshotManager.WaitFrames.ToString()), "gen:screenshot");
+                CefScriptExecutor.RunScript(frame, script.Replace("{width}", realWidth.ToString()).Replace("{frames}", TweetScreenshotManager.WaitFrames.ToString()), "gen:screenshot");
-                }
             };
             
             SetNotificationSize(realWidth, 1024);
-            LoadTweet(new TweetNotification(string.Empty, string.Empty, string.Empty, html, 0, string.Empty, string.Empty));
+            LoadTweet(new DesktopNotification(string.Empty, string.Empty, string.Empty, html, 0, string.Empty, string.Empty));
         }
 
-        protected override string GetTweetHTML(TweetNotification tweet){
+        protected override string GetTweetHTML(DesktopNotification tweet){
-            string html = tweet.GenerateHtml("td-screenshot", this);
+            string html = tweet.GenerateHtml("td-screenshot", HeadLayout, Config.CustomNotificationCSS);
 
             foreach(InjectedHTML injection in plugins.NotificationInjections){
                 html = injection.InjectInto(html);

Core/Notification/Screenshot/TweetScreenshotManager.cs

@@ -9,7 +9,7 @@
 using System;
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
-using TweetDuck.Plugins;
+using TweetLib.Core.Features.Plugins;
 
 #if GEN_SCREENSHOT_FRAMES
 using System.Drawing.Imaging;

Core/Other/Analytics/AnalyticsManager.cs

@@ -8,8 +8,8 @@ using System.Threading.Tasks;
 using System.Timers;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Utils;
-using TweetDuck.Plugins;
 using TweetLib.Core;
+using TweetLib.Core.Features.Plugins;
 using TweetLib.Core.Utils;
 
 namespace TweetDuck.Core.Other.Analytics{

Core/Other/Analytics/AnalyticsReportGenerator.cs

@@ -8,10 +8,9 @@ using TweetDuck.Configuration;
 using System.Linq;
 using System.Management;
 using System.Text.RegularExpressions;
-using TweetDuck.Core.Notification;
 using TweetDuck.Core.Utils;
-using TweetDuck.Plugins;
 using TweetLib.Core;
+using TweetLib.Core.Features.Notifications;
 using TweetLib.Core.Features.Plugins;
 using TweetLib.Core.Features.Plugins.Enums;
 using TweetLib.Core.Utils;
@@ -144,7 +143,8 @@ namespace TweetDuck.Core.Other.Analytics{
             string osName, osEdition, osBuild;
 
             try{
-                using(RegistryKey key = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion", false)){
+                using RegistryKey key = Registry.LocalMachine.OpenSubKey(@"SOFTWARE\Microsoft\Windows NT\CurrentVersion", false);
+
                 // ReSharper disable once PossibleNullReferenceException
                 osName = key.GetValue("ProductName") as string;
                 osBuild = key.GetValue("CurrentBuild") as string;
@@ -158,7 +158,6 @@ namespace TweetDuck.Core.Other.Analytics{
                         osEdition = match.Groups[2].Value;
                     }
                 }
-                }
             }catch{
                 osName = osEdition = osBuild = null;
             }
@@ -168,11 +167,11 @@ namespace TweetDuck.Core.Other.Analytics{
             SystemBuild = osBuild ?? "(unknown)";
 
             try{
-                using(ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT Capacity FROM Win32_PhysicalMemory")){
+                using ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT Capacity FROM Win32_PhysicalMemory");
+
                 foreach(ManagementBaseObject obj in searcher.Get()){
                     RamSize += (int)((ulong)obj["Capacity"] / (1024L * 1024L));
                 }
-                }
             }catch{
                 RamSize = 0;
             }
@@ -180,7 +179,8 @@ namespace TweetDuck.Core.Other.Analytics{
             string gpu = null;
 
             try{
-                using(ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT Caption FROM Win32_VideoController")){
+                using ManagementObjectSearcher searcher = new ManagementObjectSearcher("SELECT Caption FROM Win32_VideoController");
+
                 foreach(ManagementBaseObject obj in searcher.Get()){
                     string vendor = obj["Caption"] as string;
 
@@ -188,7 +188,6 @@ namespace TweetDuck.Core.Other.Analytics{
                         gpu = vendor;
                     }
                 }
-                }
             }catch{
                 // rip
             }
@@ -218,17 +217,17 @@ namespace TweetDuck.Core.Other.Analytics{
 
         private static string NotificationPosition{
             get => UserConfig.NotificationPosition switch{
-                TweetNotification.Position.TopLeft     => "top left",
+                DesktopNotification.Position.TopLeft     => "top left",
-                TweetNotification.Position.TopRight    => "top right",
+                DesktopNotification.Position.TopRight    => "top right",
-                TweetNotification.Position.BottomLeft  => "bottom left",
+                DesktopNotification.Position.BottomLeft  => "bottom left",
-                TweetNotification.Position.BottomRight => "bottom right",
+                DesktopNotification.Position.BottomRight => "bottom right",
                 _                                        => "custom"
             };
         }
 
         private static string NotificationSize{
             get => UserConfig.NotificationSize switch{
-                TweetNotification.Size.Auto => "auto",
+                DesktopNotification.Size.Auto => "auto",
                 _ => RoundUp(UserConfig.CustomNotificationSize.Width, 20) + "x" + RoundUp(UserConfig.CustomNotificationSize.Height, 20)
             };
         }

Core/Other/FormGuide.cs

@@ -7,8 +7,8 @@ using TweetDuck.Core.Handling;
 using TweetDuck.Core.Handling.General;
 using TweetDuck.Core.Utils;
 using System.Text.RegularExpressions;
+using TweetDuck.Core.Adapters;
 using TweetDuck.Data;
-using TweetDuck.Resources;
 
 namespace TweetDuck.Core.Other{
     sealed partial class FormGuide : Form, FormManager.IAppDialog{
@@ -116,7 +116,7 @@ namespace TweetDuck.Core.Other{
         }
 
         private void browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
-            ScriptLoader.ExecuteScript(e.Frame, "Array.prototype.forEach.call(document.getElementsByTagName('A'), ele => ele.addEventListener('click', e => { e.preventDefault(); window.open(ele.getAttribute('href')); }))", "gen:links");
+            CefScriptExecutor.RunScript(e.Frame, "Array.prototype.forEach.call(document.getElementsByTagName('A'), ele => ele.addEventListener('click', e => { e.preventDefault(); window.open(ele.getAttribute('href')); }))", "gen:links");
         }
     }
 }

Core/Other/FormPlugins.Designer.cs

@@ -1,4 +1,4 @@
-using TweetDuck.Plugins;
+using TweetDuck.Core.Controls;
 
 namespace TweetDuck.Core.Other {
     partial class FormPlugins {
@@ -29,7 +29,7 @@ namespace TweetDuck.Core.Other {
             this.btnClose = new System.Windows.Forms.Button();
             this.btnReload = new System.Windows.Forms.Button();
             this.btnOpenFolder = new System.Windows.Forms.Button();
-            this.flowLayoutPlugins = new PluginListFlowLayout();
+            this.flowLayoutPlugins = new FlowLayoutPanelNoHScroll();
             this.timerLayout = new System.Windows.Forms.Timer(this.components);
             this.SuspendLayout();
             // 
@@ -119,7 +119,7 @@ namespace TweetDuck.Core.Other {
         private System.Windows.Forms.Button btnClose;
         private System.Windows.Forms.Button btnReload;
         private System.Windows.Forms.Button btnOpenFolder;
-        private PluginListFlowLayout flowLayoutPlugins;
+        private FlowLayoutPanelNoHScroll flowLayoutPlugins;
         private System.Windows.Forms.Timer timerLayout;
     }
 }

Core/Other/FormPlugins.cs

@@ -1,10 +1,10 @@
 using System;
-using System.Diagnostics;
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
 using TweetDuck.Plugins;
+using TweetLib.Core;
 using TweetLib.Core.Features.Plugins;
 
 namespace TweetDuck.Core.Other{
@@ -95,7 +95,7 @@ namespace TweetDuck.Core.Other{
         }
 
         private void btnOpenFolder_Click(object sender, EventArgs e){
-            using(Process.Start("explorer.exe", '"'+pluginManager.PathCustomPlugins+'"')){}
+            App.SystemHandler.OpenFileExplorer(pluginManager.PathCustomPlugins);
         }
 
         private void btnReload_Click(object sender, EventArgs e){

Core/Other/FormSettings.cs

@@ -9,7 +9,7 @@ using TweetDuck.Core.Other.Analytics;
 using TweetDuck.Core.Other.Settings;
 using TweetDuck.Core.Other.Settings.Dialogs;
 using TweetDuck.Core.Utils;
-using TweetDuck.Plugins;
+using TweetLib.Core.Features.Plugins;
 using TweetLib.Core.Features.Updates;
 
 namespace TweetDuck.Core.Other{
@@ -41,6 +41,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));
 

Core/Other/Settings/BaseTabSettings.cs

@@ -9,7 +9,7 @@ namespace TweetDuck.Core.Other.Settings{
 
         public IEnumerable<Control> InteractiveControls{
             get{
-                IEnumerable<Control> FindInteractiveControls(Control parent){
+                static IEnumerable<Control> FindInteractiveControls(Control parent){
                     foreach(Control control in parent.Controls){
                         if (control is Panel subPanel){
                             foreach(Control subControl in FindInteractiveControls(subPanel)){

Core/Other/Settings/Dialogs/DialogSettingsExternalProgram.Designer.cs

@@ -0,0 +1,154 @@
+namespace TweetDuck.Core.Other.Settings.Dialogs {
+    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;
+    }
+}

Core/Other/Settings/Dialogs/DialogSettingsExternalProgram.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Windows.Forms;
+using TweetLib.Core.Utils;
+using IOPath = System.IO.Path;
+
+namespace TweetDuck.Core.Other.Settings.Dialogs{
+    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();
+        }
+    }
+}

Core/Other/Settings/Dialogs/DialogSettingsManage.cs

@@ -4,7 +4,7 @@ using System.IO;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
 using TweetDuck.Core.Management;
-using TweetDuck.Plugins;
+using TweetLib.Core.Features.Plugins;
 using TweetLib.Core.Utils;
 
 namespace TweetDuck.Core.Other.Settings.Dialogs{

Core/Other/Settings/TabSettingsAdvanced.Designer.cs

@@ -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;
     }
 }

Core/Other/Settings/TabSettingsAdvanced.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Diagnostics;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
@@ -7,6 +6,7 @@ using TweetDuck.Core.Controls;
 using TweetDuck.Core.Management;
 using TweetDuck.Core.Other.Settings.Dialogs;
 using TweetDuck.Core.Utils;
+using TweetLib.Core;
 
 namespace TweetDuck.Core.Other.Settings{
     sealed partial class TabSettingsAdvanced : BaseTabSettings{
@@ -44,6 +44,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 +67,8 @@ namespace TweetDuck.Core.Other.Settings{
             
             btnEditCefArgs.Click += btnEditCefArgs_Click;
             btnEditCSS.Click += btnEditCSS_Click;
+
+            checkDevToolsWindowOnTop.CheckedChanged += checkDevToolsWindowOnTop_CheckedChanged;
         }
 
         public override void OnClosing(){
@@ -67,11 +79,11 @@ namespace TweetDuck.Core.Other.Settings{
         #region Application
         
         private void btnOpenAppFolder_Click(object sender, EventArgs e){
-            using(Process.Start("explorer.exe", "\""+Program.ProgramPath+"\"")){}
+            App.SystemHandler.OpenFileExplorer(Program.ProgramPath);
         }
 
         private void btnOpenDataFolder_Click(object sender, EventArgs e){
-            using(Process.Start("explorer.exe", "\""+Program.StoragePath+"\"")){}
+            App.SystemHandler.OpenFileExplorer(Program.StoragePath);
         }
 
         private void btnRestart_Click(object sender, EventArgs e){
@@ -152,6 +164,13 @@ namespace TweetDuck.Core.Other.Settings{
             }
         }
 
+        #endregion
+        #region Development Tools
+
+        private void checkDevToolsWindowOnTop_CheckedChanged(object sender, EventArgs e){
+            Config.DevToolsWindowOnTop = checkDevToolsWindowOnTop.Checked;
+        }
+
         #endregion
     }
 }

Core/Other/Settings/TabSettingsFeedback.cs

@@ -3,7 +3,7 @@ using System.Windows.Forms;
 using TweetDuck.Core.Other.Analytics;
 using TweetDuck.Core.Other.Settings.Dialogs;
 using TweetDuck.Core.Utils;
-using TweetDuck.Plugins;
+using TweetLib.Core.Features.Plugins;
 
 namespace TweetDuck.Core.Other.Settings{
     sealed partial class TabSettingsFeedback : BaseTabSettings{

Core/Other/Settings/TabSettingsGeneral.Designer.cs

@@ -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);
@@ -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;
     }
 }

Core/Other/Settings/TabSettingsGeneral.cs

@@ -19,6 +19,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 +56,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 +68,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 +77,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 +101,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 +120,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 +142,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 +204,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 +247,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;
-                }
                 }
             }
 
-        private void comboBoxBrowserPath_SelectedIndexChanged(object sender, EventArgs e){
+            UpdateBrowserChangeButton();
-            if (comboBoxBrowserPath.SelectedIndex == browserListIndexCustom){
+        }
-                using(OpenFileDialog dialog = new OpenFileDialog{
+
-                    AutoUpgradeEnabled = true,
+        private void comboBoxCustomBrowser_SelectedIndexChanged(object sender, EventArgs e){
-                    DereferenceLinks = true,
+            if (comboBoxCustomBrowser.SelectedIndex == browserListIndexCustom){
-                    InitialDirectory = Path.GetDirectoryName(Config.BrowserPath), // returns null if argument is null
+                btnCustomBrowserChange_Click(sender, e);
-                    Title = "Open Links With...",
+            }
-                    Filter = "Executables (*.exe;*.bat;*.cmd)|*.exe;*.bat;*.cmd|All Files (*.*)|*.*"
+            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 btnCustomBrowserChange_Click(object sender, EventArgs e){
+            using(DialogSettingsExternalProgram dialog = new DialogSettingsExternalProgram("External Browser", "Open Links With..."){
+                Path = Config.BrowserPath,
+                Args = Config.BrowserPathArgs
             }){
                 if (dialog.ShowDialog() == DialogResult.OK){
-                        Config.BrowserPath = dialog.FileName;
+                    Config.BrowserPath = dialog.Path;
+                    Config.BrowserPathArgs = dialog.Args;
                 }
             }
 
-                comboBoxBrowserPath.SelectedIndexChanged -= comboBoxBrowserPath_SelectedIndexChanged;
+            comboBoxCustomBrowser.SelectedIndexChanged -= comboBoxCustomBrowser_SelectedIndexChanged;
             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 +401,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
     }
 }

Core/Other/Settings/TabSettingsNotifications.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
-using TweetDuck.Core.Notification;
 using TweetDuck.Core.Notification.Example;
+using TweetLib.Core.Features.Notifications;
 
 namespace TweetDuck.Core.Other.Settings{
     sealed partial class TabSettingsNotifications : BaseTabSettings{
@@ -66,18 +66,18 @@ namespace TweetDuck.Core.Other.Settings{
             toolTip.SetToolTip(radioLocCustom, "Drag the example notification window to the desired location.");
             
             switch(Config.NotificationPosition){
-                case TweetNotification.Position.TopLeft: radioLocTL.Checked = true; break;
+                case DesktopNotification.Position.TopLeft: radioLocTL.Checked = true; break;
-                case TweetNotification.Position.TopRight: radioLocTR.Checked = true; break;
+                case DesktopNotification.Position.TopRight: radioLocTR.Checked = true; break;
-                case TweetNotification.Position.BottomLeft: radioLocBL.Checked = true; break;
+                case DesktopNotification.Position.BottomLeft: radioLocBL.Checked = true; break;
-                case TweetNotification.Position.BottomRight: radioLocBR.Checked = true; break;
+                case DesktopNotification.Position.BottomRight: radioLocBR.Checked = true; break;
-                case TweetNotification.Position.Custom: radioLocCustom.Checked = true; break;
+                case DesktopNotification.Position.Custom: radioLocCustom.Checked = true; break;
             }
 
             comboBoxDisplay.Enabled = trackBarEdgeDistance.Enabled = !radioLocCustom.Checked;
             comboBoxDisplay.Items.Add("(Same as TweetDuck)");
 
             foreach(Screen screen in Screen.AllScreens){
-                comboBoxDisplay.Items.Add(screen.DeviceName.TrimStart('\\', '.')+" ("+screen.Bounds.Width+"x"+screen.Bounds.Height+")");
+                comboBoxDisplay.Items.Add($"{screen.DeviceName.TrimStart('\\', '.')} ({screen.Bounds.Width}x{screen.Bounds.Height})");
             }
 
             comboBoxDisplay.SelectedIndex = Math.Min(comboBoxDisplay.Items.Count - 1, Config.NotificationDisplay);
@@ -91,8 +91,8 @@ namespace TweetDuck.Core.Other.Settings{
             toolTip.SetToolTip(radioSizeCustom, "Resize the example notification window to the desired size.");
 
             switch(Config.NotificationSize){
-                case TweetNotification.Size.Auto: radioSizeAuto.Checked = true; break;
+                case DesktopNotification.Size.Auto: radioSizeAuto.Checked = true; break;
-                case TweetNotification.Size.Custom: radioSizeCustom.Checked = true; break;
+                case DesktopNotification.Size.Custom: radioSizeCustom.Checked = true; break;
             }
 
             trackBarScrollSpeed.SetValueSafe(Config.NotificationScrollSpeed);
@@ -219,10 +219,10 @@ namespace TweetDuck.Core.Other.Settings{
         #region Location
 
         private void radioLoc_CheckedChanged(object sender, EventArgs e){
-            if (radioLocTL.Checked)Config.NotificationPosition = TweetNotification.Position.TopLeft;
+            if (radioLocTL.Checked)Config.NotificationPosition = DesktopNotification.Position.TopLeft;
-            else if (radioLocTR.Checked)Config.NotificationPosition = TweetNotification.Position.TopRight;
+            else if (radioLocTR.Checked)Config.NotificationPosition = DesktopNotification.Position.TopRight;
-            else if (radioLocBL.Checked)Config.NotificationPosition = TweetNotification.Position.BottomLeft;
+            else if (radioLocBL.Checked)Config.NotificationPosition = DesktopNotification.Position.BottomLeft;
-            else if (radioLocBR.Checked)Config.NotificationPosition = TweetNotification.Position.BottomRight;
+            else if (radioLocBR.Checked)Config.NotificationPosition = DesktopNotification.Position.BottomRight;
 
             comboBoxDisplay.Enabled = trackBarEdgeDistance.Enabled = true;
             notification.ShowExampleNotification(false);
@@ -233,18 +233,18 @@ namespace TweetDuck.Core.Other.Settings{
                 Config.CustomNotificationPosition = notification.Location;
             }
 
-            Config.NotificationPosition = TweetNotification.Position.Custom;
+            Config.NotificationPosition = DesktopNotification.Position.Custom;
 
             comboBoxDisplay.Enabled = trackBarEdgeDistance.Enabled = false;
             notification.ShowExampleNotification(false);
 
             if (notification.IsFullyOutsideView() && FormMessage.Question("Notification is Outside View", "The notification seems to be outside of view, would you like to reset its position?", FormMessage.Yes, FormMessage.No)){
-                Config.NotificationPosition = TweetNotification.Position.TopRight;
+                Config.NotificationPosition = DesktopNotification.Position.TopRight;
                 notification.MoveToVisibleLocation();
 
                 Config.CustomNotificationPosition = notification.Location;
 
-                Config.NotificationPosition = TweetNotification.Position.Custom;
+                Config.NotificationPosition = DesktopNotification.Position.Custom;
                 notification.MoveToVisibleLocation();
             }
         }
@@ -265,7 +265,7 @@ namespace TweetDuck.Core.Other.Settings{
 
         private void radioSize_CheckedChanged(object sender, EventArgs e){
             if (radioSizeAuto.Checked){
-                Config.NotificationSize = TweetNotification.Size.Auto;
+                Config.NotificationSize = DesktopNotification.Size.Auto;
             }
             
             notification.ShowExampleNotification(false);
@@ -276,7 +276,7 @@ namespace TweetDuck.Core.Other.Settings{
                 Config.CustomNotificationSize = notification.BrowserSize;
             }
 
-            Config.NotificationSize = TweetNotification.Size.Custom;
+            Config.NotificationSize = DesktopNotification.Size.Custom;
             notification.ShowExampleNotification(false);
         }
 

Core/Other/Settings/TabSettingsTray.Designer.cs

@@ -0,0 +1,131 @@
+namespace TweetDuck.Core.Other.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;
+    }
+}

Core/Other/Settings/TabSettingsTray.cs

@@ -0,0 +1,42 @@
+using System;
+
+namespace TweetDuck.Core.Other.Settings{
+    sealed partial class TabSettingsTray : BaseTabSettings{
+        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
+    }
+}

Core/TweetDeckBrowser.cs

@@ -5,6 +5,7 @@ using System.Windows.Forms;
 using CefSharp;
 using CefSharp.WinForms;
 using TweetDuck.Configuration;
+using TweetDuck.Core.Adapters;
 using TweetDuck.Core.Bridge;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Handling;
@@ -12,8 +13,10 @@ using TweetDuck.Core.Handling.General;
 using TweetDuck.Core.Notification;
 using TweetDuck.Core.Utils;
 using TweetDuck.Plugins;
-using TweetDuck.Resources;
+using TweetLib.Core.Features.Plugins;
 using TweetLib.Core.Features.Plugins.Enums;
+using TweetLib.Core.Features.Twitter;
+using TweetLib.Core.Utils;
 
 namespace TweetDuck.Core{
     sealed class TweetDeckBrowser : IDisposable{
@@ -35,9 +38,8 @@ namespace TweetDuck.Core{
                     return false;
                 }
 
-                using(IFrame frame = browser.GetBrowser().MainFrame){
+                using IFrame frame = browser.GetBrowser().MainFrame;
-                    return TwitterUtils.IsTweetDeckWebsite(frame);
+                return TwitterUrls.IsTweetDeck(frame.Url);
-                }
             }
         }
         
@@ -47,12 +49,12 @@ namespace TweetDuck.Core{
         private string prevSoundNotificationPath = null;
 
         public TweetDeckBrowser(FormBrowser owner, PluginManager plugins, TweetDeckBridge tdBridge, UpdateBridge updateBridge){
-            resourceHandlerFactory.RegisterHandler(TweetNotification.AppLogo);
+            resourceHandlerFactory.RegisterHandler(FormNotificationBase.AppLogo);
             resourceHandlerFactory.RegisterHandler(TwitterUtils.LoadingSpinner);
 
             RequestHandlerBrowser requestHandler = new RequestHandlerBrowser();
             
-            this.browser = new ChromiumWebBrowser(TwitterUtils.TweetDeckURL){
+            this.browser = new ChromiumWebBrowser(TwitterUrls.TweetDeck){
                 DialogHandler = new FileDialogHandler(),
                 DragHandler = new DragHandlerBrowser(requestHandler),
                 MenuHandler = new ContextMenuBrowser(owner),
@@ -77,7 +79,7 @@ namespace TweetDuck.Core{
             this.browser.SetupZoomEvents();
             
             owner.Controls.Add(browser);
-            plugins.Register(browser, PluginEnvironment.Browser, true);
+            plugins.Register(PluginEnvironment.Browser, new PluginDispatcher(browser));
             
             Config.MuteToggled += Config_MuteToggled;
             Config.SoundNotificationChanged += Config_SoundNotificationInfoChanged;
@@ -121,14 +123,16 @@ namespace TweetDuck.Core{
             IFrame frame = e.Frame;
 
             if (frame.IsMain){
-                if (TwitterUtils.IsTwitterWebsite(frame)){
+                string url = frame.Url;
-                    string css = ScriptLoader.LoadResource("styles/twitter.css", browser);
+
+                if (TwitterUrls.IsTwitter(url)){
+                    string css = Program.Resources.Load("styles/twitter.css");
                     resourceHandlerFactory.RegisterHandler(TwitterStyleUrl, ResourceHandler.FromString(css, mimeType: "text/css"));
 
-                    ScriptLoader.ExecuteFile(frame, "twitter.js", browser);
+                    CefScriptExecutor.RunFile(frame, "twitter.js");
                 }
                 
-                if (!TwitterUtils.IsTwitterLogin2FactorWebsite(frame)){
+                if (!TwitterUrls.IsTwitterLogin2Factor(url)){
                     frame.ExecuteJavaScriptAsync(TwitterUtils.BackgroundColorOverride);
                 }
             }
@@ -136,11 +140,12 @@ namespace TweetDuck.Core{
 
         private void browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
             IFrame frame = e.Frame;
+            string url = frame.Url;
 
             if (frame.IsMain){
-                if (TwitterUtils.IsTweetDeckWebsite(frame)){
+                if (TwitterUrls.IsTweetDeck(url)){
                     UpdateProperties();
-                    ScriptLoader.ExecuteFile(frame, "code.js", browser);
+                    CefScriptExecutor.RunFile(frame, "code.js");
 
                     InjectBrowserCSS();
                     ReinjectCustomCSS(Config.CustomBrowserCSS);
@@ -149,18 +154,18 @@ namespace TweetDuck.Core{
                     TweetDeckBridge.ResetStaticProperties();
 
                     if (Arguments.HasFlag(Arguments.ArgIgnoreGDPR)){
-                        ScriptLoader.ExecuteScript(frame, "TD.storage.Account.prototype.requiresConsent = function(){ return false; }", "gen:gdpr");
+                        CefScriptExecutor.RunScript(frame, "TD.storage.Account.prototype.requiresConsent = function(){ return false; }", "gen:gdpr");
                     }
 
                     if (Config.FirstRun){
-                        ScriptLoader.ExecuteFile(frame, "introduction.js", browser);
+                        CefScriptExecutor.RunFile(frame, "introduction.js");
                     }
                 }
 
-                ScriptLoader.ExecuteFile(frame, "update.js", browser);
+                CefScriptExecutor.RunFile(frame, "update.js");
             }
 
-            if (frame.Url == ErrorUrl){
+            if (url == ErrorUrl){
                 resourceHandlerFactory.UnregisterHandler(ErrorUrl);
             }
         }
@@ -171,10 +176,13 @@ namespace TweetDuck.Core{
             }
 
             if (!e.FailedUrl.StartsWith("http://td/", StringComparison.Ordinal)){
-                string errorPage = ScriptLoader.LoadResourceSilent("pages/error.html");
+                string errorPage = Program.Resources.LoadSilent("pages/error.html");
 
                 if (errorPage != null){
-                    resourceHandlerFactory.RegisterHandler(ErrorUrl, ResourceHandler.FromString(errorPage.Replace("{err}", BrowserUtils.GetErrorName(e.ErrorCode))));
+                    string errorName = Enum.GetName(typeof(CefErrorCode), e.ErrorCode);
+                    string errorTitle = StringUtils.ConvertPascalCaseToScreamingSnakeCase(errorName ?? string.Empty);
+
+                    resourceHandlerFactory.RegisterHandler(ErrorUrl, ResourceHandler.FromString(errorPage.Replace("{err}", errorTitle)));
                     browser.Load(ErrorUrl);
                 }
             }
@@ -217,7 +225,7 @@ namespace TweetDuck.Core{
         // javascript calls
 
         public void ReloadToTweetDeck(){
-            browser.ExecuteScriptAsync($"if(window.TDGF_reload)window.TDGF_reload();else window.location.href='{TwitterUtils.TweetDeckURL}'");
+            browser.ExecuteScriptAsync($"if(window.TDGF_reload)window.TDGF_reload();else window.location.href='{TwitterUrls.TweetDeck}'");
         }
 
         public void UpdateProperties(){
@@ -225,7 +233,7 @@ namespace TweetDuck.Core{
         }
 
         public void InjectBrowserCSS(){
-            browser.ExecuteScriptAsync("TDGF_injectBrowserCSS", ScriptLoader.LoadResource("styles/browser.css", browser)?.TrimEnd() ?? string.Empty);
+            browser.ExecuteScriptAsync("TDGF_injectBrowserCSS", Program.Resources.Load("styles/browser.css")?.TrimEnd() ?? string.Empty);
         }
 
         public void ReinjectCustomCSS(string css){
@@ -265,7 +273,7 @@ namespace TweetDuck.Core{
         }
 
         public void OpenDevTools(){
-            browser.ShowDevTools();
+            browser.OpenDevToolsCustom();
         }
     }
 }

Core/Utils/BrowserUtils.cs

@@ -7,7 +7,7 @@ using System.Windows.Forms;
 using CefSharp.WinForms;
 using TweetDuck.Configuration;
 using TweetDuck.Core.Other;
-using TweetLib.Core.Utils;
+using TweetLib.Core.Features.Twitter;
 
 namespace TweetDuck.Core.Utils{
     static class BrowserUtils{
@@ -60,8 +60,12 @@ namespace TweetDuck.Core.Utils{
         }
 
         public static void SetupZoomEvents(this ChromiumWebBrowser browser){
+            static void SetZoomLevel(IBrowserHost host, int percentage){
+                host.SetZoomLevel(Math.Log(percentage / 100.0, 1.2));
+            }
+
             void UpdateZoomLevel(object sender, EventArgs args){
-                SetZoomLevel(browser.GetBrowser(), Config.ZoomLevel);
+                SetZoomLevel(browser.GetBrowserHost(), Config.ZoomLevel);
             }
 
             Config.ZoomLevelChanged += UpdateZoomLevel;
@@ -69,16 +73,29 @@ namespace TweetDuck.Core.Utils{
 
             browser.FrameLoadStart += (sender, args) => {
                 if (args.Frame.IsMain && Config.ZoomLevel != 100){
-                    SetZoomLevel(args.Browser, Config.ZoomLevel);
+                    SetZoomLevel(args.Browser.GetHost(), Config.ZoomLevel);
                 }
             };
         }
 
-        public static void OpenExternalBrowser(string url){
+        public static void OpenDevToolsCustom(this IWebBrowser browser){
-            if (string.IsNullOrWhiteSpace(url))return;
+            var info = new WindowInfo();
+            info.SetAsPopup(IntPtr.Zero, "Dev Tools");
 
-            switch(UrlUtils.Check(url)){
+            if (Config.DevToolsWindowOnTop){
-                case UrlUtils.CheckResult.Fine:
+                info.ExStyle |= 0x00000008; // WS_EX_TOPMOST
+            }
+
+            browser.GetBrowserHost().ShowDevTools(info);
+        }
+
+        public static void OpenExternalBrowser(string url){
+            if (string.IsNullOrWhiteSpace(url)){
+                return;
+            }
+
+            switch(TwitterUrls.Check(url)){
+                case TwitterUrls.UrlType.Fine:
                     if (FormGuide.CheckGuideUrl(url, out string hash)){
                         FormGuide.Show(hash);
                     }
@@ -89,8 +106,11 @@ namespace TweetDuck.Core.Utils{
                             WindowsUtils.OpenAssociatedProgram(url);
                         }
                         else{
+                            string quotedUrl = '"' + url + '"';
+                            string browserArgs = Config.BrowserPathArgs == null ? quotedUrl : Config.BrowserPathArgs + ' ' + quotedUrl;
+
                             try{
-                                using(Process.Start(browserPath, url)){}
+                                using(Process.Start(browserPath, browserArgs)){}
                             }catch(Exception e){
                                 Program.Reporter.HandleException("Error Opening Browser", "Could not open the browser.", true, e);
                             }
@@ -99,9 +119,9 @@ namespace TweetDuck.Core.Utils{
 
                     break;
 
-                case UrlUtils.CheckResult.Tracking:
+                case TwitterUrls.UrlType.Tracking:
                     if (Config.IgnoreTrackingUrlWarning){
-                        goto case UrlUtils.CheckResult.Fine;
+                        goto case TwitterUrls.UrlType.Fine;
                     }
 
                     using(FormMessage form = new FormMessage("Blocked URL", "TweetDuck has blocked a tracking url due to privacy concerns. Do you want to visit it anyway?\n" + url, MessageBoxIcon.Warning)){
@@ -117,20 +137,22 @@ namespace TweetDuck.Core.Utils{
                         }
 
                         if (result == DialogResult.Ignore || result == DialogResult.Yes){
-                            goto case UrlUtils.CheckResult.Fine;
+                            goto case TwitterUrls.UrlType.Fine;
                         }
                     }
 
                     break;
 
-                case UrlUtils.CheckResult.Invalid:
+                case TwitterUrls.UrlType.Invalid:
-                    FormMessage.Warning("Blocked URL", "A potentially malicious URL was blocked from opening:\n"+url, FormMessage.OK);
+                    FormMessage.Warning("Blocked URL", "A potentially malicious or invalid URL was blocked from opening:\n" + url, FormMessage.OK);
                     break;
             }
         }
 
         public static void OpenExternalSearch(string query){
-            if (string.IsNullOrWhiteSpace(query))return;
+            if (string.IsNullOrWhiteSpace(query)){
+                return;
+            }
             
             string searchUrl = Config.SearchEngineUrl;
             
@@ -156,16 +178,8 @@ namespace TweetDuck.Core.Utils{
             }
         }
 
-        public static string GetErrorName(CefErrorCode code){
-            return StringUtils.ConvertPascalCaseToScreamingSnakeCase(Enum.GetName(typeof(CefErrorCode), code) ?? string.Empty);
-        }
-
         public static int Scale(int baseValue, double scaleFactor){
             return (int)Math.Round(baseValue * scaleFactor);
         }
-
-        public static void SetZoomLevel(IBrowser browser, int percentage){
-            browser.GetHost().SetZoomLevel(Math.Log(percentage/100.0, 1.2));
-        }
     }
 }

Core/Utils/TwitterUtils.cs

@@ -2,7 +2,6 @@
 using CefSharp;
 using System.Drawing;
 using System.IO;
-using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using TweetDuck.Core.Management;
 using TweetDuck.Core.Other;
@@ -16,42 +15,17 @@ using Cookie = CefSharp.Cookie;
 
 namespace TweetDuck.Core.Utils{
     static class TwitterUtils{
-        public const string TweetDeckURL = "https://tweetdeck.twitter.com";
-
         public static readonly Color BackgroundColor = Color.FromArgb(28, 99, 153);
         public const string BackgroundColorOverride = "setTimeout(function f(){let h=document.head;if(!h){setTimeout(f,5);return;}let e=document.createElement('style');e.innerHTML='body,body::before{background:#1c6399!important;margin:0}';h.appendChild(e);},1)";
 
         public static readonly ResourceLink LoadingSpinner = new ResourceLink("https://ton.twimg.com/tduck/spinner", ResourceHandler.FromByteArray(Properties.Resources.spinner, "image/apng"));
         
-        private static readonly Lazy<Regex> RegexAccountLazy = new Lazy<Regex>(() => new Regex(@"^https?://twitter\.com/(?!signup$|tos$|privacy$|search$|search-)([^/?]+)/?$", RegexOptions.Compiled), false);
-        public static Regex RegexAccount => RegexAccountLazy.Value;
-
         public static readonly string[] DictionaryWords = {
             "tweetdeck", "TweetDeck", "tweetduck", "TweetDuck", "TD"
         };
 
-        public static bool IsTweetDeckWebsite(IFrame frame){
-            return frame.Url.Contains("//tweetdeck.twitter.com/");
-        }
-
-        public static bool IsTwitterWebsite(IFrame frame){
-            return frame.Url.Contains("//twitter.com/");
-        }
-
-        public static bool IsTwitterLogin2FactorWebsite(IFrame frame){
-            return frame.Url.Contains("//twitter.com/account/login_verification");
-        }
-
-        public static string GetMediaLink(string url, ImageQuality quality){
-            return ImageUrl.TryParse(url, out var obj) ? obj.WithQuality(quality) : url;
-        }
-
-        public static string GetImageFileName(string url){
-            return UrlUtils.GetFileNameFromUrl(ImageUrl.TryParse(url, out var obj) ? obj.WithNoQuality : url);
-        }
-
         public static void ViewImage(string url, ImageQuality quality){
-            void ViewImageInternal(string path){
+            static void ViewImageInternal(string path){
                 string ext = Path.GetExtension(path);
 
                 if (ImageUrl.ValidExtensions.Contains(ext)){
@@ -62,13 +36,13 @@ namespace TweetDuck.Core.Utils{
                 }
             }
 
-            string file = Path.Combine(BrowserCache.CacheFolder, GetImageFileName(url) ?? Path.GetRandomFileName());
+            string file = Path.Combine(BrowserCache.CacheFolder, TwitterUrls.GetImageFileName(url) ?? Path.GetRandomFileName());
             
             if (FileUtils.FileExistsAndNotEmpty(file)){
                 ViewImageInternal(file);
             }
             else{
-                DownloadFileAuth(GetMediaLink(url, quality), file, () => {
+                DownloadFileAuth(TwitterUrls.GetMediaLink(url, quality), file, () => {
                     ViewImageInternal(file);
                 }, ex => {
                     FormMessage.Error("Image Download", "An error occurred while downloading the image: " + ex.Message, FormMessage.OK);
@@ -85,10 +59,10 @@ namespace TweetDuck.Core.Utils{
                 return;
             }
 
-            string firstImageLink = GetMediaLink(urls[0], quality);
+            string firstImageLink = TwitterUrls.GetMediaLink(urls[0], quality);
             int qualityIndex = firstImageLink.IndexOf(':', firstImageLink.LastIndexOf('/'));
 
-            string filename = GetImageFileName(firstImageLink);
+            string filename = TwitterUrls.GetImageFileName(firstImageLink);
             string ext = Path.GetExtension(filename); // includes dot
             
             using(SaveFileDialog dialog = new SaveFileDialog{
@@ -99,7 +73,7 @@ namespace TweetDuck.Core.Utils{
                 Filter = (urls.Length == 1 ? "Image" : "Images") + (string.IsNullOrEmpty(ext) ? " (unknown)|*.*" : $" (*{ext})|*{ext}")
             }){
                 if (dialog.ShowDialog() == DialogResult.OK){
-                    void OnFailure(Exception ex){
+                    static void OnFailure(Exception ex){
                         FormMessage.Error("Image Download", "An error occurred while downloading the image: " + ex.Message, FormMessage.OK);
                     }
 
@@ -111,7 +85,7 @@ namespace TweetDuck.Core.Utils{
                         string pathExt = Path.GetExtension(dialog.FileName);
 
                         for(int index = 0; index < urls.Length; index++){
-                            DownloadFileAuth(GetMediaLink(urls[index], quality), $"{pathBase} {index+1}{pathExt}", null, OnFailure);
+                            DownloadFileAuth(TwitterUrls.GetMediaLink(urls[index], quality), $"{pathBase} {index + 1}{pathExt}", null, OnFailure);
                         }
                     }
                 }
@@ -119,7 +93,7 @@ namespace TweetDuck.Core.Utils{
         }
 
         public static void DownloadVideo(string url, string username){
-            string filename = UrlUtils.GetFileNameFromUrl(url);
+            string filename = TwitterUrls.GetFileNameFromUrl(url);
             string ext = Path.GetExtension(filename);
 
             using(SaveFileDialog dialog = new SaveFileDialog{

Core/Utils/WindowsUtils.cs

@@ -11,24 +11,17 @@ using Microsoft.Win32;
 
 namespace TweetDuck.Core.Utils{
     static class WindowsUtils{
+        private static readonly bool IsWindows8OrNewer = OSVersionEquals(major: 6, minor: 2); // windows 8/10
+
+        public static bool ShouldAvoidToolWindow { get; } = IsWindows8OrNewer;
+        public static bool IsAeroEnabled => IsWindows8OrNewer || (NativeMethods.DwmIsCompositionEnabled(out bool isCompositionEnabled) == 0 && isCompositionEnabled);
+
         private static readonly Lazy<Regex> RegexStripHtmlStyles = new Lazy<Regex>(() => new Regex(@"\s?(?:style|class)="".*?"""), false);
         private static readonly Lazy<Regex> RegexOffsetClipboardHtml = new Lazy<Regex>(() => new Regex(@"(?<=EndHTML:|EndFragment:)(\d+)"), false);
 
-        private static readonly bool IsWindows8OrNewer;
+        private static bool OSVersionEquals(int major, int minor){
-
-        public static int CurrentProcessID { get; }
-        public static bool ShouldAvoidToolWindow { get; }
-        public static bool IsAeroEnabled => IsWindows8OrNewer || (NativeMethods.DwmIsCompositionEnabled(out bool isCompositionEnabled) == 0 && isCompositionEnabled);
-
-        static WindowsUtils(){
-            using(Process me = Process.GetCurrentProcess()){
-                CurrentProcessID = me.Id;
-            }
-
             Version ver = Environment.OSVersion.Version;
-            IsWindows8OrNewer = ver.Major == 6 && ver.Minor == 2; // windows 8/10
+            return ver.Major == major && ver.Minor == minor;
-
-            ShouldAvoidToolWindow = IsWindows8OrNewer;
         }
 
         public static bool OpenAssociatedProgram(string file, string arguments = "", bool runElevated = false){
@@ -114,16 +107,18 @@ namespace TweetDuck.Core.Utils{
         }
 
         public static IEnumerable<Browser> FindInstalledBrowsers(){
-            IEnumerable<Browser> ReadBrowsersFromKey(RegistryHive hive){
+            static IEnumerable<Browser> ReadBrowsersFromKey(RegistryHive hive){
-                using(RegistryKey root = RegistryKey.OpenBaseKey(hive, RegistryView.Default))
+                using RegistryKey root = RegistryKey.OpenBaseKey(hive, RegistryView.Default);
-                using(RegistryKey browserList = root.OpenSubKey(@"SOFTWARE\Clients\StartMenuInternet", false)){
+                using RegistryKey browserList = root.OpenSubKey(@"SOFTWARE\Clients\StartMenuInternet", false);
+
                 if (browserList == null){
                     yield break;
                 }
 
                 foreach(string sub in browserList.GetSubKeyNames()){
-                        using(RegistryKey browserKey = browserList.OpenSubKey(sub, false))
+                    using RegistryKey browserKey = browserList.OpenSubKey(sub, false);
-                        using(RegistryKey shellKey = browserKey?.OpenSubKey(@"shell\open\command")){
+                    using RegistryKey shellKey = browserKey?.OpenSubKey(@"shell\open\command");
+
                     if (shellKey == null){
                         continue;
                     }
@@ -142,8 +137,6 @@ namespace TweetDuck.Core.Utils{
                     yield return new Browser(browserName, browserPath);
                 }
             }
-                }
-            }
 
             HashSet<Browser> browsers = new HashSet<Browser>();
             

Impl/LockHandler.cs

@@ -0,0 +1,58 @@
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using TweetDuck.Core.Utils;
+using TweetLib.Core.Application;
+
+namespace TweetDuck.Impl{
+    class LockHandler : IAppLockHandler{
+        private const int WaitRetryDelay = 250;
+        private const int RestoreFailTimeout = 2000;
+        private const int CloseNaturallyTimeout = 10000;
+        private const int CloseKillTimeout = 5000;
+
+        bool IAppLockHandler.RestoreProcess(Process process){
+            if (process.MainWindowHandle == IntPtr.Zero){ // restore if the original process is in tray
+                NativeMethods.BroadcastMessage(Program.WindowRestoreMessage, (uint)process.Id, 0);
+
+                if (WindowsUtils.TrySleepUntil(() => CheckProcessExited(process) || (process.MainWindowHandle != IntPtr.Zero && process.Responding), RestoreFailTimeout, WaitRetryDelay)){
+                    return true;
+                }
+            }
+
+            return false;
+        }
+
+        bool IAppLockHandler.CloseProcess(Process process){
+            try{
+                if (process.CloseMainWindow()){
+                    // ReSharper disable once AccessToDisposedClosure
+                    WindowsUtils.TrySleepUntil(() => CheckProcessExited(process), CloseNaturallyTimeout, WaitRetryDelay);
+                }
+
+                if (!process.HasExited){
+                    process.Kill();
+                    // ReSharper disable once AccessToDisposedClosure
+                    WindowsUtils.TrySleepUntil(() => CheckProcessExited(process), CloseKillTimeout, WaitRetryDelay);
+                }
+
+                if (process.HasExited){
+                    process.Dispose();
+                    return true;
+                }
+                else{
+                    return false;
+                }
+            }catch(Exception ex) when (ex is InvalidOperationException || ex is Win32Exception){
+                bool hasExited = CheckProcessExited(process);
+                process.Dispose();
+                return hasExited;
+            }
+        }
+
+        private static bool CheckProcessExited(Process process){
+            process.Refresh();
+            return process.HasExited;
+        }
+    }
+}

Impl/SystemHandler.cs

@@ -0,0 +1,16 @@
+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('/', '\\') + '"')){}
+            }
+        }
+    }
+}

Plugins/PluginDispatcher.cs

@@ -0,0 +1,34 @@
+using System;
+using CefSharp;
+using TweetDuck.Core.Adapters;
+using TweetLib.Core.Browser;
+using TweetLib.Core.Features.Plugins;
+using TweetLib.Core.Features.Plugins.Events;
+using TweetLib.Core.Features.Twitter;
+
+namespace TweetDuck.Plugins{
+    sealed class PluginDispatcher : IPluginDispatcher{
+        public event EventHandler<PluginDispatchEventArgs> Ready;
+
+        private readonly IWebBrowser browser;
+        private readonly IScriptExecutor executor;
+
+        public PluginDispatcher(IWebBrowser browser){
+            this.browser = browser;
+            this.browser.FrameLoadEnd += browser_FrameLoadEnd;
+            this.executor = new CefScriptExecutor(browser);
+        }
+
+        void IPluginDispatcher.AttachBridge(string name, object bridge){
+            browser.RegisterAsyncJsObject(name, bridge);
+        }
+
+        private void browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
+            IFrame frame = e.Frame;
+
+            if (frame.IsMain && TwitterUrls.IsTweetDeck(frame.Url)){
+                Ready?.Invoke(this, new PluginDispatchEventArgs(executor));
+            }
+        }
+    }
+}

Plugins/PluginManager.cs

@@ -1,180 +0,0 @@
-using CefSharp;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Windows.Forms;
-using TweetDuck.Core.Controls;
-using TweetDuck.Core.Utils;
-using TweetDuck.Resources;
-using TweetLib.Core.Data;
-using TweetLib.Core.Features.Plugins;
-using TweetLib.Core.Features.Plugins.Config;
-using TweetLib.Core.Features.Plugins.Enums;
-using TweetLib.Core.Features.Plugins.Events;
-
-namespace TweetDuck.Plugins{
-    sealed class PluginManager : IPluginManager{
-        private const string SetupScriptPrefix = "plugins.";
-
-        public string PathCustomPlugins => Path.Combine(pluginFolder, PluginGroup.Custom.GetSubFolder());
-
-        public IEnumerable<Plugin> Plugins => plugins;
-        public IEnumerable<InjectedHTML> NotificationInjections => bridge.NotificationInjections;
-        
-        public IPluginConfig Config { get; }
-        
-        public event EventHandler<PluginErrorEventArgs> Reloaded;
-        public event EventHandler<PluginErrorEventArgs> Executed;
-        
-        private readonly string pluginFolder;
-        private readonly string pluginDataFolder;
-
-        private readonly Control sync;
-        private readonly PluginBridge bridge;
-
-        private readonly HashSet<Plugin> plugins = new HashSet<Plugin>();
-        private readonly Dictionary<int, Plugin> tokens = new Dictionary<int, Plugin>();
-        private readonly Random rand = new Random();
-
-        private IWebBrowser mainBrowser;
-
-        public PluginManager(Control sync, IPluginConfig config, string pluginFolder, string pluginDataFolder){
-            this.Config = config;
-            this.Config.PluginChangedState += Config_PluginChangedState;
-
-            this.pluginFolder = pluginFolder;
-            this.pluginDataFolder = pluginDataFolder;
-            
-            this.sync = sync;
-            this.bridge = new PluginBridge(this);
-        }
-
-        public void Register(IWebBrowser browser, PluginEnvironment environment, bool asMainBrowser = false){
-            browser.FrameLoadEnd += (sender, args) => {
-                IFrame frame = args.Frame;
-
-                if (frame.IsMain && TwitterUtils.IsTweetDeckWebsite(frame)){
-                    ExecutePlugins(frame, environment);
-                }
-            };
-
-            browser.RegisterAsyncJsObject("$TDP", bridge);
-
-            if (asMainBrowser){
-                mainBrowser = browser;
-            }
-        }
-
-        private void Config_PluginChangedState(object sender, PluginChangedStateEventArgs e){
-            mainBrowser?.ExecuteScriptAsync("TDPF_setPluginState", e.Plugin, e.IsEnabled);
-        }
-
-        public bool IsPluginInstalled(string identifier){
-            return plugins.Any(plugin => plugin.Identifier.Equals(identifier));
-        }
-
-        public bool HasAnyPlugin(PluginEnvironment environment){
-            return plugins.Any(plugin => plugin.Environments.HasFlag(environment));
-        }
-
-        public bool IsPluginConfigurable(Plugin plugin){
-            return plugin.HasConfig || bridge.WithConfigureFunction.Contains(plugin);
-        }
-
-        public void ConfigurePlugin(Plugin plugin){
-            if (bridge.WithConfigureFunction.Contains(plugin)){
-                mainBrowser?.ExecuteScriptAsync("TDPF_configurePlugin", plugin);
-            }
-            else if (plugin.HasConfig){
-                if (File.Exists(plugin.ConfigPath)){
-                    using(Process.Start("explorer.exe", "/select,\"" + plugin.ConfigPath.Replace('/', '\\') + "\"")){}
-                }
-                else{
-                    using(Process.Start("explorer.exe", '"' + plugin.GetPluginFolder(PluginFolder.Data).Replace('/', '\\') + '"')){}
-                }
-            }
-        }
-
-        public int GetTokenFromPlugin(Plugin plugin){
-            foreach(KeyValuePair<int, Plugin> kvp in tokens){
-                if (kvp.Value.Equals(plugin)){
-                    return kvp.Key;
-                }
-            }
-
-            int token, attempts = 1000;
-
-            do{
-                token = rand.Next();
-            }while(tokens.ContainsKey(token) && --attempts >= 0);
-            
-            if (attempts < 0){
-                token = -tokens.Count - 1;
-            }
-
-            tokens[token] = plugin;
-            return token;
-        }
-
-        public Plugin GetPluginFromToken(int token){
-            return tokens.TryGetValue(token, out Plugin plugin) ? plugin : null;
-        }
-
-        public void Reload(){
-            plugins.Clear();
-            tokens.Clear();
-
-            List<string> loadErrors = new List<string>(1);
-
-            foreach(var result in PluginGroupExtensions.Values.SelectMany(group => PluginLoader.AllInFolder(pluginFolder, pluginDataFolder, group))){
-                if (result.HasValue){
-                    plugins.Add(result.Value);
-                }
-                else{
-                    loadErrors.Add(result.Exception.Message);
-                }
-            }
-
-            Reloaded?.Invoke(this, new PluginErrorEventArgs(loadErrors));
-        }
-
-        private void ExecutePlugins(IFrame frame, PluginEnvironment environment){
-            if (!HasAnyPlugin(environment) || !ScriptLoader.ExecuteFile(frame, SetupScriptPrefix + environment.GetPluginScriptFile(), sync)){
-                return;
-            }
-            
-            bool includeDisabled = environment.IncludesDisabledPlugins();
-
-            if (includeDisabled){
-                ScriptLoader.ExecuteScript(frame, PluginScriptGenerator.GenerateConfig(Config), "gen:pluginconfig");
-            }
-
-            List<string> failedPlugins = new List<string>(1);
-
-            foreach(Plugin plugin in Plugins){
-                string path = plugin.GetScriptPath(environment);
-
-                if (string.IsNullOrEmpty(path) || (!includeDisabled && !Config.IsEnabled(plugin)) || !plugin.CanRun){
-                    continue;
-                }
-
-                string script;
-
-                try{
-                    script = File.ReadAllText(path);
-                }catch(Exception e){
-                    failedPlugins.Add($"{plugin.Identifier} ({Path.GetFileName(path)}): {e.Message}");
-                    continue;
-                }
-                
-                ScriptLoader.ExecuteScript(frame, PluginScriptGenerator.GeneratePlugin(plugin.Identifier, script, GetTokenFromPlugin(plugin), environment), $"plugin:{plugin}");
-            }
-
-            sync.InvokeAsyncSafe(() => {
-                Executed?.Invoke(this, new PluginErrorEventArgs(failedPlugins));
-            });
-        }
-    }
-}

Program.cs

@@ -12,7 +12,10 @@ using TweetDuck.Core.Handling.General;
 using TweetDuck.Core.Other;
 using TweetDuck.Core.Management;
 using TweetDuck.Core.Utils;
+using TweetDuck.Impl;
+using TweetDuck.Resources;
 using TweetLib.Core;
+using TweetLib.Core.Application.Helpers;
 using TweetLib.Core.Collections;
 using TweetLib.Core.Utils;
 
@@ -50,6 +53,7 @@ namespace TweetDuck{
         
         public static Reporter Reporter { get; }
         public static ConfigManager Config { get; }
+        public static ScriptLoader Resources { get; }
 
         static Program(){
             Reporter = new Reporter(ErrorLogFilePath);
@@ -57,8 +61,17 @@ namespace TweetDuck{
 
             Config = new ConfigManager();
 
+            #if DEBUG
+            Resources = new ScriptLoaderDebug();
+            #else
+            Resources = new ScriptLoader();
+            #endif
+
             Lib.Initialize(new App.Builder{
-                ErrorHandler = Reporter
+                ErrorHandler = Reporter,
+                LockHandler = new LockHandler(),
+                SystemHandler = new SystemHandler(),
+                ResourceHandler = Resources
             });
         }
 
@@ -94,15 +107,17 @@ namespace TweetDuck{
                 LockManager.Result lockResult = LockManager.Lock();
                 
                 if (lockResult == LockManager.Result.HasProcess){
-                    if (!LockManager.RestoreLockingProcess(2000) && FormMessage.Error("TweetDuck is Already Running", "Another instance of TweetDuck is already running.\nDo you want to close it?", FormMessage.Yes, FormMessage.No)){
+                    if (!LockManager.RestoreLockingProcess() && FormMessage.Error("TweetDuck is Already Running", "Another instance of TweetDuck is already running.\nDo you want to close it?", FormMessage.Yes, FormMessage.No)){
-                        if (!LockManager.CloseLockingProcess(10000, 5000)){
+                        if (!LockManager.CloseLockingProcess()){
                             FormMessage.Error("TweetDuck Has Failed :(", "Could not close the other process.", FormMessage.OK);
                             return;
                         }
 
                         lockResult = LockManager.Lock();
                     }
-                    else return;
+                    else{
+                        return;
+                    }
                 }
 
                 if (lockResult != LockManager.Result.Success){
@@ -156,6 +171,7 @@ namespace TweetDuck{
             Application.ApplicationExit += (sender, args) => ExitCleanup();
             
             FormBrowser mainForm = new FormBrowser();
+            Resources.Initialize(mainForm);
             Application.Run(mainForm);
 
             if (mainForm.UpdateInstallerPath != null){

Resources/ScriptLoader.cs

@@ -1,45 +1,55 @@
-using CefSharp;
+using System;
-using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Other;
-
+using TweetLib.Core.Application;
-#if DEBUG
-using System.Diagnostics;
-using System.Reflection;
-using TweetDuck.Core;
-using TweetDuck.Plugins;
-#endif
 
 namespace TweetDuck.Resources{
-    static class ScriptLoader{
+    class ScriptLoader : IAppResourceHandler{
-        private static readonly Dictionary<string, string> CachedData = new Dictionary<string, string>(16);
+        private readonly Dictionary<string, string> cache = new Dictionary<string, string>(16);
+        private Control sync;
 
-        public static string LoadResourceSilent(string name){
+        public void Initialize(Control sync){
-            return LoadResource(name, null);
+            this.sync = sync;
         }
 
-        public static string LoadResource(string name, Control sync){
+        protected void ClearCache(){
-            if (CachedData.TryGetValue(name, out string resourceData)){
+            cache.Clear();
+        }
+
+        public virtual void OnReloadTriggered(){
+            if (Control.ModifierKeys.HasFlag(Keys.Shift)){
+                ClearCache();
+            }
+        }
+
+        public string Load(string path)       => LoadInternal(path, silent: false);
+        public string LoadSilent(string path) => LoadInternal(path, silent: true);
+
+        protected virtual string LocateFile(string path){
+            return Path.Combine(Program.ScriptPath, path);
+        }
+
+        private string LoadInternal(string path, bool silent){
+            if (sync == null){
+                throw new InvalidOperationException("Cannot use ScriptLoader before initialization.");
+            }
+            else if (sync.IsDisposed){
+                return null; // better than crashing I guess...?
+            }
+
+            if (cache.TryGetValue(path, out string resourceData)){
                 return resourceData;
             }
 
-            string path = Program.ScriptPath;
+            string location = LocateFile(path);
-
-            #if DEBUG
-            if (Directory.Exists(HotSwapTargetDir)){
-                path = Path.Combine(HotSwapTargetDir, "scripts");
-                Debug.WriteLine("Hot swap active, redirecting "+name);
-            }
-            #endif
-
             string resource;
 
             try{
-                string contents = File.ReadAllText(Path.Combine(path, name), Encoding.UTF8);
+                string contents = File.ReadAllText(location, Encoding.UTF8);
                 int separator;
 
                 // first line can be either:
@@ -47,7 +57,7 @@ namespace TweetDuck.Resources{
                 // #<version>\n
 
                 if (contents[0] != '#'){
-                    ShowLoadError(sync, $"File {name} appears to be corrupted, please try reinstalling the app.");
+                    ShowLoadError(silent ? null : sync, $"File {path} appears to be corrupted, please try reinstalling the app.");
                     separator = 0;
                 }
                 else{
@@ -55,112 +65,21 @@ namespace TweetDuck.Resources{
                     string fileVersion = contents.Substring(1, separator - 1).TrimEnd();
 
                     if (fileVersion != Program.VersionTag){
-                        ShowLoadError(sync, $"File {name} is made for a different version of TweetDuck ({fileVersion}) and may not function correctly in this version, please try reinstalling the app.");
+                        ShowLoadError(silent ? null : sync, $"File {path} is made for a different version of TweetDuck ({fileVersion}) and may not function correctly in this version, please try reinstalling the app.");
                     }
                 }
 
                 resource = contents.Substring(separator).TrimStart();
             }catch(Exception ex){
-                ShowLoadError(sync, $"Could not load {name}. The program will continue running with limited functionality.\n\n{ex.Message}");
+                ShowLoadError(silent ? null : sync, $"Could not load {path}. The program will continue running with limited functionality.\n\n{ex.Message}");
                 resource = null;
             }
 
-            return CachedData[name] = resource;
+            return cache[path] = resource;
-        }
-
-        public static bool ExecuteFile(IFrame frame, string file, Control sync){
-            string script = LoadResource(file, sync);
-            ExecuteScript(frame, script, "root:"+Path.GetFileNameWithoutExtension(file));
-            return script != null;
-        }
-
-        public static void ExecuteScript(IFrame frame, string script, string identifier){
-            if (script != null){
-                frame.ExecuteJavaScriptAsync(script, identifier, 1);
-            }
-        }
-
-        public static void ClearCache(){
-            CachedData.Clear();
         }
 
         private static void ShowLoadError(Control sync, string message){
             sync?.InvokeSafe(() => FormMessage.Error("Resource Error", message, FormMessage.OK));
         }
-        
-        #if DEBUG
-        private static readonly string HotSwapProjectRoot = FixPathSlash(Path.GetFullPath(Path.Combine(Program.ProgramPath, "../../../")));
-        private static readonly string HotSwapTargetDir = FixPathSlash(Path.Combine(HotSwapProjectRoot, "bin", "tmp"));
-        private static readonly string HotSwapRebuildScript = Path.Combine(HotSwapProjectRoot, "bld", "post_build.exe");
-
-        static ScriptLoader(){
-            if (File.Exists(HotSwapRebuildScript)){
-                Debug.WriteLine("Activating resource hot swap...");
-
-                ResetHotSwap();
-                Application.ApplicationExit += (sender, args) => ResetHotSwap();
-            }
-        }
-
-        public static void HotSwap(){
-            if (!File.Exists(HotSwapRebuildScript)){
-                Debug.WriteLine("Failed resource hot swap, missing rebuild script: "+HotSwapRebuildScript);
-                return;
-            }
-            
-            ResetHotSwap();
-            Directory.CreateDirectory(HotSwapTargetDir);
-
-            Stopwatch sw = Stopwatch.StartNew();
-
-            using(Process process = Process.Start(new ProcessStartInfo{
-                FileName = HotSwapRebuildScript,
-                Arguments = $"\"{HotSwapTargetDir}\\\" \"{HotSwapProjectRoot}\\\" \"Debug\" \"{Program.VersionTag}\"",
-                WindowStyle = ProcessWindowStyle.Hidden
-            })){
-                // ReSharper disable once PossibleNullReferenceException
-                if (!process.WaitForExit(8000)){
-                    Debug.WriteLine("Failed resource hot swap, script did not finish in time");
-                    return;
-                }
-                else if (process.ExitCode != 0){
-                    Debug.WriteLine("Failed resource hot swap, script exited with code "+process.ExitCode);
-                    return;
-                }
-            }
-
-            sw.Stop();
-            Debug.WriteLine("Finished rebuild script in "+sw.ElapsedMilliseconds+" ms");
-
-            ClearCache();
-
-            // Force update plugin manager setup scripts
-
-            string newPluginRoot = Path.Combine(HotSwapTargetDir, "plugins");
-            
-            const BindingFlags flagsInstance = BindingFlags.Instance | BindingFlags.NonPublic;
-
-            Type typePluginManager = typeof(PluginManager);
-            Type typeFormBrowser = typeof(FormBrowser);
-
-            // ReSharper disable PossibleNullReferenceException
-            object instPluginManager = typeFormBrowser.GetField("plugins", flagsInstance).GetValue(FormManager.TryFind<FormBrowser>());
-            typePluginManager.GetField("pluginFolder", flagsInstance).SetValue(instPluginManager, newPluginRoot);
-
-            Debug.WriteLine("Reloading hot swapped plugins...");
-            ((PluginManager)instPluginManager).Reload();
-            // ReSharper restore PossibleNullReferenceException
-        }
-
-        private static void ResetHotSwap(){
-            try{
-                Directory.Delete(HotSwapTargetDir, true);
-            }catch(DirectoryNotFoundException){}
-        }
-
-        private static string FixPathSlash(string path){
-            return path.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar)+'\\';
-        }
-        #endif
     }
 }

Resources/ScriptLoaderDebug.cs

@@ -0,0 +1,100 @@
+#if DEBUG
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+using System.Windows.Forms;
+using TweetDuck.Core;
+using TweetLib.Core.Features.Plugins;
+
+namespace TweetDuck.Resources{
+    sealed class ScriptLoaderDebug : ScriptLoader{
+        private static readonly string HotSwapProjectRoot = FixPathSlash(Path.GetFullPath(Path.Combine(Program.ProgramPath, "../../../")));
+        private static readonly string HotSwapTargetDir = FixPathSlash(Path.Combine(HotSwapProjectRoot, "bin", "tmp"));
+        private static readonly string HotSwapRebuildScript = Path.Combine(HotSwapProjectRoot, "bld", "post_build.exe");
+        
+        private static string FixPathSlash(string path){
+            return path.TrimEnd(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar) + '\\';
+        }
+
+        public ScriptLoaderDebug(){
+            if (File.Exists(HotSwapRebuildScript)){
+                Debug.WriteLine("Activating resource hot swap...");
+
+                ResetHotSwap();
+                Application.ApplicationExit += (sender, args) => ResetHotSwap();
+            }
+        }
+
+        public override void OnReloadTriggered(){
+            HotSwap();
+        }
+
+        protected override string LocateFile(string path){
+            if (Directory.Exists(HotSwapTargetDir)){
+                Debug.WriteLine($"Hot swap active, redirecting {path}");
+                return Path.Combine(HotSwapTargetDir, "scripts", path);
+            }
+
+            return base.LocateFile(path);
+        }
+
+        private void HotSwap(){
+            if (!File.Exists(HotSwapRebuildScript)){
+                Debug.WriteLine($"Failed resource hot swap, missing rebuild script: {HotSwapRebuildScript}");
+                return;
+            }
+            
+            ResetHotSwap();
+            Directory.CreateDirectory(HotSwapTargetDir);
+
+            Stopwatch sw = Stopwatch.StartNew();
+
+            using(Process process = Process.Start(new ProcessStartInfo{
+                FileName = HotSwapRebuildScript,
+                Arguments = $"\"{HotSwapTargetDir}\\\" \"{HotSwapProjectRoot}\\\" \"Debug\" \"{Program.VersionTag}\"",
+                WindowStyle = ProcessWindowStyle.Hidden
+            })){
+                // ReSharper disable once PossibleNullReferenceException
+                if (!process.WaitForExit(8000)){
+                    Debug.WriteLine("Failed resource hot swap, script did not finish in time");
+                    return;
+                }
+                else if (process.ExitCode != 0){
+                    Debug.WriteLine($"Failed resource hot swap, script exited with code {process.ExitCode}");
+                    return;
+                }
+            }
+
+            sw.Stop();
+            Debug.WriteLine($"Finished rebuild script in {sw.ElapsedMilliseconds} ms");
+
+            ClearCache();
+
+            // Force update plugin manager setup scripts
+
+            string newPluginRoot = Path.Combine(HotSwapTargetDir, "plugins");
+            
+            const BindingFlags flagsInstance = BindingFlags.Instance | BindingFlags.NonPublic;
+
+            Type typePluginManager = typeof(PluginManager);
+            Type typeFormBrowser = typeof(FormBrowser);
+
+            // ReSharper disable PossibleNullReferenceException
+            object instPluginManager = typeFormBrowser.GetField("plugins", flagsInstance).GetValue(FormManager.TryFind<FormBrowser>());
+            typePluginManager.GetField("pluginFolder", flagsInstance).SetValue(instPluginManager, newPluginRoot);
+
+            Debug.WriteLine("Reloading hot swapped plugins...");
+            ((PluginManager)instPluginManager).Reload();
+            // ReSharper restore PossibleNullReferenceException
+        }
+
+        private void ResetHotSwap(){
+            try{
+                Directory.Delete(HotSwapTargetDir, true);
+            }catch(DirectoryNotFoundException){}
+        }
+    }
+}
+
+#endif

Resources/Scripts/code.js

@@ -945,20 +945,23 @@
   // Block: Allow drag & drop behavior for dropping links on columns to open their detail view.
   //
   execSafe(function supportDragDropOverColumns(){
-    const tweetRegex = /^https?:\/\/twitter\.com\/[A-Za-z0-9_]+\/status\/(\d+)\/?\??/;
+    const regexTweet = /^https?:\/\/twitter\.com\/[A-Za-z0-9_]+\/status\/(\d+)\/?\??/;
-    const selector = "section.js-column";
+    const regexAccount = /^https?:\/\/twitter\.com\/(?!signup$|tos$|privacy$|search$|search-)([^/?]+)\/?$/;
     
-    let isDraggingValid = false;
+    let dragType = false;
     
     const events = {
       dragover: function(e){
-        e.originalEvent.dataTransfer.dropEffect = isDraggingValid ? "all" : "none";
+        e.originalEvent.dataTransfer.dropEffect = dragType ? "all" : "none";
         e.preventDefault();
         e.stopPropagation();
       },
       
       drop: function(e){
-        let match = tweetRegex.exec(e.originalEvent.dataTransfer.getData("URL"));
+        let url = e.originalEvent.dataTransfer.getData("URL");
+        
+        if (dragType === "tweet"){
+          let match = regexTweet.exec(url);
           
           if (match.length === 2){
             let column = TD.controller.columnManager.get($(this).attr("data-column"));
@@ -972,19 +975,34 @@
               });
             }
           }
+        }
+        else if (dragType === "account"){
+          let match = regexAccount.exec(url);
+          
+          if (match.length === 2){
+            $(document).trigger("uiShowProfile", { id: match[1] });
+          }
+        }
         
         e.preventDefault();
         e.stopPropagation();
       }
     };
     
+    const selectors = {
+      tweet: "section.js-column",
+      account: app
+    };
+    
     window.TDGF_onGlobalDragStart = function(type, data){
-      if (type === "link"){
+      if (dragType){
-        isDraggingValid = tweetRegex.test(data);
+        app.undelegate(selectors[dragType], events);
-        app.delegate(selector, events);
+        dragType = null;
       }
-      else{
+      
-        app.undelegate(selector, events);
+      if (type === "link"){
+        dragType = regexTweet.test(data) ? "tweet" : regexAccount.test(data) ? "account": null;
+        app.delegate(selectors[dragType], events);
       }
     };
   });
@@ -1065,6 +1083,19 @@
     });
   });
   
+  //
+  // Block: Allow changing first day of week in date picker.
+  //
+  if (ensurePropertyExists($, "tools", "dateinput", "conf", "firstDay")){
+    $.tools.dateinput.conf.firstDay = $TDX.firstDayOfWeek;
+    
+    onAppReady.push(function setupDatePickerFirstDayCallback(){
+      window.TDGF_registerPropertyUpdateCallback(function($TDX){
+        $.tools.dateinput.conf.firstDay = $TDX.firstDayOfWeek;
+      });
+    });
+  }
+  
   //
   // Block: Make middle click on tweet reply icon open the compose drawer, retweet icon trigger a quote, and favorite icon open a 'Like from accounts...' modal.
   //
@@ -1212,14 +1243,14 @@
   // Block: Setup video player hooks.
   //
   execSafe(function setupVideoPlayer(){
-    window.TDGF_playVideo = function(url, username){
+    window.TDGF_playVideo = function(videoUrl, tweetUrl, username){
-      return if !url;
+      return if !videoUrl;
       
+      $TD.playVideo(videoUrl, tweetUrl || videoUrl, username || null, function(){
         $('<div id="td-video-player-overlay" class="ovl" style="display:block"></div>').on("click contextmenu", function(){
-        $TD.playVideo(null, null);
+          $TD.stopVideo();
         }).appendTo(app);
-      
+      });
-      $TD.playVideo(url, username || null);
     };
     
     const getGifLink = function(ele){
@@ -1239,13 +1270,14 @@
     app.delegate(".js-gif-play", {
       click: function(e){
         let src = !e.ctrlKey && getGifLink($(this).closest(".js-media-gif-container").find("video"));
+        let tweet = getVideoTweetLink($(this));
         
         if (src){
           let hovered = getHoveredTweet();
-          window.TDGF_playVideo(src, getUsername(hovered && hovered.obj));
+          window.TDGF_playVideo(src, tweet, getUsername(hovered && hovered.obj));
         }
         else{
-          $TD.openBrowser(getVideoTweetLink($(this)));
+          $TD.openBrowser(tweet);
         }
         
         e.stopPropagation();
@@ -1279,7 +1311,7 @@
       let media = this.chirp.getMedia().find(media => media.mediaId === this.clickedMediaEntityId);
       
       if (media && media.isVideo && media.service === "twitter"){
-        window.TDGF_playVideo(media.chooseVideoVariant().url, getUsername(this.chirp));
+        window.TDGF_playVideo(media.chooseVideoVariant().url, this.chirp.getChirpURL(), getUsername(this.chirp));
         cancelModal = true;
       }
     });
@@ -1457,6 +1489,24 @@
     };
   }
   
+  //
+  // Block: Add missing languages for Bing Translator (Bengali, Icelandic, Tagalog, Tamil, Telugu, Urdu).
+  //
+  if (ensurePropertyExists(TD, "languages", "getSupportedTranslationSourceLanguages")){
+    const newCodes = [ "bn", "is", "tl", "ta", "te", "ur" ];
+    const codeSet = new Set(TD.languages.getSupportedTranslationSourceLanguages());
+    
+    for(const lang of newCodes){
+      codeSet.add(lang);
+    }
+    
+    const codeList = [...codeSet];
+    
+    TD.languages.getSupportedTranslationSourceLanguages = function(){
+      return codeList;
+    };
+  }
+  
   //
   // Block: Setup global function to refresh all columns.
   //
@@ -1679,6 +1729,21 @@
     window.TDGF_reload = function(){}; // redefine to prevent reloading multiple times
   };
   
+  //
+  // Block: Setup global functions to respond to updating $TDX properties.
+  //
+  (function(){
+    var callbacks = [];
+    
+    window.TDGF_registerPropertyUpdateCallback = function(callback){
+      callbacks.push(callback);
+    };
+    
+    window.TDGF_onPropertiesUpdated = function(){
+      callbacks.forEach(func => func($TDX));
+    };
+  })();
+  
   //
   // Block: Disable default TweetDeck update notification.
   //

Resources/Scripts/plugins.browser.js

@@ -120,10 +120,19 @@
   // Block: Setup bridges to global functions.
   //
   window.TDPF_getColumnName = window.TDGF_getColumnName;
-  window.TDPF_playVideo = window.TDGF_playVideo;
   window.TDPF_reloadColumns = window.TDGF_reloadColumns;
   window.TDPF_prioritizeNewestEvent = window.TDGF_prioritizeNewestEvent;
   window.TDPF_injectMustache = window.TDGF_injectMustache;
+  window.TDPF_registerPropertyUpdateCallback = window.TDGF_registerPropertyUpdateCallback;
+  
+  window.TDPF_playVideo = function(urlOrObject, username){
+    if (typeof urlOrObject === "string"){
+      window.TDGF_playVideo(urlOrObject, null, username);
+    }
+    else{
+      window.TDGF_playVideo(urlOrObject.videoUrl, urlOrObject.tweetUrl, urlOrObject.username);
+    }
+  };
   
   #import "scripts/plugins.base.js"
 })();

Resources/Scripts/styles/twitter.css

@@ -40,78 +40,50 @@
 /* General styling */
 /*******************/
 
+* {
+  border-radius: 0 !important;
+}
+
 body {
-  /* remove scrollbar */
   overflow: hidden !important;
 }
 
-.page-canvas {
+.page-canvas, div[tweetduck-login-wrapper], body.ResponsiveLayout > div.PageContainer > div.Section {
-  /* tweak page shadow */
   box-shadow: 0 0 150px rgba(255, 255, 255, 0.3) !important;
 }
 
 .topbar, .TopNav {
-  /* hide top bar */
   display: none !important;
 }
 
-.page-canvas, .buttons, .btn, input {
-  /* sharpen borders */
-  border-radius: 0 !important;
-}
-
 input {
-  /* tweak input padding */
   padding: 5px 8px 4px !important;
 }
 
 button[type='submit'] {
-  /* style buttons */
   border: 1px solid rgba(0, 0, 0, 0.3) !important;
-  border-radius: 0 !important;
 }
 
-.tweetduck-helper {
+/****************************/
-  /* custom login text */
+/* General per-page styling */
+/****************************/
+
+html[mobile][login] div[tweetduck-login-wrapper] {
+  /* vertically center page & fix colors */
+  margin-top: calc(50vh - 200px);
+  padding: 26px 1.1vw;
+  background-color: white;
+}
+
+html[mobile][login] #tweetduck-helper:hover {
+  text-decoration: underline;
+}
+
+html[desktop][login] #tweetduck-helper {
   margin-top: 15px !important;
   font-weight: bold !important;
 }
 
-/********************************************/
+html[mobile][logout] div[role="button"] {
-/* Fix min width and margins on logout page */
-/********************************************/
-
-html[logout] .page-canvas {
-  width: auto !important;
-  max-width: 888px;
-}
-
-html[logout] .signout-wrapper {
-  width: auto !important;
-  margin: 0 auto !important;
-}
-
-html[logout] .signout {
-  margin: 60px 0 54px !important;
-}
-
-html[logout] .buttons {
-  padding-bottom: 0 !important;
-}
-
-/*******************************/
-/* General logout page styling */
-/*******************************/
-
-html[logout] .aside {
-  /* hide elements around dialog */
-  display: none;
-}
-
-html[logout] .buttons button, html[logout] .buttons a {
-  /* style buttons */
-  display: inline-block;
-  margin: 0 4px !important;
   border: 1px solid rgba(0, 0, 0, 0.3) !important;
-  border-radius: 0 !important;
 }

Resources/Scripts/twitter.js

@@ -1,4 +1,8 @@
 (function(){
+  const isLogin = location.pathname === "/login";
+  const isLogout = location.pathname === "/logout";
+  const isMobile = location.host === "mobile.twitter.com";
+  
   //
   // Function: Inject custom CSS into the page.
   //
@@ -14,18 +18,76 @@
     
     document.head.appendChild(link);
     
-    if (location.pathname === "/logout"){
+    if (isLogin){
+      document.documentElement.setAttribute("login", "");
+    }
+    else if (isLogout){
       document.documentElement.setAttribute("logout", "");
     }
+    
+    if (isMobile){
+      document.documentElement.setAttribute("mobile", "");
+    }
+    else{
+      document.documentElement.setAttribute("desktop", "");
+    }
   };
   
   setTimeout(injectCSS, 1);
   
   //
-  // Block: Make login page links external.
+  // Function: Trigger once element exists.
   //
-  if (location.pathname === "/login"){
+  const triggerWhenExists = function(query, callback){
+    let id = window.setInterval(function(){
+      let ele = document.querySelector(query);
+      
+      if (ele && callback(ele)){
+        window.clearInterval(id);
+      }
+    }, 5);
+  };
+  
+  //
+  // Block: Add profile import button & enable custom styling, make page links external on old login page.
+  //
+  if (isLogin){
     document.addEventListener("DOMContentLoaded", function(){
+      if (isMobile){
+        triggerWhenExists("main h1", function(heading){
+          heading.parentNode.setAttribute("tweetduck-login-wrapper", "");
+          return true;
+        });
+        
+        triggerWhenExists("a[href='/i/flow/signup']", function(texts){
+          texts = texts.parentNode;
+          
+          let link = texts.childNodes[0];
+          let separator = texts.childNodes[1];
+          
+          if (link && separator){
+            texts.classList.add("tweetduck-login-links");
+            
+            link = link.cloneNode(false);
+            link.id = "tweetduck-helper";
+            link.href = "#";
+            link.innerText = "Import TweetDuck profile";
+            
+            texts.appendChild(separator.cloneNode(true));
+            texts.appendChild(link);
+            
+            link.addEventListener("click", function(){
+              $TD.openProfileImport();
+            });
+            
+            return true;
+          }
+          else{
+            return false;
+          }
+        });
+      }
+      else{
         const openLinkExternally = function(e){
           let href = e.currentTarget.getAttribute("href");
           $TD.openBrowser(href[0] === '/' ? location.origin+href : href);
@@ -41,24 +103,34 @@
         let texts = document.querySelector(".page-canvas > div:last-child");
         
         if (texts){
-        texts.insertAdjacentHTML("beforeend", `<p class="tweetduck-helper">Used the TweetDuck app before? <a href="#">Import your profile »</a></p>`);
+          texts.insertAdjacentHTML("beforeend", `<p id="tweetduck-helper">Used the TweetDuck app before? <a href="#">Import your profile »</a></p>`);
           
-        texts.querySelector(".tweetduck-helper > a").addEventListener("click", function(){
+          texts.querySelector("#tweetduck-helper > a").addEventListener("click", function(){
             $TD.openProfileImport();
           });
         }
+      }
     });
   }
-  //
-  // Block: Fix broken Cancel button on logout page.
-  //
-  else if (location.pathname === "/logout"){
-    document.addEventListener("DOMContentLoaded", function(){
-      let cancel = document.querySelector(".buttons .cancel");
   
-      if (cancel && cancel.tagName === "A"){
+  //
-        cancel.href = "https://tweetdeck.twitter.com/";
+  // Block: Hide cookie crap.
+  //
+  if (isMobile){
+    document.addEventListener("DOMContentLoaded", function(){
+      triggerWhenExists("a[href^='https://help.twitter.com/rules-and-policies/twitter-cookies']", function(cookie){
+        while(!!cookie){
+          if (cookie.offsetHeight > 30){
+            cookie.remove();
+            return true;
           }
+          else{
+            cookie = cookie.parentNode;
+          }
+        }
+        
+        return false;
+      });
     });
   }
 })();

Resources/Scripts/update.js

@@ -92,7 +92,6 @@
     });
     
     onClick(ele.querySelector(".tdu-btn-later"), function(){
-      $TDU.onUpdateDelayed();
       exitSlide();
     });
     

TweetDuck.csproj

@@ -55,9 +55,9 @@
   <ItemGroup>
     <Compile Include="Configuration\Arguments.cs" />
     <Compile Include="Configuration\ConfigManager.cs" />
-    <Compile Include="Configuration\LockManager.cs" />
     <Compile Include="Configuration\SystemConfig.cs" />
     <Compile Include="Configuration\UserConfig.cs" />
+    <Compile Include="Core\Adapters\CefScriptExecutor.cs" />
     <Compile Include="Core\Bridge\PropertyBridge.cs" />
     <Compile Include="Core\Bridge\UpdateBridge.cs" />
     <Compile Include="Core\Controls\ControlExtensions.cs" />
@@ -121,7 +121,6 @@
       <DependentUpon>FormNotificationTweet.cs</DependentUpon>
     </Compile>
     <Compile Include="Core\Notification\SoundNotification.cs" />
-    <Compile Include="Core\Notification\TweetNotification.cs" />
     <Compile Include="Core\Other\Analytics\AnalyticsFile.cs" />
     <Compile Include="Core\Other\Analytics\AnalyticsManager.cs" />
     <Compile Include="Core\Other\Analytics\AnalyticsReport.cs" />
@@ -157,6 +156,12 @@
     <Compile Include="Core\Other\Settings\Dialogs\DialogSettingsAnalytics.Designer.cs">
       <DependentUpon>DialogSettingsAnalytics.cs</DependentUpon>
     </Compile>
+    <Compile Include="Core\Other\Settings\Dialogs\DialogSettingsExternalProgram.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Core\Other\Settings\Dialogs\DialogSettingsExternalProgram.Designer.cs">
+      <DependentUpon>DialogSettingsExternalProgram.cs</DependentUpon>
+    </Compile>
     <Compile Include="Core\Other\Settings\Dialogs\DialogSettingsSearchEngine.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -193,6 +198,12 @@
     <Compile Include="Core\Other\Settings\TabSettingsFeedback.Designer.cs">
       <DependentUpon>TabSettingsFeedback.cs</DependentUpon>
     </Compile>
+    <Compile Include="Core\Other\Settings\TabSettingsTray.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Core\Other\Settings\TabSettingsTray.Designer.cs">
+      <DependentUpon>TabSettingsTray.cs</DependentUpon>
+    </Compile>
     <Compile Include="Core\TweetDeckBrowser.cs" />
     <Compile Include="Core\Utils\TwitterUtils.cs" />
     <Compile Include="Core\Management\ProfileManager.cs" />
@@ -238,23 +249,26 @@
     <Compile Include="Core\Other\FormSettings.Designer.cs">
       <DependentUpon>FormSettings.cs</DependentUpon>
     </Compile>
+    <Compile Include="Impl\LockHandler.cs" />
+    <Compile Include="Impl\SystemHandler.cs" />
     <Compile Include="Plugins\PluginControl.cs">
       <SubType>UserControl</SubType>
     </Compile>
     <Compile Include="Plugins\PluginControl.Designer.cs">
       <DependentUpon>PluginControl.cs</DependentUpon>
     </Compile>
-    <Compile Include="Plugins\PluginListFlowLayout.cs">
+    <Compile Include="Plugins\PluginDispatcher.cs" />
+    <Compile Include="Core\Controls\FlowLayoutPanelNoHScroll.cs">
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Configuration\PluginConfig.cs" />
-    <Compile Include="Plugins\PluginManager.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
     <Compile Include="Reporter.cs" />
+    <Compile Include="Resources\ScriptLoaderDebug.cs" />
     <Compile Include="Updates\FormUpdateDownload.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -394,7 +408,7 @@ IF EXIST "$(ProjectDir)bld\post_build.exe" (
     <Exec Command="start &quot;&quot; /B &quot;ISCC.exe&quot; /Q &quot;$(ProjectDir)bld\gen_upd.iss&quot;" WorkingDirectory="$(ProjectDir)bld\" IgnoreExitCode="true" />
   </Target>
   <PropertyGroup>
-    <PreBuildEvent>powershell Get-Process TweetDuck.Browser -ErrorAction SilentlyContinue ^| Where-Object {$_.Path -eq '$(TargetDir)TweetDuck.Browser.exe'} ^| Stop-Process; Exit 0</PreBuildEvent>
+    <PreBuildEvent>powershell -NoProfile -Command "$ErrorActionPreference = 'SilentlyContinue'; (Get-Process TweetDuck.Browser | Where-Object {$_.Path -eq '$(TargetDir)TweetDuck.Browser.exe'}).Kill(); Exit 0"</PreBuildEvent>
   </PropertyGroup>
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>

Updates/FormUpdateDownload.cs

@@ -12,7 +12,7 @@ namespace TweetDuck.Updates{
             this.updateInfo = info;
 
             Text = "Updating " + Program.BrandName;
-            labelDescription.Text = "Downloading version "+info.VersionTag+"...";
+            labelDescription.Text = $"Downloading version {info.VersionTag}...";
             timerDownloadCheck.Start();
         }
 

Updates/UpdateCheckClient.cs

@@ -49,11 +49,11 @@ namespace TweetDuck.Updates{
         }
 
         private UpdateInfo ParseFromJson(string json){
-            bool IsUpdaterAsset(JsonObject obj){
+            static bool IsUpdaterAsset(JsonObject obj){
                 return UpdaterAssetName == (string)obj["name"];
             }
 
-            string AssetDownloadUrl(JsonObject obj){
+            static string AssetDownloadUrl(JsonObject obj){
                 return (string)obj["browser_download_url"];
             }
             

lib/TweetLib.Communication/TweetLib.Communication.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\..\packages\Microsoft.Net.Compilers.3.0.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\..\packages\Microsoft.Net.Compilers.3.0.0\build\Microsoft.Net.Compilers.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -11,6 +11,7 @@
     <RootNamespace>TweetLib.Communication</RootNamespace>
     <AssemblyName>TweetLib.Communication</AssemblyName>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <LangVersion>8.0</LangVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
@@ -23,7 +24,6 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -33,7 +33,6 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <LangVersion>7</LangVersion>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />

lib/TweetLib.Core/App.cs

@@ -4,16 +4,25 @@ using TweetLib.Core.Application;
 namespace TweetLib.Core{
     public sealed class App{
         public static IAppErrorHandler ErrorHandler { get; private set; }
+        public static IAppLockHandler LockHandler { get; private set; }
+        public static IAppSystemHandler SystemHandler { get; private set; }
+        public static IAppResourceHandler ResourceHandler { get; private set; }
 
         // Builder
 
         public sealed class Builder{
             public IAppErrorHandler? ErrorHandler { get; set; }
+            public IAppLockHandler? LockHandler { get; set; }
+            public IAppSystemHandler? SystemHandler { get; set; }
+            public IAppResourceHandler? ResourceHandler { get; set; }
 
             // Validation
 
             internal void Initialize(){
                 App.ErrorHandler = Validate(ErrorHandler, nameof(ErrorHandler))!;
+                App.LockHandler = Validate(LockHandler, nameof(LockHandler))!;
+                App.SystemHandler = Validate(SystemHandler, nameof(SystemHandler))!;
+                App.ResourceHandler = Validate(ResourceHandler, nameof(ResourceHandler))!;
             }
 
             private T Validate<T>(T obj, string name){

lib/TweetLib.Core/Application/Helpers/LockManager.cs

@@ -1,12 +1,11 @@
 using System;
-using System.ComponentModel;
 using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
 using System.IO;
 using System.Threading;
-using TweetDuck.Core.Utils;
 
-namespace TweetDuck.Configuration{
+namespace TweetLib.Core.Application.Helpers{
-    sealed class LockManager{
+    public sealed class LockManager{
         private const int RetryDelay = 250;
 
         public enum Result{
@@ -14,8 +13,8 @@ namespace TweetDuck.Configuration{
         }
 
         private readonly string file;
-        private FileStream lockStream;
+        private FileStream? lockStream;
-        private Process lockingProcess;
+        private Process? lockingProcess;
 
         public LockManager(string file){
             this.file = file;
@@ -37,7 +36,7 @@ namespace TweetDuck.Configuration{
         private Result TryCreateLockFile(){
             void CreateLockFileStream(){
                 lockStream = new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.Read);
-                lockStream.Write(BitConverter.GetBytes(WindowsUtils.CurrentProcessID), 0, sizeof(int));
+                lockStream.Write(BitConverter.GetBytes(CurrentProcessID), 0, sizeof(int));
                 lockStream.Flush(true);
             }
 
@@ -82,14 +81,12 @@ namespace TweetDuck.Configuration{
                     try{
                         Process foundProcess = Process.GetProcessById(pid);
 
-                        using(Process currentProcess = Process.GetCurrentProcess()){
+                        if (MatchesCurrentProcess(foundProcess)){
-                            if (foundProcess.MainModule.FileVersionInfo.InternalName == currentProcess.MainModule.FileVersionInfo.InternalName){
                             lockingProcess = foundProcess;
                         }
                         else{
                             foundProcess.Close();
                         }
-                        }
                     }catch{
                         // GetProcessById throws ArgumentException if the process is missing
                         // Process.MainModule can throw exceptions in some cases
@@ -124,7 +121,7 @@ namespace TweetDuck.Configuration{
                 try{
                     File.Delete(file);
                 }catch(Exception e){
-                    Program.Reporter.LogImportant(e.ToString());
+                    App.ErrorHandler.Log(e.ToString());
                     return false;
                 }
             }
@@ -134,50 +131,32 @@ namespace TweetDuck.Configuration{
 
         // Locking process
         
-        public bool RestoreLockingProcess(int failTimeout){
+        public bool RestoreLockingProcess(){
-            if (lockingProcess != null && lockingProcess.MainWindowHandle == IntPtr.Zero){ // restore if the original process is in tray
+            return lockingProcess != null && App.LockHandler.RestoreProcess(lockingProcess);
-                NativeMethods.BroadcastMessage(Program.WindowRestoreMessage, (uint)lockingProcess.Id, 0);
-
-                if (WindowsUtils.TrySleepUntil(() => CheckLockingProcessExited() || (lockingProcess.MainWindowHandle != IntPtr.Zero && lockingProcess.Responding), failTimeout, RetryDelay)){
-                    return true;
-                }
         }
 
-            return false;
+        public bool CloseLockingProcess(){
-        }
+            if (lockingProcess != null && App.LockHandler.CloseProcess(lockingProcess)){
-
-        public bool CloseLockingProcess(int closeTimeout, int killTimeout){
-            if (lockingProcess != null){
-                try{
-                    if (lockingProcess.CloseMainWindow()){
-                        WindowsUtils.TrySleepUntil(CheckLockingProcessExited, closeTimeout, RetryDelay);
-                    }
-
-                    if (!lockingProcess.HasExited){
-                        lockingProcess.Kill();
-                        WindowsUtils.TrySleepUntil(CheckLockingProcessExited, killTimeout, RetryDelay);
-                    }
-
-                    if (lockingProcess.HasExited){
-                        lockingProcess.Dispose();
                 lockingProcess = null;
                 return true;
             }
-                }catch(Exception ex) when (ex is InvalidOperationException || ex is Win32Exception){
-                    if (lockingProcess != null){
-                        bool hasExited = CheckLockingProcessExited();
-                        lockingProcess.Dispose();
-                        return hasExited;
-                    }
-                }
-            }
 
             return false;
         }
 
-        private bool CheckLockingProcessExited(){
+        // Utilities
-            lockingProcess.Refresh();
+
-            return lockingProcess.HasExited;
+        private static int CurrentProcessID{
+            get{
+                using Process me = Process.GetCurrentProcess();
+                return me.Id;
+            }
+        }
+
+        [SuppressMessage("ReSharper", "PossibleNullReferenceException")]
+        private static bool MatchesCurrentProcess(Process process){
+            using Process current = Process.GetCurrentProcess();
+            return current.MainModule.FileVersionInfo.InternalName == process.MainModule.FileVersionInfo.InternalName;
         }
     }
 }

lib/TweetLib.Core/Application/IAppLockHandler.cs

@@ -0,0 +1,8 @@
+using System.Diagnostics;
+
+namespace TweetLib.Core.Application{
+    public interface IAppLockHandler{
+        bool RestoreProcess(Process process);
+        bool CloseProcess(Process process);
+    }
+}

lib/TweetLib.Core/Application/IAppResourceHandler.cs

@@ -0,0 +1,5 @@
+namespace TweetLib.Core.Application{
+    public interface IAppResourceHandler{
+        string? Load(string path);
+    }
+}

lib/TweetLib.Core/Application/IAppSystemHandler.cs

@@ -0,0 +1,5 @@
+namespace TweetLib.Core.Application{
+    public interface IAppSystemHandler{
+        void OpenFileExplorer(string path);
+    }
+}

lib/TweetLib.Core/Browser/IScriptExecutor.cs

@@ -0,0 +1,7 @@
+namespace TweetLib.Core.Browser{
+    public interface IScriptExecutor{
+        void RunFunction(string name, params object[] args);
+        void RunScript(string identifier, string script);
+        bool RunFile(string file);
+    }
+}

lib/TweetLib.Core/Features/Notifications/DesktopNotification.cs

@@ -1,15 +1,9 @@
 using System;
 using System.Text;
-using System.Windows.Forms;
-using CefSharp;
-using TweetDuck.Core.Bridge;
-using TweetDuck.Data;
-using TweetDuck.Resources;
 
-namespace TweetDuck.Core.Notification{
+namespace TweetLib.Core.Features.Notifications{
-    sealed class TweetNotification{
+    public sealed class DesktopNotification{
         private const string DefaultHeadLayout = @"<html class=""scroll-v os-windows dark txt-size--14"" lang=""en-US"" id=""tduck"" data-td-font=""medium"" data-td-theme=""dark""><head><meta charset=""utf-8""><link href=""https://ton.twimg.com/tweetdeck-web/web/dist/bundle.4b1f87e09d.css"" rel=""stylesheet""><style type='text/css'>body { background: rgb(34, 36, 38) !important }</style>";
-        public static readonly ResourceLink AppLogo = new ResourceLink("https://ton.twimg.com/tduck/avatar", ResourceHandler.FromByteArray(Properties.Resources.avatar, "image/png"));
 
         public enum Position{
             TopLeft, TopRight, BottomLeft, BottomRight, Custom
@@ -29,7 +23,7 @@ namespace TweetDuck.Core.Notification{
         private readonly string html;
         private readonly int characters;
         
-        public TweetNotification(string columnId, string chirpId, string title, string html, int characters, string tweetUrl, string quoteUrl){
+        public DesktopNotification(string columnId, string chirpId, string title, string html, int characters, string tweetUrl, string quoteUrl){
             this.ColumnId = columnId;
             this.ChirpId = chirpId;
 
@@ -45,18 +39,19 @@ namespace TweetDuck.Core.Notification{
             return 2000 + Math.Max(1000, value * characters);
         }
 
-        public string GenerateHtml(string bodyClasses, Control sync){
+        public string GenerateHtml(string bodyClasses, string? headLayout, string? customStyles){ // TODO
-            string headLayout = TweetDeckBridge.NotificationHeadLayout ?? DefaultHeadLayout;
+            headLayout ??= DefaultHeadLayout;
-            string mainCSS = ScriptLoader.LoadResource("styles/notification.css", sync) ?? string.Empty;
+            customStyles ??= string.Empty;
-            string customCSS = Program.Config.User.CustomNotificationCSS ?? string.Empty;
 
-            StringBuilder build = new StringBuilder(320 + headLayout.Length + mainCSS.Length + customCSS.Length + html.Length);
+            string mainCSS = App.ResourceHandler.Load("styles/notification.css") ?? string.Empty;
+            
+            StringBuilder build = new StringBuilder(320 + headLayout.Length + mainCSS.Length + customStyles.Length + html.Length);
             build.Append("<!DOCTYPE html>");
             build.Append(headLayout);
             build.Append("<style type='text/css'>").Append(mainCSS).Append("</style>");
 
-            if (!string.IsNullOrWhiteSpace(customCSS)){
+            if (!string.IsNullOrWhiteSpace(customStyles)){
-                build.Append("<style type='text/css'>").Append(customCSS).Append("</style>");
+                build.Append("<style type='text/css'>").Append(customStyles).Append("</style>");
             }
             
             build.Append("</head><body class='scroll-styled-v");

lib/TweetLib.Core/Features/Plugins/Enums/PluginEnvironment.cs

@@ -2,23 +2,17 @@
 using System.Collections.Generic;
 
 namespace TweetLib.Core.Features.Plugins.Enums{
-    [Flags]
     public enum PluginEnvironment{
-        None = 0,
+        Browser,
-        Browser = 1,
+        Notification
-        Notification = 2
     }
 
-    public static class PluginEnvironmentExtensions{
+    public static class PluginEnvironments{
-        public static IEnumerable<PluginEnvironment> Values { get; } = new PluginEnvironment[]{
+        public static IEnumerable<PluginEnvironment> All { get; } = new PluginEnvironment[]{
             PluginEnvironment.Browser,
             PluginEnvironment.Notification
         };
 
-        public static bool IncludesDisabledPlugins(this PluginEnvironment environment){
-            return environment == PluginEnvironment.Browser;
-        }
-
         public static string? GetPluginScriptFile(this PluginEnvironment environment){
             return environment switch{
                 PluginEnvironment.Browser      => "browser.js",

lib/TweetLib.Core/Features/Plugins/Enums/PluginGroup.cs

@@ -6,8 +6,8 @@ namespace TweetLib.Core.Features.Plugins.Enums{
         Official, Custom
     }
 
-    public static class PluginGroupExtensions{
+    public static class PluginGroups{
-        public static IEnumerable<PluginGroup> Values { get; } = new PluginGroup[]{
+        public static IEnumerable<PluginGroup> All { get; } = new PluginGroup[]{
             PluginGroup.Official,
             PluginGroup.Custom
         };

lib/TweetLib.Core/Features/Plugins/Events/PluginDispatchEventArgs.cs

@@ -0,0 +1,12 @@
+using System;
+using TweetLib.Core.Browser;
+
+namespace TweetLib.Core.Features.Plugins.Events{
+    public sealed class PluginDispatchEventArgs : EventArgs{
+        public IScriptExecutor Executor { get; }
+
+        public PluginDispatchEventArgs(IScriptExecutor executor){
+            this.Executor = executor;
+        }
+    }
+}

lib/TweetLib.Core/Features/Plugins/IPluginDispatcher.cs

@@ -0,0 +1,9 @@
+using System;
+using TweetLib.Core.Features.Plugins.Events;
+
+namespace TweetLib.Core.Features.Plugins{
+    public interface IPluginDispatcher{
+        event EventHandler<PluginDispatchEventArgs> Ready;
+        void AttachBridge(string name, object bridge);
+    }
+}

lib/TweetLib.Core/Features/Plugins/IPluginManager.cs

@@ -1,14 +0,0 @@
-using System;
-using TweetLib.Core.Features.Plugins.Config;
-using TweetLib.Core.Features.Plugins.Events;
-
-namespace TweetLib.Core.Features.Plugins{
-    public interface IPluginManager{
-        IPluginConfig Config { get; }
-
-        event EventHandler<PluginErrorEventArgs> Reloaded;
-
-        int GetTokenFromPlugin(Plugin plugin);
-        Plugin GetPluginFromToken(int token);
-    }
-}

lib/TweetLib.Core/Features/Plugins/Plugin.cs

@@ -1,5 +1,7 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using TweetLib.Core.Features.Plugins.Enums;
 
 namespace TweetLib.Core.Features.Plugins{
@@ -8,7 +10,6 @@ namespace TweetLib.Core.Features.Plugins{
 
         public string Identifier { get; }
         public PluginGroup Group { get; }
-        public PluginEnvironment Environments { get; }
 
         public string Name { get; }
         public string Description { get; }
@@ -39,14 +40,15 @@ namespace TweetLib.Core.Features.Plugins{
 
         private readonly string pathRoot;
         private readonly string pathData;
+        private readonly ISet<PluginEnvironment> environments;
 
         private Plugin(PluginGroup group, string identifier, string pathRoot, string pathData, Builder builder){
             this.pathRoot = pathRoot;
             this.pathData = pathData;
+            this.environments = builder.Environments;
 
             this.Group = group;
             this.Identifier = identifier;
-            this.Environments = builder.Environments;
 
             this.Name = builder.Name;
             this.Description = builder.Description;
@@ -60,8 +62,12 @@ namespace TweetLib.Core.Features.Plugins{
             this.CanRun = AppVersion >= RequiredVersion;
         }
 
+        public bool HasEnvironment(PluginEnvironment environment){
+            return environments.Contains(environment);
+        }
+
         public string GetScriptPath(PluginEnvironment environment){
-            if (Environments.HasFlag(environment)){
+            if (environments.Contains(environment)){
                 string? file = environment.GetPluginScriptFile();
                 return file != null ? Path.Combine(pathRoot, file) : string.Empty;
             }
@@ -133,7 +139,7 @@ namespace TweetLib.Core.Features.Plugins{
             public string ConfigDefault    { get; set; } = string.Empty;
             public Version RequiredVersion { get; set; } = DefaultRequiredVersion;
 
-            public PluginEnvironment Environments { get; private set; } = PluginEnvironment.None;
+            public ISet<PluginEnvironment> Environments { get; } = new HashSet<PluginEnvironment>();
 
             private readonly PluginGroup group;
             private readonly string pathRoot;
@@ -148,7 +154,7 @@ namespace TweetLib.Core.Features.Plugins{
             }
 
             public void AddEnvironment(PluginEnvironment environment){
-                this.Environments |= environment;
+                Environments.Add(environment);
             }
 
             public Plugin BuildAndSetup(){
@@ -158,7 +164,7 @@ namespace TweetLib.Core.Features.Plugins{
                     throw new InvalidOperationException("Plugin is missing a name in the .meta file");
                 }
 
-                if (plugin.Environments == PluginEnvironment.None){
+                if (!PluginEnvironments.All.Any(plugin.HasEnvironment)){
                     throw new InvalidOperationException("Plugin has no script files");
                 }
 

lib/TweetLib.Core/Features/Plugins/PluginBridge.cs

@@ -11,29 +11,56 @@ using TweetLib.Core.Utils;
 
 namespace TweetLib.Core.Features.Plugins{
     [SuppressMessage("ReSharper", "UnusedMember.Global")]
-    public sealed class PluginBridge{
+    internal sealed class PluginBridge{
-        private readonly IPluginManager manager;
+        private readonly Dictionary<int, Plugin> tokens = new Dictionary<int, Plugin>();
+        private readonly Random rand = new Random();
+
         private readonly FileCache fileCache = new FileCache();
         private readonly TwoKeyDictionary<int, string, InjectedHTML> notificationInjections = new TwoKeyDictionary<int, string, InjectedHTML>(4, 1);
 
-        public IEnumerable<InjectedHTML> NotificationInjections => notificationInjections.InnerValues;
+        internal IEnumerable<InjectedHTML> NotificationInjections => notificationInjections.InnerValues;
-        public ISet<Plugin> WithConfigureFunction { get; } = new HashSet<Plugin>();
+        internal ISet<Plugin> WithConfigureFunction { get; } = new HashSet<Plugin>();
 
-        public PluginBridge(IPluginManager manager){
+        public PluginBridge(PluginManager manager){
-            this.manager = manager;
+            manager.Reloaded += manager_Reloaded;
-            this.manager.Reloaded += manager_Reloaded;
+            manager.Config.PluginChangedState += Config_PluginChangedState;
-            this.manager.Config.PluginChangedState += Config_PluginChangedState;
+        }
+
+        internal int GetTokenFromPlugin(Plugin plugin){
+            foreach(KeyValuePair<int, Plugin> kvp in tokens){
+                if (kvp.Value.Equals(plugin)){
+                    return kvp.Key;
+                }
+            }
+
+            int token, attempts = 1000;
+
+            do{
+                token = rand.Next();
+            }while(tokens.ContainsKey(token) && --attempts >= 0);
+            
+            if (attempts < 0){
+                token = -tokens.Count - 1;
+            }
+
+            tokens[token] = plugin;
+            return token;
+        }
+
+        private Plugin? GetPluginFromToken(int token){
+            return tokens.TryGetValue(token, out Plugin plugin) ? plugin : null;
         }
 
         // Event handlers
 
         private void manager_Reloaded(object sender, PluginErrorEventArgs e){
+            tokens.Clear();
             fileCache.Clear();
         }
 
         private void Config_PluginChangedState(object sender, PluginChangedStateEventArgs e){
             if (!e.IsEnabled){
-                int token = manager.GetTokenFromPlugin(e.Plugin);
+                int token = GetTokenFromPlugin(e.Plugin);
 
                 fileCache.Remove(token);
                 notificationInjections.Remove(token);
@@ -43,7 +70,7 @@ namespace TweetLib.Core.Features.Plugins{
         // Utility methods
 
         private string GetFullPathOrThrow(int token, PluginFolder folder, string path){
-            Plugin plugin = manager.GetPluginFromToken(token);
+            Plugin? plugin = GetPluginFromToken(token);
             string fullPath = plugin == null ? string.Empty : plugin.GetFullPathIfSafe(folder, path);
 
             if (fullPath.Length == 0){
@@ -116,7 +143,7 @@ namespace TweetLib.Core.Features.Plugins{
         }
 
         public void SetConfigurable(int token){
-            Plugin plugin = manager.GetPluginFromToken(token);
+            Plugin? plugin = GetPluginFromToken(token);
 
             if (plugin != null){
                 WithConfigureFunction.Add(plugin);

lib/TweetLib.Core/Features/Plugins/PluginLoader.cs

@@ -79,7 +79,7 @@ namespace TweetLib.Core.Features.Plugins{
         }
 
         private static PluginEnvironment EnvironmentFromFileName(string file){
-            return PluginEnvironmentExtensions.Values.FirstOrDefault(env => file.Equals(env.GetPluginScriptFile(), StringComparison.Ordinal));
+            return PluginEnvironments.All.FirstOrDefault(env => file.Equals(env.GetPluginScriptFile(), StringComparison.Ordinal));
         }
 
         private static void SetProperty(Plugin.Builder builder, string tag, string value){

lib/TweetLib.Core/Features/Plugins/PluginManager.cs

@@ -0,0 +1,123 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using TweetLib.Core.Browser;
+using TweetLib.Core.Data;
+using TweetLib.Core.Features.Plugins.Config;
+using TweetLib.Core.Features.Plugins.Enums;
+using TweetLib.Core.Features.Plugins.Events;
+
+namespace TweetLib.Core.Features.Plugins{
+    public sealed class PluginManager{
+        public string PathCustomPlugins => Path.Combine(pluginFolder, PluginGroup.Custom.GetSubFolder());
+
+        public IEnumerable<Plugin> Plugins => plugins;
+        public IEnumerable<InjectedHTML> NotificationInjections => bridge.NotificationInjections;
+        
+        public IPluginConfig Config { get; }
+        
+        public event EventHandler<PluginErrorEventArgs> Reloaded;
+        public event EventHandler<PluginErrorEventArgs> Executed;
+        
+        private readonly string pluginFolder;
+        private readonly string pluginDataFolder;
+
+        private readonly PluginBridge bridge;
+        private IScriptExecutor? browserExecutor;
+
+        private readonly HashSet<Plugin> plugins = new HashSet<Plugin>();
+
+        public PluginManager(IPluginConfig config, string pluginFolder, string pluginDataFolder){
+            this.Config = config;
+            this.Config.PluginChangedState += Config_PluginChangedState;
+
+            this.pluginFolder = pluginFolder;
+            this.pluginDataFolder = pluginDataFolder;
+            
+            this.bridge = new PluginBridge(this);
+        }
+
+        public void Register(PluginEnvironment environment, IPluginDispatcher dispatcher){
+            dispatcher.AttachBridge("$TDP", bridge);
+            dispatcher.Ready += (sender, args) => {
+                IScriptExecutor executor = args.Executor;
+
+                if (environment == PluginEnvironment.Browser){
+                    browserExecutor = executor;
+                }
+
+                Execute(environment, executor);
+            };
+        }
+
+        public void Reload(){
+            plugins.Clear();
+
+            List<string> errors = new List<string>(1);
+
+            foreach(var result in PluginGroups.All.SelectMany(group => PluginLoader.AllInFolder(pluginFolder, pluginDataFolder, group))){
+                if (result.HasValue){
+                    plugins.Add(result.Value);
+                }
+                else{
+                    errors.Add(result.Exception.Message);
+                }
+            }
+
+            Reloaded?.Invoke(this, new PluginErrorEventArgs(errors));
+        }
+
+        private void Execute(PluginEnvironment environment, IScriptExecutor executor){
+            if (!plugins.Any(plugin => plugin.HasEnvironment(environment)) || !executor.RunFile($"plugins.{environment.GetPluginScriptFile()}")){
+                return;
+            }
+            
+            bool includeDisabled = environment == PluginEnvironment.Browser;
+
+            if (includeDisabled){
+                executor.RunScript("gen:pluginconfig", PluginScriptGenerator.GenerateConfig(Config));
+            }
+
+            List<string> errors = new List<string>(1);
+
+            foreach(Plugin plugin in Plugins){
+                string path = plugin.GetScriptPath(environment);
+
+                if (string.IsNullOrEmpty(path) || (!includeDisabled && !Config.IsEnabled(plugin)) || !plugin.CanRun){
+                    continue;
+                }
+
+                string script;
+
+                try{
+                    script = File.ReadAllText(path);
+                }catch(Exception e){
+                    errors.Add($"{plugin.Identifier} ({Path.GetFileName(path)}): {e.Message}");
+                    continue;
+                }
+                
+                executor.RunScript($"plugin:{plugin}", PluginScriptGenerator.GeneratePlugin(plugin.Identifier, script, bridge.GetTokenFromPlugin(plugin), environment));
+            }
+            
+            Executed?.Invoke(this, new PluginErrorEventArgs(errors));
+        }
+
+        private void Config_PluginChangedState(object sender, PluginChangedStateEventArgs e){
+            browserExecutor?.RunFunction("TDPF_setPluginState", e.Plugin, e.IsEnabled);
+        }
+
+        public bool IsPluginConfigurable(Plugin plugin){
+            return plugin.HasConfig || bridge.WithConfigureFunction.Contains(plugin);
+        }
+
+        public void ConfigurePlugin(Plugin plugin){
+            if (bridge.WithConfigureFunction.Contains(plugin) && browserExecutor != null){
+                browserExecutor.RunFunction("TDPF_configurePlugin", plugin);
+            }
+            else if (plugin.HasConfig){
+                App.SystemHandler.OpenFileExplorer(File.Exists(plugin.ConfigPath) ? plugin.ConfigPath : plugin.GetPluginFolder(PluginFolder.Data));
+            }
+        }
+    }
+}

lib/TweetLib.Core/Features/Twitter/ImageUrl.cs

@@ -5,7 +5,7 @@ using TweetLib.Core.Utils;
 
 namespace TweetLib.Core.Features.Twitter{
     public class ImageUrl{
-        private static readonly Regex RegexImageUrlParams = new Regex(@"(format|name)=(\w+)", RegexOptions.IgnoreCase | RegexOptions.Compiled);
+        private static readonly Regex RegexImageUrlParams = new Regex(@"(format|name)=(\w+)", RegexOptions.IgnoreCase);
 
         public static readonly string[] ValidExtensions = {
             ".jpg", ".jpeg", ".png", ".gif"

lib/TweetLib.Core/Features/Twitter/TwitterUrls.cs

@@ -0,0 +1,57 @@
+using System;
+using System.IO;
+using System.Text.RegularExpressions;
+using TweetLib.Core.Utils;
+
+namespace TweetLib.Core.Features.Twitter{
+    public static class TwitterUrls{
+        public const string TweetDeck = "https://tweetdeck.twitter.com";
+        private const string TwitterTrackingUrl = "t.co";
+
+        public static Regex RegexAccount { get; } = new Regex(@"^https?://twitter\.com/(?!signup$|tos$|privacy$|search$|search-)([^/?]+)/?$");
+
+        public static bool IsTweetDeck(string url){
+            return url.Contains("//tweetdeck.twitter.com/");
+        }
+
+        public static bool IsTwitter(string url){
+            return url.Contains("//twitter.com/") || url.Contains("//mobile.twitter.com/");
+        }
+
+        public static bool IsTwitterLogin2Factor(string url){
+            return url.Contains("//twitter.com/account/login_verification") || url.Contains("//mobile.twitter.com/account/login_verification");
+        }
+
+        public static string? GetFileNameFromUrl(string url){
+            return StringUtils.NullIfEmpty(Path.GetFileName(new Uri(url).AbsolutePath));
+        }
+
+        public static string GetMediaLink(string url, ImageQuality quality){
+            return ImageUrl.TryParse(url, out var obj) ? obj.WithQuality(quality) : url;
+        }
+
+        public static string? GetImageFileName(string url){
+            return GetFileNameFromUrl(ImageUrl.TryParse(url, out var obj) ? obj.WithNoQuality : url);
+        }
+
+        public enum UrlType{
+            Invalid, Tracking, Fine
+        }
+
+        public static UrlType Check(string url){
+            if (url.Contains("\"")){
+                return UrlType.Invalid;
+            }
+
+            if (Uri.TryCreate(url, UriKind.Absolute, out Uri uri)){
+                string scheme = uri.Scheme;
+
+                if (scheme == Uri.UriSchemeHttps || scheme == Uri.UriSchemeHttp || scheme == Uri.UriSchemeFtp || scheme == Uri.UriSchemeMailto){
+                    return uri.Host == TwitterTrackingUrl ? UrlType.Tracking : UrlType.Fine;
+                }
+            }
+
+            return UrlType.Invalid;
+        }
+    }
+}

lib/TweetLib.Core/Lib.cs

@@ -4,7 +4,7 @@ using System.Threading;
 namespace TweetLib.Core{
     public static class Lib{
         public const string BrandName = "TweetDuck";
-        public const string VersionTag = "1.18.1";
+        public const string VersionTag = "1.18.3";
 
         public static CultureInfo Culture { get; private set; }
 

lib/TweetLib.Core/Utils/LocaleUtils.cs

@@ -28,6 +28,18 @@ namespace TweetLib.Core.Utils{
             "th", "tr", "uk", "vi", "ar", "fa"
         }.Select(code => new Item(code)).OrderBy(code => code).ToList();
 
+        public static int GetJQueryDayOfWeek(DayOfWeek dow){
+            return dow switch{
+                DayOfWeek.Monday    => 1,
+                DayOfWeek.Tuesday   => 2,
+                DayOfWeek.Wednesday => 3,
+                DayOfWeek.Thursday  => 4,
+                DayOfWeek.Friday    => 5,
+                DayOfWeek.Saturday  => 6,
+                _                   => 0
+            };
+        }
+
         public sealed class Item : IComparable<Item>{
             public string Code { get; }
 

lib/TweetLib.Core/Utils/StringUtils.cs

@@ -6,6 +6,10 @@ namespace TweetLib.Core.Utils{
     public static class StringUtils{
         public static readonly string[] EmptyArray = new string[0];
 
+        public static string? NullIfEmpty(string str){
+            return string.IsNullOrEmpty(str) ? null : str;
+        }
+
         public static (string before, string after)? SplitInTwo(string str, char search, int startIndex = 0){
             int index = str.IndexOf(search, startIndex);
 

lib/TweetLib.Core/Utils/UrlUtils.cs

@@ -1,29 +0,0 @@
-using System;
-using System.IO;
-
-namespace TweetLib.Core.Utils{
-    public static class UrlUtils{
-        private const string TwitterTrackingUrl = "t.co";
-
-        public enum CheckResult{
-            Invalid, Tracking, Fine
-        }
-
-        public static CheckResult Check(string url){
-            if (Uri.TryCreate(url, UriKind.Absolute, out Uri uri)){
-                string scheme = uri.Scheme;
-
-                if (scheme == Uri.UriSchemeHttps || scheme == Uri.UriSchemeHttp || scheme == Uri.UriSchemeFtp || scheme == Uri.UriSchemeMailto){
-                    return uri.Host == TwitterTrackingUrl ? CheckResult.Tracking : CheckResult.Fine;
-                }
-            }
-
-            return CheckResult.Invalid;
-        }
-
-        public static string? GetFileNameFromUrl(string url){
-            string file = Path.GetFileName(new Uri(url).AbsolutePath);
-            return string.IsNullOrEmpty(file) ? null : file;
-        }
-    }
-}

lib/TweetTest.Unit/Core/TestTwitterUrls.fs

@@ -0,0 +1,187 @@
+namespace TweetTest.Core.TestTwitterUrls
+
+open Xunit
+open TweetLib.Core.Features.Twitter
+
+
+module Check =
+    type Result = TwitterUrls.UrlType
+
+    [<Fact>]
+    let ``accepts HTTP protocol`` () =
+        Assert.Equal(Result.Fine, TwitterUrls.Check("http://example.com"))
+
+    [<Fact>]
+    let ``accepts HTTPS protocol`` () =
+        Assert.Equal(Result.Fine, TwitterUrls.Check("https://example.com"))
+
+    [<Fact>]
+    let ``accepts FTP protocol`` () =
+        Assert.Equal(Result.Fine, TwitterUrls.Check("ftp://example.com"))
+
+    [<Fact>]
+    let ``accepts MAILTO protocol`` () =
+        Assert.Equal(Result.Fine, TwitterUrls.Check("mailto://someone@example.com"))
+
+    [<Fact>]
+    let ``accepts URL with port, path, query, and hash`` () =
+        Assert.Equal(Result.Fine, TwitterUrls.Check("http://www.example.co.uk:80/path?key=abc&array[]=5#hash"))
+
+    [<Fact>]
+    let ``accepts IPv4 address`` () =
+        Assert.Equal(Result.Fine, TwitterUrls.Check("http://127.0.0.1"))
+
+    [<Fact>]
+    let ``accepts IPv6 address`` () =
+        Assert.Equal(Result.Fine, TwitterUrls.Check("http://[2001:db8:0:0:0:ff00:42:8329]"))
+
+    [<Fact>]
+    let ``recognizes t.co as tracking URL`` () =
+        Assert.Equal(Result.Tracking, TwitterUrls.Check("http://t.co/12345"))
+
+    [<Fact>]
+    let ``rejects empty URL`` () =
+        Assert.Equal(Result.Invalid, TwitterUrls.Check(""))
+
+    [<Fact>]
+    let ``rejects missing protocol`` () =
+        Assert.Equal(Result.Invalid, TwitterUrls.Check("www.example.com"))
+
+    [<Fact>]
+    let ``rejects banned protocol`` () =
+        Assert.Equal(Result.Invalid, TwitterUrls.Check("file://example.com"))
+        
+
+module GetFileNameFromUrl =
+
+    [<Fact>]
+    let ``simple file URL returns file name`` () =
+        Assert.Equal("index.html", TwitterUrls.GetFileNameFromUrl("http://example.com/index.html"))
+
+    [<Fact>]
+    let ``file URL with query returns file name`` () =
+        Assert.Equal("index.html", TwitterUrls.GetFileNameFromUrl("http://example.com/index.html?version=2"))
+
+    [<Fact>]
+    let ``file URL w/o extension returns file name`` () =
+        Assert.Equal("index", TwitterUrls.GetFileNameFromUrl("http://example.com/index"))
+
+    [<Fact>]
+    let ``file URL with trailing dot returns file name with dot`` () =
+        Assert.Equal("index.", TwitterUrls.GetFileNameFromUrl("http://example.com/index."))
+
+    [<Fact>]
+    let ``root URL returns null`` () =
+        Assert.Null(TwitterUrls.GetFileNameFromUrl("http://example.com"))
+
+    [<Fact>]
+    let ``path URL returns null`` () =
+        Assert.Null(TwitterUrls.GetFileNameFromUrl("http://example.com/path/"))
+
+
+module GetMediaLink_Default =
+    let getMediaLinkDefault url = TwitterUrls.GetMediaLink(url, ImageQuality.Default)
+    let domain = "https://pbs.twimg.com"
+
+    [<Fact>]
+    let ``does not modify URL w/o extension`` () =
+        Assert.Equal(domain + "/media/123", getMediaLinkDefault(domain + "/media/123"))
+
+    [<Fact>]
+    let ``does not modify URL w/o quality suffix`` () =
+        Assert.Equal(domain + "/media/123.jpg", getMediaLinkDefault(domain + "/media/123.jpg"))
+
+    [<Fact>]
+    let ``does not modify URL with quality suffix`` () =
+        Assert.Equal(domain + "/media/123.jpg:small", getMediaLinkDefault(domain + "/media/123.jpg:small"))
+
+
+module GetMediaLink_Orig =
+    let getMediaLinkOrig url = TwitterUrls.GetMediaLink(url, ImageQuality.Best)
+    let domain = "https://pbs.twimg.com"
+    
+    [<Fact>]
+    let ``appends :orig to valid URL w/o quality suffix`` () =
+        Assert.Equal(domain + "/media/123.jpg:orig", getMediaLinkOrig(domain + "/media/123.jpg"))
+
+    [<Fact>]
+    let ``rewrites :orig into valid URL with quality suffix`` () =
+        Assert.Equal(domain + "/media/123.jpg:orig", getMediaLinkOrig(domain + "/media/123.jpg:small"))
+        
+    [<Fact>]
+    let ``does not modify unknown URL w/o quality suffix`` () =
+        Assert.Equal(domain + "/profile_images/123.jpg", getMediaLinkOrig(domain + "/profile_images/123.jpg"))
+        
+    [<Fact>]
+    let ``rewrites :orig into unknown URL with quality suffix`` () =
+        Assert.Equal(domain + "/profile_images/123.jpg:orig", getMediaLinkOrig(domain + "/profile_images/123.jpg:small"))
+
+
+module GetImageFileName =
+
+    [<Fact>]
+    let ``extracts file name from URL w/o quality suffix`` () =
+        Assert.Equal("test.jpg", TwitterUrls.GetImageFileName("http://example.com/test.jpg"))
+        
+    [<Fact>]
+    let ``extracts file name from URL with quality suffix`` () =
+        Assert.Equal("test.jpg", TwitterUrls.GetImageFileName("http://example.com/test.jpg:orig"))
+
+    [<Fact>]
+    let ``extracts file name from URL with a port`` () =
+        Assert.Equal("test.jpg", TwitterUrls.GetImageFileName("http://example.com:80/test.jpg"))
+
+
+[<Collection("RegexAccount")>]
+module RegexAccount_IsMatch =
+    let isMatch = TwitterUrls.RegexAccount.IsMatch
+
+    [<Fact>]
+    let ``accepts HTTP protocol`` () =
+        Assert.True(isMatch("http://twitter.com/chylexmc"))
+
+    [<Fact>]
+    let ``accepts HTTPS protocol`` () =
+        Assert.True(isMatch("https://twitter.com/chylexmc"))
+
+    [<Fact>]
+    let ``accepts trailing slash`` () =
+        Assert.True(isMatch("https://twitter.com/chylexmc/"))
+
+    [<Fact>]
+    let ``rejects URL with query`` () =
+        Assert.False(isMatch("https://twitter.com/chylexmc?query"))
+
+    [<Fact>]
+    let ``rejects URL with extra path`` () =
+        Assert.False(isMatch("https://twitter.com/chylexmc/status/123"))
+
+    [<Theory>]
+    [<InlineData("signup")>]
+    [<InlineData("tos")>]
+    [<InlineData("privacy")>]
+    [<InlineData("search")>]
+    [<InlineData("search?query")>]
+    [<InlineData("search-home")>]
+    [<InlineData("search-advanced")>]
+    let ``rejects reserved page names`` (name: string) =
+        Assert.False(isMatch("https://twitter.com/" + name))
+        
+    [<Theory>]
+    [<InlineData("tosser")>]
+    [<InlineData("searching")>]
+    let ``accepts accounts starting with reserved page names`` (name: string) =
+        Assert.True(isMatch("https://twitter.com/" + name))
+
+        
+[<Collection("RegexAccount")>]
+module RegexAccount_Match =
+    let extract str = TwitterUrls.RegexAccount.Match(str).Groups.[1].Value
+
+    [<Fact>]
+    let ``extracts account name from simple URL`` () =
+        Assert.Equal("_abc_DEF_123", extract("https://twitter.com/_abc_DEF_123"))
+
+    [<Fact>]
+    let ``extracts account name from URL with trailing slash`` () =
+        Assert.Equal("_abc_DEF_123", extract("https://twitter.com/_abc_DEF_123/"))

lib/TweetTest.Unit/Core/TestTwitterUtils.fs

@@ -1,113 +0,0 @@
-namespace TweetTest.Core.TwitterUtils
-
-open Xunit
-open TweetDuck.Core.Utils
-open TweetLib.Core.Features.Twitter
-
-
-[<Collection("RegexAccount")>]
-module RegexAccount_IsMatch =
-    let isMatch = TwitterUtils.RegexAccount.IsMatch
-
-    [<Fact>]
-    let ``accepts HTTP protocol`` () =
-        Assert.True(isMatch("http://twitter.com/chylexmc"))
-
-    [<Fact>]
-    let ``accepts HTTPS protocol`` () =
-        Assert.True(isMatch("https://twitter.com/chylexmc"))
-
-    [<Fact>]
-    let ``accepts trailing slash`` () =
-        Assert.True(isMatch("https://twitter.com/chylexmc/"))
-
-    [<Fact>]
-    let ``rejects URL with query`` () =
-        Assert.False(isMatch("https://twitter.com/chylexmc?query"))
-
-    [<Fact>]
-    let ``rejects URL with extra path`` () =
-        Assert.False(isMatch("https://twitter.com/chylexmc/status/123"))
-
-    [<Theory>]
-    [<InlineData("signup")>]
-    [<InlineData("tos")>]
-    [<InlineData("privacy")>]
-    [<InlineData("search")>]
-    [<InlineData("search?query")>]
-    [<InlineData("search-home")>]
-    [<InlineData("search-advanced")>]
-    let ``rejects reserved page names`` (name: string) =
-        Assert.False(isMatch("https://twitter.com/"+name))
-        
-    [<Theory>]
-    [<InlineData("tosser")>]
-    [<InlineData("searching")>]
-    let ``accepts accounts starting with reserved page names`` (name: string) =
-        Assert.True(isMatch("https://twitter.com/"+name))
-
-        
-[<Collection("RegexAccount")>]
-module RegexAccount_Match =
-    let extract str = TwitterUtils.RegexAccount.Match(str).Groups.[1].Value
-
-    [<Fact>]
-    let ``extracts account name from simple URL`` () =
-        Assert.Equal("_abc_DEF_123", extract("https://twitter.com/_abc_DEF_123"))
-
-    [<Fact>]
-    let ``extracts account name from URL with trailing slash`` () =
-        Assert.Equal("_abc_DEF_123", extract("https://twitter.com/_abc_DEF_123/"))
-
-
-module GetMediaLink_Default =
-    let getMediaLinkDefault url = TwitterUtils.GetMediaLink(url, ImageQuality.Default)
-    let domain = "https://pbs.twimg.com"
-
-    [<Fact>]
-    let ``does not modify URL w/o extension`` () =
-        Assert.Equal(domain+"/media/123", getMediaLinkDefault(domain+"/media/123"))
-
-    [<Fact>]
-    let ``does not modify URL w/o quality suffix`` () =
-        Assert.Equal(domain+"/media/123.jpg", getMediaLinkDefault(domain+"/media/123.jpg"))
-
-    [<Fact>]
-    let ``does not modify URL with quality suffix`` () =
-        Assert.Equal(domain+"/media/123.jpg:small", getMediaLinkDefault(domain+"/media/123.jpg:small"))
-
-
-module GetMediaLink_Orig =
-    let getMediaLinkOrig url = TwitterUtils.GetMediaLink(url, ImageQuality.Best)
-    let domain = "https://pbs.twimg.com"
-    
-    [<Fact>]
-    let ``appends :orig to valid URL w/o quality suffix`` () =
-        Assert.Equal(domain+"/media/123.jpg:orig", getMediaLinkOrig(domain+"/media/123.jpg"))
-
-    [<Fact>]
-    let ``rewrites :orig into valid URL with quality suffix`` () =
-        Assert.Equal(domain+"/media/123.jpg:orig", getMediaLinkOrig(domain+"/media/123.jpg:small"))
-        
-    [<Fact>]
-    let ``does not modify unknown URL w/o quality suffix`` () =
-        Assert.Equal(domain+"/profile_images/123.jpg", getMediaLinkOrig(domain+"/profile_images/123.jpg"))
-        
-    [<Fact>]
-    let ``rewrites :orig into unknown URL with quality suffix`` () =
-        Assert.Equal(domain+"/profile_images/123.jpg:orig", getMediaLinkOrig(domain+"/profile_images/123.jpg:small"))
-
-
-module GetImageFileName =
-
-    [<Fact>]
-    let ``extracts file name from URL w/o quality suffix`` () =
-        Assert.Equal("test.jpg", TwitterUtils.GetImageFileName("http://example.com/test.jpg"))
-        
-    [<Fact>]
-    let ``extracts file name from URL with quality suffix`` () =
-        Assert.Equal("test.jpg", TwitterUtils.GetImageFileName("http://example.com/test.jpg:orig"))
-
-    [<Fact>]
-    let ``extracts file name from URL with a port`` () =
-        Assert.Equal("test.jpg", TwitterUtils.GetImageFileName("http://example.com:80/test.jpg"))

lib/TweetTest.Unit/Core/TestUrlUtils.fs

@@ -1,79 +0,0 @@
-namespace TweetTest.Core.UrlUtils
-
-open Xunit
-open TweetLib.Core.Utils
-
-
-module Check =
-    type Result = UrlUtils.CheckResult
-
-    [<Fact>]
-    let ``accepts HTTP protocol`` () =
-        Assert.Equal(Result.Fine, UrlUtils.Check("http://example.com"))
-
-    [<Fact>]
-    let ``accepts HTTPS protocol`` () =
-        Assert.Equal(Result.Fine, UrlUtils.Check("https://example.com"))
-
-    [<Fact>]
-    let ``accepts FTP protocol`` () =
-        Assert.Equal(Result.Fine, UrlUtils.Check("ftp://example.com"))
-
-    [<Fact>]
-    let ``accepts MAILTO protocol`` () =
-        Assert.Equal(Result.Fine, UrlUtils.Check("mailto://someone@example.com"))
-
-    [<Fact>]
-    let ``accepts URL with port, path, query, and hash`` () =
-        Assert.Equal(Result.Fine, UrlUtils.Check("http://www.example.co.uk:80/path?key=abc&array[]=5#hash"))
-
-    [<Fact>]
-    let ``accepts IPv4 address`` () =
-        Assert.Equal(Result.Fine, UrlUtils.Check("http://127.0.0.1"))
-
-    [<Fact>]
-    let ``accepts IPv6 address`` () =
-        Assert.Equal(Result.Fine, UrlUtils.Check("http://[2001:db8:0:0:0:ff00:42:8329]"))
-
-    [<Fact>]
-    let ``recognizes t.co as tracking URL`` () =
-        Assert.Equal(Result.Tracking, UrlUtils.Check("http://t.co/12345"))
-
-    [<Fact>]
-    let ``rejects empty URL`` () =
-        Assert.Equal(Result.Invalid, UrlUtils.Check(""))
-
-    [<Fact>]
-    let ``rejects missing protocol`` () =
-        Assert.Equal(Result.Invalid, UrlUtils.Check("www.example.com"))
-
-    [<Fact>]
-    let ``rejects banned protocol`` () =
-        Assert.Equal(Result.Invalid, UrlUtils.Check("file://example.com"))
-        
-
-module GetFileNameFromUrl =
-
-    [<Fact>]
-    let ``simple file URL returns file name`` () =
-        Assert.Equal("index.html", UrlUtils.GetFileNameFromUrl("http://example.com/index.html"))
-
-    [<Fact>]
-    let ``file URL with query returns file name`` () =
-        Assert.Equal("index.html", UrlUtils.GetFileNameFromUrl("http://example.com/index.html?version=2"))
-
-    [<Fact>]
-    let ``file URL w/o extension returns file name`` () =
-        Assert.Equal("index", UrlUtils.GetFileNameFromUrl("http://example.com/index"))
-
-    [<Fact>]
-    let ``file URL with trailing dot returns file name with dot`` () =
-        Assert.Equal("index.", UrlUtils.GetFileNameFromUrl("http://example.com/index."))
-
-    [<Fact>]
-    let ``root URL returns null`` () =
-        Assert.Null(UrlUtils.GetFileNameFromUrl("http://example.com"))
-
-    [<Fact>]
-    let ``path URL returns null`` () =
-        Assert.Null(UrlUtils.GetFileNameFromUrl("http://example.com/path/"))

lib/TweetTest.Unit/TweetTest.Unit.fsproj

@@ -51,8 +51,7 @@
   <Import Project="$(FSharpTargetsPath)" />
   <ItemGroup>
     <Compile Include="Core\TestStringUtils.fs" />
-    <Compile Include="Core\TestTwitterUtils.fs" />
+    <Compile Include="Core\TestTwitterUrls.fs" />
-    <Compile Include="Core\TestUrlUtils.fs" />
     <Compile Include="Data\TestCommandLineArgs.fs" />
     <Compile Include="Data\TestInjectedHTML.fs" />
     <Compile Include="Data\TestResult.fs" />

subprocess/TweetDuck.Browser.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\packages\Microsoft.Net.Compilers.3.0.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.3.0.0\build\Microsoft.Net.Compilers.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -10,6 +10,7 @@
     <RootNamespace>TweetDuck.Browser</RootNamespace>
     <AssemblyName>TweetDuck.Browser</AssemblyName>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <LangVersion>8.0</LangVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <NuGetPackageImportStamp>
@@ -18,12 +19,10 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <PlatformTarget>x86</PlatformTarget>
     <OutputPath>bin\x86\Debug\</OutputPath>
-    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <PlatformTarget>x86</PlatformTarget>
     <OutputPath>bin\x86\Release\</OutputPath>
-    <LangVersion>7</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject />

video/FormPlayer.cs

@@ -98,7 +98,7 @@ namespace TweetDuck.Video{
             bool needsUpdate = !timerSync.Enabled || (useCompactLayout ? tablePanelFull.Enabled : tablePanelCompactBottom.Enabled);
 
             if (needsUpdate){
-                void Disable(TableLayoutPanel panel){
+                static void Disable(TableLayoutPanel panel){
                     panel.Controls.Clear();
                     panel.Visible = false;
                     panel.Enabled = false;

video/TweetDuck.Video.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="..\packages\Microsoft.Net.Compilers.3.0.0\build\Microsoft.Net.Compilers.props" Condition="Exists('..\packages\Microsoft.Net.Compilers.3.0.0\build\Microsoft.Net.Compilers.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -10,6 +10,7 @@
     <RootNamespace>TweetDuck.Video</RootNamespace>
     <AssemblyName>TweetDuck.Video</AssemblyName>
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <LangVersion>8.0</LangVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <ResolveComReferenceSilent>True</ResolveComReferenceSilent>
@@ -25,7 +26,6 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>true</Prefer32Bit>
-    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -37,7 +37,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>true</Prefer32Bit>
     <GenerateSerializationAssemblies>Auto</GenerateSerializationAssemblies>
-    <LangVersion>7</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>Resources\icon.ico</ApplicationIcon>