wip

.github/FUNDING.yml

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

Configuration/Arguments.cs

@@ -1,5 +1,5 @@
 using System;
-using TweetLib.Core.Collections;
+using TweetDuck.Data;
 
 namespace TweetDuck.Configuration{
     static class Arguments{
@@ -22,8 +22,8 @@ namespace TweetDuck.Configuration{
             return Current.HasFlag(flag);
         }
 
-        public static string GetValue(string key){
+        public static string GetValue(string key, string defaultValue){
-            return Current.GetValue(key);
+            return Current.GetValue(key, defaultValue);
         }
 
         public static CommandLineArgs GetCurrentClean(){

Configuration/ConfigManager.cs

@@ -1,13 +1,13 @@
 using System;
+using System.Collections.Generic;
 using System.Drawing;
+using TweetDuck.Configuration.Instance;
+using TweetDuck.Core.Utils;
 using TweetDuck.Data;
-using TweetLib.Core.Features.Configuration;
+using TweetDuck.Data.Serialization;
-using TweetLib.Core.Features.Plugins.Config;
-using TweetLib.Core.Serialization.Converters;
-using TweetLib.Core.Utils;
 
 namespace TweetDuck.Configuration{
-    sealed class ConfigManager : IConfigManager{
+    sealed class ConfigManager{
         public UserConfig User { get; }
         public SystemConfig System { get; }
         public PluginConfig Plugins { get; }
@@ -16,7 +16,7 @@ namespace TweetDuck.Configuration{
 
         private readonly FileConfigInstance<UserConfig> infoUser;
         private readonly FileConfigInstance<SystemConfig> infoSystem;
-        private readonly PluginConfigInstance<PluginConfig> infoPlugins;
+        private readonly PluginConfigInstance infoPlugins;
 
         private readonly IConfigInstance<BaseConfig>[] infoList;
 
@@ -28,7 +28,7 @@ namespace TweetDuck.Configuration{
             infoList = new IConfigInstance<BaseConfig>[]{
                 infoUser = new FileConfigInstance<UserConfig>(Program.UserConfigFilePath, User, "program options"),
                 infoSystem = new FileConfigInstance<SystemConfig>(Program.SystemConfigFilePath, System, "system options"),
-                infoPlugins = new PluginConfigInstance<PluginConfig>(Program.PluginConfigFilePath, Plugins)
+                infoPlugins = new PluginConfigInstance(Program.PluginConfigFilePath, Plugins)
             };
 
             // TODO refactor further
@@ -70,13 +70,59 @@ namespace TweetDuck.Configuration{
             infoPlugins.Reload();
         }
 
-        void IConfigManager.TriggerProgramRestartRequested(){
+        private void TriggerProgramRestartRequested(){
             ProgramRestartRequested?.Invoke(this, EventArgs.Empty);
         }
 
-        IConfigInstance<BaseConfig> IConfigManager.GetInstanceInfo(BaseConfig instance){
+        private IConfigInstance<BaseConfig> GetInstanceInfo(BaseConfig instance){
             Type instanceType = instance.GetType();
             return Array.Find(infoList, info => info.Instance.GetType() == instanceType); // TODO handle null
         }
+
+        public abstract class BaseConfig{
+            private readonly ConfigManager configManager;
+
+            protected BaseConfig(ConfigManager configManager){
+                this.configManager = configManager;
+            }
+
+            // Management
+
+            public void Save(){
+                configManager.GetInstanceInfo(this).Save();
+            }
+
+            public void Reload(){
+                configManager.GetInstanceInfo(this).Reload();
+            }
+
+            public void Reset(){
+                configManager.GetInstanceInfo(this).Reset();
+            }
+
+            // Construction methods
+
+            public T ConstructWithDefaults<T>() where T : BaseConfig{
+                return ConstructWithDefaults(configManager) as T;
+            }
+
+            protected abstract BaseConfig ConstructWithDefaults(ConfigManager configManager);
+
+            // Utility methods
+
+            protected void UpdatePropertyWithEvent<T>(ref T field, T value, EventHandler eventHandler){
+                if (!EqualityComparer<T>.Default.Equals(field, value)){
+                    field = value;
+                    eventHandler?.Invoke(this, EventArgs.Empty);
+                }
+            }
+
+            protected void UpdatePropertyWithRestartRequest<T>(ref T field, T value){
+                if (!EqualityComparer<T>.Default.Equals(field, value)){
+                    field = value;
+                    configManager.TriggerProgramRestartRequested();
+                }
+            }
+        }
     }
 }

Configuration/Instance/FileConfigInstance.cs

@@ -1,20 +1,22 @@
 using System;
 using System.IO;
-using TweetLib.Core.Serialization;
+using TweetDuck.Data.Serialization;
+
+namespace TweetDuck.Configuration.Instance{
+    sealed class FileConfigInstance<T> : IConfigInstance<T> where T : ConfigManager.BaseConfig{
+        private const string ErrorTitle = "Configuration Error";
 
-namespace TweetLib.Core.Features.Configuration{
-    public sealed class FileConfigInstance<T> : IConfigInstance<T> where T : BaseConfig{
         public T Instance { get; }
         public FileSerializer<T> Serializer { get; }
 
         private readonly string filenameMain;
         private readonly string filenameBackup;
-        private readonly string identifier;
+        private readonly string errorIdentifier;
 
-        public FileConfigInstance(string filename, T instance, string identifier){
+        public FileConfigInstance(string filename, T instance, string errorIdentifier){
             this.filenameMain = filename;
             this.filenameBackup = filename+".bak";
-            this.identifier = identifier;
+            this.errorIdentifier = errorIdentifier;
 
             this.Instance = instance;
             this.Serializer = new FileSerializer<T>();
@@ -25,14 +27,14 @@ namespace TweetLib.Core.Features.Configuration{
         }
 
         public void Load(){
-            Exception? firstException = null;
+            Exception firstException = null;
             
             for(int attempt = 0; attempt < 2; attempt++){
                 try{
                     LoadInternal(attempt > 0);
 
                     if (firstException != null){ // silently log exception that caused a backup restore
-                        App.ErrorHandler.Log(firstException.ToString());
+                        Program.Reporter.LogImportant(firstException.ToString());
                     }
 
                     return;
@@ -47,13 +49,13 @@ namespace TweetLib.Core.Features.Configuration{
             }
             
             if (firstException is FormatException){
-                OnException($"The configuration file for {identifier} is outdated or corrupted. If you continue, your {identifier} will be reset.", firstException);
+                Program.Reporter.HandleException(ErrorTitle, "The configuration file for "+errorIdentifier+" is outdated or corrupted. If you continue, your "+errorIdentifier+" will be reset.", true, firstException);
             }
             else if (firstException is SerializationSoftException sse){
-                OnException($"{sse.Errors.Count} error{(sse.Errors.Count == 1 ? " was" : "s were")} encountered while loading the configuration file for {identifier}. If you continue, some of your {identifier} will be reset.", firstException);
+                Program.Reporter.HandleException(ErrorTitle, $"{sse.Errors.Count} error{(sse.Errors.Count == 1 ? " was" : "s were")} encountered while loading the configuration file for "+errorIdentifier+". If you continue, some of your "+errorIdentifier+" will be reset.", true, firstException);
             }
             else if (firstException != null){
-                OnException($"Could not open the configuration file for {identifier}. If you continue, your {identifier} will be reset.", firstException);
+                Program.Reporter.HandleException(ErrorTitle, "Could not open the configuration file for "+errorIdentifier+". If you continue, your "+errorIdentifier+" will be reset.", true, firstException);
             }
         }
 
@@ -66,9 +68,9 @@ namespace TweetLib.Core.Features.Configuration{
 
                 Serializer.Write(filenameMain, Instance);
             }catch(SerializationSoftException e){
-                OnException($"{e.Errors.Count} error{(e.Errors.Count == 1 ? " was" : "s were")} encountered while saving the configuration file for {identifier}.", e);
+                Program.Reporter.HandleException(ErrorTitle, $"{e.Errors.Count} error{(e.Errors.Count == 1 ? " was" : "s were")} encountered while saving the configuration file for "+errorIdentifier+".", true, e);
             }catch(Exception e){
-                OnException($"Could not save the configuration file for {identifier}.", e);
+                Program.Reporter.HandleException(ErrorTitle, "Could not save the configuration file for "+errorIdentifier+".", true, e);
             }
         }
 
@@ -80,10 +82,10 @@ namespace TweetLib.Core.Features.Configuration{
                     Serializer.Write(filenameMain, Instance.ConstructWithDefaults<T>());
                     LoadInternal(false);
                 }catch(Exception e){
-                    OnException($"Could not regenerate the configuration file for {identifier}.", e);
+                    Program.Reporter.HandleException(ErrorTitle, "Could not regenerate the configuration file for "+errorIdentifier+".", true, e);
                 }
             }catch(Exception e){
-                OnException($"Could not reload the configuration file for {identifier}.", e);
+                Program.Reporter.HandleException(ErrorTitle, "Could not reload the configuration file for "+errorIdentifier+".", true, e);
             }
         }
 
@@ -92,15 +94,11 @@ namespace TweetLib.Core.Features.Configuration{
                 File.Delete(filenameMain);
                 File.Delete(filenameBackup);
             }catch(Exception e){
-                OnException($"Could not delete configuration files to reset {identifier}.", e);
+                Program.Reporter.HandleException(ErrorTitle, "Could not delete configuration files to reset "+errorIdentifier+".", true, e);
                 return;
             }
             
             Reload();
         }
-
-        private static void OnException(string message, Exception e){
-            App.ErrorHandler.HandleException("Configuration Error", message, true, e);
-        }
     }
 }

Configuration/Instance/IConfigInstance.cs

@@ -1,5 +1,5 @@
-namespace TweetLib.Core.Features.Configuration{
+namespace TweetDuck.Configuration.Instance{
-    public interface IConfigInstance<out T>{
+    interface IConfigInstance<out T>{
         T Instance { get; }
 
         void Save();

Configuration/Instance/PluginConfigInstance.cs

@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace TweetDuck.Configuration.Instance{
+    class PluginConfigInstance : IConfigInstance<PluginConfig>{
+        public PluginConfig Instance { get; }
+
+        private readonly string filename;
+
+        public PluginConfigInstance(string filename, PluginConfig instance){
+            this.filename = filename;
+            this.Instance = instance;
+        }
+
+        public void Load(){
+            try{
+                using(StreamReader reader = new StreamReader(new FileStream(filename, FileMode.Open, FileAccess.Read, FileShare.Read), Encoding.UTF8)){
+                    string line = reader.ReadLine();
+
+                    if (line == "#Disabled"){
+                        HashSet<string> newDisabled = new HashSet<string>();
+
+                        while((line = reader.ReadLine()) != null){
+                            newDisabled.Add(line);
+                        }
+
+                        Instance.ReloadSilently(newDisabled);
+                    }
+                }
+            }catch(FileNotFoundException){
+            }catch(DirectoryNotFoundException){
+            }catch(Exception e){
+                Program.Reporter.HandleException("Plugin Configuration Error", "Could not read the plugin configuration file. If you continue, the list of disabled plugins will be reset to default.", true, e);
+            }
+        }
+
+        public void Save(){
+            try{
+                using(StreamWriter writer = new StreamWriter(new FileStream(filename, FileMode.Create, FileAccess.Write, FileShare.None), Encoding.UTF8)){
+                    writer.WriteLine("#Disabled");
+
+                    foreach(string identifier in Instance.DisabledPlugins){
+                        writer.WriteLine(identifier);
+                    }
+                }
+            }catch(Exception e){
+                Program.Reporter.HandleException("Plugin Configuration Error", "Could not save the plugin configuration file.", true, e);
+            }
+        }
+
+        public void Reload(){
+            Load();
+        }
+
+        public void Reset(){
+            try{
+                File.Delete(filename);
+                Instance.ReloadSilently(Instance.ConstructWithDefaults<PluginConfig>().DisabledPlugins);
+            }catch(Exception e){
+                Program.Reporter.HandleException("Plugin Configuration Error", "Could not delete the plugin configuration file.", true, e);
+                return;
+            }
+            
+            Reload();
+        }
+    }
+}

Configuration/LockManager.cs

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

Configuration/PluginConfig.cs

@@ -1,42 +1,21 @@
 using System;
 using System.Collections.Generic;
-using TweetLib.Core.Features.Configuration;
+using TweetDuck.Plugins;
-using TweetLib.Core.Features.Plugins;
+using TweetDuck.Plugins.Events;
-using TweetLib.Core.Features.Plugins.Config;
-using TweetLib.Core.Features.Plugins.Events;
 
 namespace TweetDuck.Configuration{
-    sealed class PluginConfig : BaseConfig, IPluginConfig{
+    sealed class PluginConfig : ConfigManager.BaseConfig, IPluginConfig{
         private static readonly string[] DefaultDisabled = {
             "official/clear-columns",
             "official/reply-account"
         };
 
-        // CONFIGURATION DATA
+        // CONFIGURATION
 
-        private readonly HashSet<string> disabled = new HashSet<string>(DefaultDisabled);
+        public IEnumerable<string> DisabledPlugins => disabled;
-
-        // EVENTS
         
         public event EventHandler<PluginChangedStateEventArgs> PluginChangedState;
 
-        // END OF CONFIG
-
-        public PluginConfig(IConfigManager configManager) : base(configManager){}
-
-        protected override BaseConfig ConstructWithDefaults(IConfigManager configManager){
-            return new PluginConfig(configManager);
-        }
-
-        // INTERFACE IMPLEMENTATION
-
-        IEnumerable<string> IPluginConfig.DisabledPlugins => disabled;
-
-        void IPluginConfig.Reset(IEnumerable<string> newDisabledPlugins){
-            disabled.Clear();
-            disabled.UnionWith(newDisabledPlugins);
-        }
-
         public void SetEnabled(Plugin plugin, bool enabled){
             if ((enabled && disabled.Remove(plugin.Identifier)) || (!enabled && disabled.Add(plugin.Identifier))){
                 PluginChangedState?.Invoke(this, new PluginChangedStateEventArgs(plugin, enabled));
@@ -47,5 +26,20 @@ namespace TweetDuck.Configuration{
         public bool IsEnabled(Plugin plugin){
             return !disabled.Contains(plugin.Identifier);
         }
+
+        public void ReloadSilently(IEnumerable<string> newDisabled){
+            disabled.Clear();
+            disabled.UnionWith(newDisabled);
+        }
+
+        private readonly HashSet<string> disabled = new HashSet<string>(DefaultDisabled);
+        
+        // END OF CONFIG
+
+        public PluginConfig(ConfigManager configManager) : base(configManager){}
+
+        protected override ConfigManager.BaseConfig ConstructWithDefaults(ConfigManager configManager){
+            return new PluginConfig(configManager);
+        }
     }
 }

Configuration/SystemConfig.cs

@@ -1,7 +1,5 @@
-using TweetLib.Core.Features.Configuration;
+namespace TweetDuck.Configuration{
-
+    sealed class SystemConfig : ConfigManager.BaseConfig{
-namespace TweetDuck.Configuration{
-    sealed class SystemConfig : BaseConfig{
 
         // CONFIGURATION DATA
         
@@ -19,9 +17,9 @@ namespace TweetDuck.Configuration{
         
         // END OF CONFIG
 
-        public SystemConfig(IConfigManager configManager) : base(configManager){}
+        public SystemConfig(ConfigManager configManager) : base(configManager){}
 
-        protected override BaseConfig ConstructWithDefaults(IConfigManager configManager){
+        protected override ConfigManager.BaseConfig ConstructWithDefaults(ConfigManager configManager){
             return new SystemConfig(configManager);
         }
     }

Configuration/UserConfig.cs

@@ -1,14 +1,13 @@
 using System;
 using System.Drawing;
 using TweetDuck.Core.Controls;
+using TweetDuck.Core.Notification;
 using TweetDuck.Core.Other;
+using TweetDuck.Core.Utils;
 using TweetDuck.Data;
-using TweetLib.Core.Features.Configuration;
-using TweetLib.Core.Features.Notifications;
-using TweetLib.Core.Features.Twitter;
 
 namespace TweetDuck.Configuration{
-    sealed class UserConfig : BaseConfig{
+    sealed class UserConfig : ConfigManager.BaseConfig{
         
         // CONFIGURATION DATA
 
@@ -19,7 +18,6 @@ namespace TweetDuck.Configuration{
         public Size PluginsWindowSize    { get; set; } = Size.Empty;
 
         public bool ExpandLinksOnHover        { get; set; } = true;
-        public bool FocusDmInput              { get; set; } = true;
         public bool OpenSearchInFirstColumn   { get; set; } = true;
         public bool KeepLikeFollowDialogsOpen { get; set; } = true;
         public bool BestImageQuality          { get; set; } = true;
@@ -30,20 +28,16 @@ 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;
@@ -61,12 +55,12 @@ namespace TweetDuck.Configuration{
         public bool NotificationTimerCountDown { get; set; } = false;
         public int NotificationDurationValue   { get; set; } = 25;
 
-        public DesktopNotification.Position NotificationPosition { get; set; } = DesktopNotification.Position.TopRight;
+        public TweetNotification.Position NotificationPosition { get; set; } = TweetNotification.Position.TopRight;
         public Point CustomNotificationPosition                { get; set; } = ControlExtensions.InvisibleLocation;
         public int NotificationDisplay                         { get; set; } = 0;
         public int NotificationEdgeDistance                    { get; set; } = 8;
 
-        public DesktopNotification.Size NotificationSize { get; set; } = DesktopNotification.Size.Auto;
+        public TweetNotification.Size NotificationSize { get; set; } = TweetNotification.Size.Auto;
         public Size CustomNotificationSize             { get; set; } = Size.Empty;
         public int NotificationScrollSpeed             { get; set; } = 100;
         
@@ -78,15 +72,13 @@ 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;
         public bool IsCustomNotificationSizeSet => CustomNotificationSize != Size.Empty;
         public bool IsCustomSoundNotificationSet => NotificationSoundPath != string.Empty;
 
-        public ImageQuality TwitterImageQuality => BestImageQuality ? ImageQuality.Best : ImageQuality.Default;
+        public TwitterUtils.ImageQuality TwitterImageQuality => BestImageQuality ? TwitterUtils.ImageQuality.Orig : TwitterUtils.ImageQuality.Default;
         
         public string NotificationSoundPath{
             get => _notificationSoundPath ?? string.Empty;
@@ -142,9 +134,9 @@ namespace TweetDuck.Configuration{
 
         // END OF CONFIG
         
-        public UserConfig(IConfigManager configManager) : base(configManager){}
+        public UserConfig(ConfigManager configManager) : base(configManager){}
 
-        protected override BaseConfig ConstructWithDefaults(IConfigManager configManager){
+        protected override ConfigManager.BaseConfig ConstructWithDefaults(ConfigManager configManager){
             return new UserConfig(configManager);
         }
     }

Core/Adapters/CefScriptExecutor.cs

@@ -1,41 +0,0 @@
-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,7 +1,5 @@
 using System.Text;
 using TweetDuck.Configuration;
-using TweetLib.Core;
-using TweetLib.Core.Utils;
 
 namespace TweetDuck.Core.Bridge{
     static class PropertyBridge{
@@ -10,29 +8,27 @@ namespace TweetDuck.Core.Bridge{
         }
 
         public static string GenerateScript(Environment environment){
-            static string Bool(bool value) => value ? "true;" : "false;";
+            string Bool(bool value) => value ? "true;" : "false;";
-            static string Str(string value) => $"\"{value}\";";
+            string Str(string value) => '"'+value+"\";";
 
             UserConfig config = Program.Config.User;
-            StringBuilder build = new StringBuilder(384).Append("(function(x){");
+            StringBuilder build = new StringBuilder(128).Append("(function(x){");
 
             build.Append("x.expandLinksOnHover=").Append(Bool(config.ExpandLinksOnHover));
             
             if (environment == Environment.Browser){
-                build.Append("x.focusDmInput=").Append(Bool(config.FocusDmInput));
                 build.Append("x.openSearchInFirstColumn=").Append(Bool(config.OpenSearchInFirstColumn));
                 build.Append("x.keepLikeFollowDialogsOpen=").Append(Bool(config.KeepLikeFollowDialogsOpen));
                 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||{});if(window.TDGF_onPropertiesUpdated)window.TDGF_onPropertiesUpdated()").ToString();
+            return build.Append("})(window.$TDX=window.$TDX||{})").ToString();
         }
     }
 }

Core/Bridge/TweetDeckBridge.cs

@@ -1,19 +1,18 @@
-using System.Diagnostics.CodeAnalysis;
+using System.Windows.Forms;
-using System.Windows.Forms;
-using CefSharp;
 using TweetDuck.Core.Controls;
-using TweetDuck.Core.Handling;
+using TweetDuck.Core.Management;
 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(){
-            FormNotificationBase.FontSize = null;
+            FontSize = NotificationHeadLayout = null;
-            FormNotificationBase.HeadLayout = null;
         }
 
         private readonly FormBrowser form;
@@ -45,17 +44,17 @@ namespace TweetDuck.Core.Bridge{
 
             public void LoadNotificationLayout(string fontSize, string headLayout){
                 form.InvokeAsyncSafe(() => {
-                    FormNotificationBase.FontSize = fontSize;
+                    FontSize = fontSize;
-                    FormNotificationBase.HeadLayout = headLayout;
+                    NotificationHeadLayout = headLayout;
                 });
             }
 
             public void SetRightClickedLink(string type, string url){
-                ContextMenuBase.CurrentInfo.SetLink(type, url);
+                ContextInfo.SetLink(type, url);
             }
 
             public void SetRightClickedChirp(string tweetUrl, string quoteUrl, string chirpAuthors, string chirpImages){
-                ContextMenuBase.CurrentInfo.SetChirp(tweetUrl, quoteUrl, chirpAuthors, chirpImages);
+                ContextInfo.SetChirp(tweetUrl, quoteUrl, chirpAuthors, chirpImages);
             }
 
             public void DisplayTooltip(string text){
@@ -86,7 +85,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 DesktopNotification(columnId, chirpId, columnName, tweetHtml, tweetCharacters, tweetUrl, quoteUrl));
+                notification.ShowNotification(new TweetNotification(columnId, chirpId, columnName, tweetHtml, tweetCharacters, tweetUrl, quoteUrl));
             });
         }
 
@@ -101,12 +100,8 @@ namespace TweetDuck.Core.Bridge{
             form.InvokeAsyncSafe(() => form.OnTweetScreenshotReady(html, width));
         }
 
-        public void PlayVideo(string videoUrl, string tweetUrl, string username, IJavascriptCallback callShowOverlay){
+        public void PlayVideo(string url, string username){
-            form.InvokeAsyncSafe(() => form.PlayVideo(videoUrl, tweetUrl, username, callShowOverlay));
+            form.InvokeAsyncSafe(() => form.PlayVideo(url, username));
-        }
-        
-        public void StopVideo(){
-            form.InvokeAsyncSafe(form.StopVideo);
         }
 
         public void FixClipboard(){
@@ -122,12 +117,14 @@ namespace TweetDuck.Core.Bridge{
         }
 
         public void Alert(string type, string contents){
-            MessageBoxIcon icon = type switch{
+            MessageBoxIcon icon;
-                "error"   => MessageBoxIcon.Error,
+
-                "warning" => MessageBoxIcon.Warning,
+            switch(type){
-                "info"    => MessageBoxIcon.Information,
+                case "error": icon = MessageBoxIcon.Error; break;
-                _         => MessageBoxIcon.None
+                case "warning": icon = MessageBoxIcon.Warning; break;
-            };
+                case "info": icon = MessageBoxIcon.Information; break;
+                default: icon = MessageBoxIcon.None; break;
+            }
 
             FormMessage.Show("TweetDuck Browser Message", contents, icon, FormMessage.OK);
         }

Core/Bridge/UpdateBridge.cs

@@ -1,11 +1,9 @@
 using System;
-using System.Diagnostics.CodeAnalysis;
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
-using TweetLib.Core.Features.Updates;
+using TweetDuck.Updates;
 
 namespace TweetDuck.Core.Bridge{
-    [SuppressMessage("ReSharper", "UnusedMember.Global")]
     class UpdateBridge{
         private readonly UpdateHandler updates;
         private readonly Control sync;
@@ -13,6 +11,7 @@ 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){
@@ -55,6 +54,10 @@ namespace TweetDuck.Core.Bridge{
             HandleInteractionEvent(UpdateAccepted);
         }
 
+        public void OnUpdateDelayed(){
+            HandleInteractionEvent(UpdateDelayed);
+        }
+
         public void OnUpdateDismissed(){
             HandleInteractionEvent(UpdateDismissed);
 

Core/Controls/ControlExtensions.cs

@@ -21,16 +21,17 @@ 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){
@@ -62,8 +63,7 @@ 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/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,3 +20,4 @@ namespace TweetDuck.Core.Controls{
             }
         }
     }
+}

Core/FormBrowser.cs

@@ -1,10 +1,6 @@
 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;
@@ -17,10 +13,10 @@ using TweetDuck.Core.Other;
 using TweetDuck.Core.Other.Analytics;
 using TweetDuck.Core.Other.Settings.Dialogs;
 using TweetDuck.Core.Utils;
+using TweetDuck.Plugins;
+using TweetDuck.Plugins.Events;
+using TweetDuck.Resources;
 using TweetDuck.Updates;
-using TweetLib.Core.Features.Plugins;
-using TweetLib.Core.Features.Plugins.Events;
-using TweetLib.Core.Features.Updates;
 
 namespace TweetDuck.Core{
     sealed partial class FormBrowser : Form, AnalyticsFile.IProvider{
@@ -67,7 +63,7 @@ namespace TweetDuck.Core{
 
             Text = Program.BrandName;
             
-            this.plugins = new PluginManager(Program.Config.Plugins, Program.PluginPath, Program.PluginDataPath);
+            this.plugins = new PluginManager(Program.Config.Plugins, Program.PluginPath);
             this.plugins.Reloaded += plugins_Reloaded;
             this.plugins.Executed += plugins_Executed;
             this.plugins.Reload();
@@ -75,11 +71,12 @@ namespace TweetDuck.Core{
             this.notification = new FormNotificationTweet(this, plugins);
             this.notification.Show();
             
-            this.updates = new UpdateHandler(new UpdateCheckClient(Program.InstallerPath), TaskScheduler.FromCurrentSynchronizationContext());
+            this.updates = new UpdateHandler(Program.InstallerPath);
             this.updates.CheckFinished += updates_CheckFinished;
 
             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);
@@ -237,9 +234,7 @@ namespace TweetDuck.Core{
         
         private void plugins_Reloaded(object sender, PluginErrorEventArgs e){
             if (e.HasErrors){
-                this.InvokeAsyncSafe(() => { // TODO not needed but makes code consistent...
                 FormMessage.Error("Error Loading Plugins", "The following plugins will not be available until the issues are resolved:\n\n"+string.Join("\n\n", e.Errors), FormMessage.OK);
-                });
             }
 
             if (isLoaded){
@@ -247,11 +242,9 @@ namespace TweetDuck.Core{
             }
         }
         
-        private void plugins_Executed(object sender, PluginErrorEventArgs e){
+        private static 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);
-                });
             }
         }
 
@@ -324,6 +317,10 @@ 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();
@@ -331,9 +328,7 @@ namespace TweetDuck.Core{
 
         protected override void WndProc(ref Message m){
             if (isLoaded && m.Msg == Program.WindowRestoreMessage){
-                using Process me = Process.GetCurrentProcess();
+                if (WindowsUtils.CurrentProcessID == m.WParam.ToInt32()){
-
-                if (me.Id == m.WParam.ToInt32()){
                     trayIcon_ClickRestore(trayIcon, EventArgs.Empty);
                 }
 
@@ -370,7 +365,14 @@ namespace TweetDuck.Core{
         }
 
         public void ReloadToTweetDeck(){
-            Program.Resources.OnReloadTriggered();
+            #if DEBUG
+            ScriptLoader.HotSwap();
+            #else
+            if (ModifierKeys.HasFlag(Keys.Shift)){
+                ScriptLoader.ClearCache();
+            }
+            #endif
+
             ignoreUpdateCheckError = false;
             browser.ReloadToTweetDeck();
             AnalyticsFile.BrowserReloads.Trigger();
@@ -510,10 +512,12 @@ namespace TweetDuck.Core{
             AnalyticsFile.SoundNotifications.Trigger();
         }
 
-        public void PlayVideo(string videoUrl, string tweetUrl, string username, IJavascriptCallback callShowOverlay){
+        public void PlayVideo(string url, string username){
-            string playerPath = Config.VideoPlayerPath;
+            if (string.IsNullOrEmpty(url)){
+                videoPlayer?.Close();
+                return;
+            }
 
-            if (playerPath == null || !File.Exists(playerPath)){
             if (videoPlayer == null){
                 videoPlayer = new VideoPlayer(this);
 
@@ -522,31 +526,10 @@ namespace TweetDuck.Core{
                 };
             }
             
-                callShowOverlay.ExecuteAsync();
+            videoPlayer.Launch(url, username);
-                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/FormManager.cs

@@ -17,6 +17,8 @@ namespace TweetDuck.Core{
             else return false;
         }
 
+        public static bool HasAnyDialogs => Application.OpenForms.OfType<IAppDialog>().Any();
+        
         public static void CloseAllDialogs(){
             foreach(IAppDialog dialog in Application.OpenForms.OfType<IAppDialog>().Reverse()){
                 ((Form)dialog).Close();

Core/Handling/ContextMenuBase.cs

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

Core/Handling/General/BrowserProcessHandler.cs

@@ -11,12 +11,13 @@ 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/General/FileDialogHandler.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
@@ -8,7 +9,7 @@ namespace TweetDuck.Core.Handling.General{
     sealed class FileDialogHandler : IDialogHandler{
         public bool OnFileDialog(IWebBrowser browserControl, IBrowser browser, CefFileDialogMode mode, CefFileDialogFlags flags, string title, string defaultFilePath, List<string> acceptFilters, int selectedAcceptFilter, IFileDialogCallback callback){
             if (mode == CefFileDialogMode.Open || mode == CefFileDialogMode.OpenMultiple){
-                string allFilters = string.Join(";", acceptFilters.SelectMany(ParseFileType).Where(filter => !string.IsNullOrEmpty(filter)).Select(filter => "*" + filter));
+                string allFilters = string.Join(";", acceptFilters.Select(filter => "*"+filter));
 
                 using(OpenFileDialog dialog = new OpenFileDialog{
                     AutoUpgradeEnabled = true,
@@ -18,8 +19,8 @@ namespace TweetDuck.Core.Handling.General{
                     Filter = $"All Supported Formats ({allFilters})|{allFilters}|All Files (*.*)|*.*"
                 }){
                     if (dialog.ShowDialog() == DialogResult.OK){
-                        string ext = Path.GetExtension(dialog.FileName)?.ToLower();
+                        string ext = Path.GetExtension(dialog.FileName);
-                        callback.Continue(acceptFilters.FindIndex(filter => ParseFileType(filter).Contains(ext)), dialog.FileNames.ToList());
+                        callback.Continue(acceptFilters.FindIndex(filter => filter.Equals(ext, StringComparison.OrdinalIgnoreCase)), dialog.FileNames.ToList());
                     }
                     else{
                         callback.Cancel();
@@ -35,27 +36,5 @@ namespace TweetDuck.Core.Handling.General{
                 return false;
             }
         }
-
-        private static IEnumerable<string> ParseFileType(string type){
-            if (string.IsNullOrEmpty(type)){
-                return new string[0];
-            }
-            
-            if (type[0] == '.'){
-                return new string[]{ type };
-            }
-
-            switch(type){
-                case "image/jpeg": return new string[]{ ".jpg", ".jpeg" };
-                case "image/png": return new string[]{ ".png" };
-                case "image/gif": return new string[]{ ".gif" };
-                case "image/webp": return new string[]{ ".webp" };
-                case "video/mp4": return new string[]{ ".mp4" };
-                case "video/quicktime": return new string[]{ ".mov", ".qt" };
-            }
-
-            System.Diagnostics.Debugger.Break();
-            return new string[0];
-        }
     }
 }

Core/Handling/General/JavaScriptDialogHandler.cs

@@ -12,17 +12,15 @@ namespace TweetDuck.Core.Handling.General{
             int pipe = text.IndexOf('|');
 
             if (pipe != -1){
-                icon = text.Substring(0, pipe) switch{
+                switch(text.Substring(0, pipe)){
-                    "error"    => MessageBoxIcon.Error,
+                    case "error": icon = MessageBoxIcon.Error; break;
-                    "warning"  => MessageBoxIcon.Warning,
+                    case "warning": icon = MessageBoxIcon.Warning; break;
-                    "info"     => MessageBoxIcon.Information,
+                    case "info": icon = MessageBoxIcon.Information; break;
-                    "question" => MessageBoxIcon.Question,
+                    case "question": icon = MessageBoxIcon.Question; break;
-                    _          => MessageBoxIcon.None
+                    default: return new FormMessage(caption, text, icon);
-                };
-
-                if (icon != MessageBoxIcon.None){
-                    text = text.Substring(pipe + 1);
                 }
+
+                text = text.Substring(pipe+1);
             }
 
             return new FormMessage(caption, text, icon);

Core/Handling/General/LifeSpanHandler.cs

@@ -4,15 +4,11 @@ using TweetDuck.Core.Utils;
 
 namespace TweetDuck.Core.Handling.General{
     sealed class LifeSpanHandler : ILifeSpanHandler{
-        private static bool IsPopupAllowed(string url){
-            return url.StartsWith("https://twitter.com/teams/authorize?");
-        }
-
         public static bool HandleLinkClick(IWebBrowser browserControl, WindowOpenDisposition targetDisposition, string targetUrl){
             switch(targetDisposition){
                 case WindowOpenDisposition.NewBackgroundTab:
                 case WindowOpenDisposition.NewForegroundTab:
-                case WindowOpenDisposition.NewPopup when !IsPopupAllowed(targetUrl):
+                case WindowOpenDisposition.NewPopup:
                 case WindowOpenDisposition.NewWindow:
                     browserControl.AsControl().InvokeAsyncSafe(() => BrowserUtils.OpenExternalBrowser(targetUrl));
                     return true;

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){
-                    browserControl.OpenDevToolsCustom();
+                    browser.ShowDevTools();
                 }
                 else{
                     browserControl.AsControl().InvokeSafe(() => {

Core/Handling/RequestHandlerBase.cs

@@ -7,11 +7,10 @@ using CefSharp;
 using CefSharp.Handler;
 using TweetDuck.Core.Handling.General;
 using TweetDuck.Core.Utils;
-using TweetLib.Core.Utils;
 
 namespace TweetDuck.Core.Handling{
     class RequestHandlerBase : DefaultRequestHandler{
-        private static readonly Regex TweetDeckResourceUrl = new Regex(@"/dist/(.*?)\.(.*?)\.(css|js)$");
+        private static readonly Regex TweetDeckResourceUrl = new Regex(@"/dist/(.*?)\.(.*?)\.(css|js)$", RegexOptions.Compiled);
         private static readonly SortedList<string, string> TweetDeckHashes = new SortedList<string, string>(4);
 
         public static void LoadResourceRewriteRules(string rules){
@@ -22,7 +21,11 @@ namespace TweetDuck.Core.Handling{
             TweetDeckHashes.Clear();
 
             foreach(string rule in rules.Replace(" ", "").ToLower().Split(',')){
-                var (key, hash) = StringUtils.SplitInTwo(rule, '=') ?? throw new ArgumentException("A rule must have one '=' character: " + rule);
+                string[] split = rule.Split('=');
+
+                if (split.Length == 2){
+                    string key = split[0];
+                    string hash = split[1];
 
                     if (hash.All(chr => char.IsDigit(chr) || (chr >= 'a' && chr <= 'f'))){
                         TweetDeckHashes.Add(key, hash);
@@ -31,6 +34,10 @@ namespace TweetDuck.Core.Handling{
                         throw new ArgumentException("Invalid hash characters: "+rule);
                     }
                 }
+                else{
+                    throw new ArgumentException("A rule must have exactly one '=' character: "+rule);
+                }
+            }
         }
 
         private readonly bool autoReload;

Core/Handling/RequestHandlerBrowser.cs

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

@@ -1,6 +1,6 @@
 using System;
 using CefSharp;
-using TweetLib.Core.Utils;
+using TweetDuck.Core.Utils;
 
 namespace TweetDuck.Core.Management{
     sealed class ContextInfo{
@@ -107,7 +107,7 @@ namespace TweetDuck.Core.Management{
                 private string unsafeLinkUrl = string.Empty;
                 private string mediaUrl = string.Empty;
 
-                private ChirpInfo chirp = default;
+                private ChirpInfo chirp = default(ChirpInfo);
 
                 public void AddContext(IContextMenuParams parameters){
                     ContextMenuType flags = parameters.TypeFlags;

Core/Management/ProfileManager.cs

@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using TweetDuck.Core.Other;
-using TweetLib.Core.Data;
+using TweetDuck.Data;
-using TweetLib.Core.Features.Plugins;
+using TweetDuck.Plugins;
-using TweetLib.Core.Features.Plugins.Enums;
+using TweetDuck.Plugins.Enums;
 
 namespace TweetDuck.Core.Management{
     sealed class ProfileManager{
@@ -73,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){
@@ -96,6 +96,7 @@ namespace TweetDuck.Core.Management{
                                 break;
                         }
                     }
+                }
             }catch(Exception){
                 items = Items.None;
             }
@@ -139,7 +140,7 @@ namespace TweetDuck.Core.Management{
 
                                     entry.WriteToFile(Path.Combine(Program.PluginDataPath, value[0], value[1]), true);
 
-                                    if (!plugins.Plugins.Any(plugin => plugin.Identifier.Equals(value[0]))){
+                                    if (!plugins.IsPluginInstalled(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 videoUrl, string tweetUrl, string username){
+        public void Launch(string url, 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} \"{videoUrl}\" \"{pipe.GenerateToken()}\"",
+                    Arguments = $"{owner.Handle} {(int)Math.Floor(100F*owner.GetDPIScale())} {Config.VideoPlayerVolume} \"{url}\" \"{pipe.GenerateToken()}\"",
                     UseShellExecute = false,
                     RedirectStandardOutput = true
                 })) != null){
-                    currentInstance = new Instance(process, pipe, videoUrl, tweetUrl, username);
+                    currentInstance = new Instance(process, pipe, url, 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.VideoUrl, currentInstance.Username);
+                            TwitterUtils.DownloadVideo(currentInstance.Url, currentInstance.Username);
                         }
 
                         break;
@@ -145,7 +145,7 @@ namespace TweetDuck.Core.Management{
             }
 
             int exitCode = currentInstance.Process.ExitCode;
-            string tweetUrl = currentInstance.TweetUrl;
+            string url = currentInstance.Url;
 
             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(tweetUrl);
+                        BrowserUtils.OpenExternalBrowser(url);
                     }
 
                     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(tweetUrl);
+                        BrowserUtils.OpenExternalBrowser(url);
                     }
 
                     break;
@@ -184,15 +184,13 @@ namespace TweetDuck.Core.Management{
             public Process Process { get; }
             public DuplexPipe.Server Pipe { get; }
 
-            public string VideoUrl { get; }
+            public string Url { get; }
-            public string TweetUrl { get; }
             public string Username { get; }
 
-            public Instance(Process process, DuplexPipe.Server pipe, string videoUrl, string tweetUrl, string username){
+            public Instance(Process process, DuplexPipe.Server pipe, string url, string username){
                 this.Process = process;
                 this.Pipe = pipe;
-                this.VideoUrl = videoUrl;
+                this.Url = url;
-                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 TweetLib.Core.Features.Notifications;
+using TweetDuck.Plugins;
-using TweetLib.Core.Features.Plugins;
+using TweetDuck.Resources;
 
 namespace TweetDuck.Core.Notification.Example{
     sealed class FormNotificationExample : FormNotificationMain{
         public override bool RequiresResize => true;
-        protected override bool CanDragWindow => Config.NotificationPosition == DesktopNotification.Position.Custom;
+        protected override bool CanDragWindow => Config.NotificationPosition == TweetNotification.Position.Custom;
 
         protected override FormBorderStyle NotificationBorderStyle{
             get{
-                if (Config.NotificationSize == DesktopNotification.Size.Custom){
+                if (Config.NotificationSize == TweetNotification.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 DesktopNotification exampleNotification;
+        private readonly TweetNotification exampleNotification;
 
         public FormNotificationExample(FormBrowser owner, PluginManager pluginManager) : base(owner, pluginManager, false){
             browser.LoadingStateChanged += browser_LoadingStateChanged;
 
-            string exampleTweetHTML = Program.Resources.LoadSilent("pages/example.html")?.Replace("{avatar}", AppLogo.Url) ?? string.Empty;
+            string exampleTweetHTML = ScriptLoader.LoadResourceSilent("pages/example.html")?.Replace("{avatar}", TweetNotification.AppLogo.Url) ?? string.Empty;
 
             #if DEBUG
             exampleTweetHTML = exampleTweetHTML.Replace("</p>", @"</p><div style='margin-top:256px'>Scrollbar test padding...</div>");
             #endif
 
-            exampleNotification = new DesktopNotification(string.Empty, string.Empty, "Home", exampleTweetHTML, 176, string.Empty, string.Empty);
+            exampleNotification = new TweetNotification(string.Empty, string.Empty, "Home", exampleTweetHTML, 176, string.Empty, string.Empty);
         }
 
         private void browser_LoadingStateChanged(object sender, LoadingStateChangedEventArgs e){

Core/Notification/FormNotificationBase.cs

@@ -1,34 +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 => FontSize switch{
+            get{
-                "largest"  => 4,
+                switch(TweetDeckBridge.FontSize){
-                "large"    => 3,
+                    case "largest": return 4;
-                "small"    => 1,
+                    case "large": return 3;
-                "smallest" => 0,
+                    case "small": return 1;
-                _          => 2
+                    case "smallest": return 0;
-            };
+                    default: return 2;
+                }
+            }
         }
 
         protected virtual Point PrimaryLocation{
@@ -39,25 +33,25 @@ namespace TweetDuck.Core.Notification{
                     screen = Screen.AllScreens[Config.NotificationDisplay-1];
                 }
                 else{
-                    screen = Screen.FromControl(owner);
+                    screen = Screen.FromControl(owner); // TODO may be disposed?
                 }
             
                 int edgeDist = Config.NotificationEdgeDistance;
 
                 switch(Config.NotificationPosition){
-                    case DesktopNotification.Position.TopLeft:
+                    case TweetNotification.Position.TopLeft:
                         return new Point(screen.WorkingArea.X+edgeDist, screen.WorkingArea.Y+edgeDist);
 
-                    case DesktopNotification.Position.TopRight:
+                    case TweetNotification.Position.TopRight:
                         return new Point(screen.WorkingArea.X+screen.WorkingArea.Width-edgeDist-Width, screen.WorkingArea.Y+edgeDist);
 
-                    case DesktopNotification.Position.BottomLeft:
+                    case TweetNotification.Position.BottomLeft:
                         return new Point(screen.WorkingArea.X+edgeDist, screen.WorkingArea.Y+screen.WorkingArea.Height-edgeDist-Height);
 
-                    case DesktopNotification.Position.BottomRight:
+                    case TweetNotification.Position.BottomRight:
                         return new Point(screen.WorkingArea.X+screen.WorkingArea.Width-edgeDist-Width, screen.WorkingArea.Y+screen.WorkingArea.Height-edgeDist-Height);
 
-                    case DesktopNotification.Position.Custom:
+                    case TweetNotification.Position.Custom:
                         if (!Config.IsCustomNotificationPositionSet){
                             Config.CustomNotificationPosition = new Point(screen.WorkingArea.X+screen.WorkingArea.Width-edgeDist-Width, screen.WorkingArea.Y+edgeDist);
                             Config.Save();
@@ -107,7 +101,7 @@ namespace TweetDuck.Core.Notification{
         
         private readonly ResourceHandlerNotification resourceHandler = new ResourceHandlerNotification();
 
-        private DesktopNotification currentNotification;
+        private TweetNotification currentNotification;
         private int pauseCounter;
         
         public string CurrentTweetUrl => currentNotification?.TweetUrl;
@@ -128,8 +122,8 @@ namespace TweetDuck.Core.Notification{
             this.owner.FormClosed += owner_FormClosed;
 
             ResourceHandlerFactory resourceHandlerFactory = new ResourceHandlerFactory();
-            resourceHandlerFactory.RegisterHandler(TwitterUrls.TweetDeck, this.resourceHandler);
+            resourceHandlerFactory.RegisterHandler(TwitterUtils.TweetDeckURL, this.resourceHandler);
-            resourceHandlerFactory.RegisterHandler(AppLogo);
+            resourceHandlerFactory.RegisterHandler(TweetNotification.AppLogo);
 
             this.browser = new ChromiumWebBrowser("about:blank"){
                 MenuHandler = new ContextMenuNotification(this, enableContextMenu),
@@ -194,13 +188,13 @@ namespace TweetDuck.Core.Notification{
             }
         }
 
-        protected abstract string GetTweetHTML(DesktopNotification tweet);
+        protected abstract string GetTweetHTML(TweetNotification tweet);
 
-        protected virtual void LoadTweet(DesktopNotification tweet){
+        protected virtual void LoadTweet(TweetNotification tweet){
             currentNotification = tweet;
             resourceHandler.SetHTML(GetTweetHTML(tweet));
 
-            browser.Load(TwitterUrls.TweetDeck);
+            browser.Load(TwitterUtils.TweetDeckURL);
             DisplayTooltip(null);
         }
 

Core/Notification/FormNotificationMain.cs

@@ -2,16 +2,14 @@
 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.Data;
 using TweetDuck.Plugins;
-using TweetLib.Core.Data;
+using TweetDuck.Plugins.Enums;
-using TweetLib.Core.Features.Notifications;
+using TweetDuck.Resources;
-using TweetLib.Core.Features.Plugins;
-using TweetLib.Core.Features.Plugins.Enums;
 
 namespace TweetDuck.Core.Notification{
     abstract partial class FormNotificationMain : FormNotificationBase{
@@ -46,17 +44,27 @@ namespace TweetDuck.Core.Notification{
         }
 
         private int BaseClientWidth{
-            get => Config.NotificationSize switch{
+            get{
-                DesktopNotification.Size.Custom => Config.CustomNotificationSize.Width,
+                switch(Config.NotificationSize){
-                _ => BrowserUtils.Scale(284, SizeScale * (1.0 + 0.05 * FontSizeLevel))
+                    default:
-            };
+                        return BrowserUtils.Scale(284, SizeScale*(1.0+0.05*FontSizeLevel));
+
+                    case TweetNotification.Size.Custom:
+                        return Config.CustomNotificationSize.Width;
+                }
+            }
         }
 
         private int BaseClientHeight{
-            get => Config.NotificationSize switch{
+            get{
-                DesktopNotification.Size.Custom => Config.CustomNotificationSize.Height,
+                switch(Config.NotificationSize){
-                _ => BrowserUtils.Scale(122, SizeScale * (1.0 + 0.08 * FontSizeLevel))
+                    default:
-            };
+                        return BrowserUtils.Scale(122, SizeScale*(1.0+0.08*FontSizeLevel));
+
+                    case TweetNotification.Size.Custom:
+                        return Config.CustomNotificationSize.Height;
+                }
+            }
         }
 
         protected virtual string BodyClasses => IsCursorOverBrowser ? "td-notification td-hover" : "td-notification";
@@ -75,7 +83,7 @@ namespace TweetDuck.Core.Notification{
             browser.LoadingStateChanged += Browser_LoadingStateChanged;
             browser.FrameLoadEnd += Browser_FrameLoadEnd;
 
-            plugins.Register(PluginEnvironment.Notification, new PluginDispatcher(browser));
+            plugins.Register(browser, PluginEnvironment.Notification, this);
 
             mouseHookDelegate = MouseHookProc;
             Disposed += (sender, args) => StopMouseHook(true);
@@ -156,7 +164,7 @@ namespace TweetDuck.Core.Notification{
 
             if (frame.IsMain && browser.Address != "about:blank"){
                 frame.ExecuteJavaScriptAsync(PropertyBridge.GenerateScript(PropertyBridge.Environment.Notification));
-                CefScriptExecutor.RunFile(frame, "notification.js");
+                ScriptLoader.ExecuteFile(frame, "notification.js", this);
             }
         }
 
@@ -166,16 +174,7 @@ namespace TweetDuck.Core.Notification{
         }
 
         private void timerHideProgress_Tick(object sender, EventArgs e){
-            bool isCursorInside = Bounds.Contains(Cursor.Position);
+            if (Bounds.Contains(Cursor.Position) || FreezeTimer || ContextMenuOpen){
-
-            if (isCursorInside){
-                StartMouseHook();
-            }
-            else{
-                StopMouseHook(false);
-            }
-
-            if (isCursorInside || FreezeTimer || ContextMenuOpen){
                 return;
             }
 
@@ -191,7 +190,7 @@ namespace TweetDuck.Core.Notification{
 
         // notification methods
 
-        public virtual void ShowNotification(DesktopNotification notification){
+        public virtual void ShowNotification(TweetNotification notification){
             LoadTweet(notification);
         }
 
@@ -228,8 +227,8 @@ namespace TweetDuck.Core.Notification{
             }
         }
 
-        protected override string GetTweetHTML(DesktopNotification tweet){
+        protected override string GetTweetHTML(TweetNotification tweet){
-            string html = tweet.GenerateHtml(BodyClasses, HeadLayout, Config.CustomNotificationCSS);
+            string html = tweet.GenerateHtml(BodyClasses, this);
 
             foreach(InjectedHTML injection in plugins.NotificationInjections){
                 html = injection.InjectInto(html);
@@ -238,7 +237,7 @@ namespace TweetDuck.Core.Notification{
             return html;
         }
 
-        protected override void LoadTweet(DesktopNotification tweet){
+        protected override void LoadTweet(TweetNotification tweet){
             timerProgress.Stop();
             totalTime = timeLeft = tweet.GetDisplayDuration(Config.NotificationDurationValue);
             progressBarTimer.Value = Config.NotificationTimerCountDown ? progressBarTimer.Maximum : progressBarTimer.Minimum;
@@ -266,6 +265,7 @@ namespace TweetDuck.Core.Notification{
             }
             
             MoveToVisibleLocation();
+            StartMouseHook();
         }
 
         protected virtual void OnNotificationReady(){

Core/Notification/FormNotificationTweet.cs

@@ -1,10 +1,9 @@
 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{
@@ -26,7 +25,7 @@ namespace TweetDuck.Core.Notification{
             }
         }
 
-        private readonly Queue<DesktopNotification> tweetQueue = new Queue<DesktopNotification>(4);
+        private readonly Queue<TweetNotification> tweetQueue = new Queue<TweetNotification>(4);
         private bool needsTrim;
         private bool hasTemporarilyMoved;
 
@@ -82,7 +81,7 @@ namespace TweetDuck.Core.Notification{
 
         // notification methods
 
-        public override void ShowNotification(DesktopNotification notification){
+        public override void ShowNotification(TweetNotification notification){
             tweetQueue.Enqueue(notification);
             
             if (!IsPaused){

Core/Notification/Screenshot/FormNotificationScreenshotable.cs

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

Core/Notification/Screenshot/ScreenshotBridge.cs

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

Core/Notification/Screenshot/TweetScreenshotManager.cs

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

Core/Notification/SoundNotification.cs

@@ -11,16 +11,18 @@ namespace TweetDuck.Core.Notification{
         public const string SupportedFormats = "*.wav;*.ogg;*.mp3;*.flac;*.opus;*.weba;*.webm";
         
         public static IResourceHandler CreateFileHandler(string path){
-            string mimeType = Path.GetExtension(path) switch{
+            string mimeType;
-                ".weba" => "audio/webm",
+
-                ".webm" => "audio/webm",
+            switch(Path.GetExtension(path)){
-                ".wav"  => "audio/wav",
+                case ".weba":
-                ".ogg"  => "audio/ogg",
+                case ".webm": mimeType = "audio/webm"; break;
-                ".mp3"  => "audio/mp3",
+                case ".wav": mimeType = "audio/wav"; break;
-                ".flac" => "audio/flac",
+                case ".ogg": mimeType = "audio/ogg"; break;
-                ".opus" => "audio/ogg; codecs=opus",
+                case ".mp3": mimeType = "audio/mp3"; break;
-                _       => null
+                case ".flac": mimeType = "audio/flac"; break;
-            };
+                case ".opus": mimeType = "audio/ogg; codecs=opus"; break;
+                default: mimeType = null; break;
+            }
 
             try{
                 return ResourceHandler.FromFilePath(path, mimeType);

Core/Notification/TweetNotification.cs

@@ -1,9 +1,15 @@
 using System;
 using System.Text;
+using System.Windows.Forms;
+using CefSharp;
+using TweetDuck.Core.Bridge;
+using TweetDuck.Data;
+using TweetDuck.Resources;
 
-namespace TweetLib.Core.Features.Notifications{
+namespace TweetDuck.Core.Notification{
-    public sealed class DesktopNotification{
+    sealed class TweetNotification{
         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
@@ -23,7 +29,7 @@ namespace TweetLib.Core.Features.Notifications{
         private readonly string html;
         private readonly int characters;
         
-        public DesktopNotification(string columnId, string chirpId, string title, string html, int characters, string tweetUrl, string quoteUrl){
+        public TweetNotification(string columnId, string chirpId, string title, string html, int characters, string tweetUrl, string quoteUrl){
             this.ColumnId = columnId;
             this.ChirpId = chirpId;
 
@@ -39,19 +45,18 @@ namespace TweetLib.Core.Features.Notifications{
             return 2000+Math.Max(1000, value*characters);
         }
 
-        public string GenerateHtml(string bodyClasses, string? headLayout, string? customStyles){ // TODO
+        public string GenerateHtml(string bodyClasses, Control sync){
-            headLayout ??= DefaultHeadLayout;
+            string headLayout = TweetDeckBridge.NotificationHeadLayout ?? DefaultHeadLayout;
-            customStyles ??= string.Empty;
+            string mainCSS = ScriptLoader.LoadResource("styles/notification.css", sync) ?? string.Empty;
+            string customCSS = Program.Config.User.CustomNotificationCSS ?? string.Empty;
             
-            string mainCSS = App.ResourceHandler.Load("styles/notification.css") ?? string.Empty;
+            StringBuilder build = new StringBuilder(320 + headLayout.Length + mainCSS.Length + customCSS.Length + html.Length);
-            
-            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(customStyles)){
+            if (!string.IsNullOrWhiteSpace(customCSS)){
-                build.Append("<style type='text/css'>").Append(customStyles).Append("</style>");
+                build.Append("<style type='text/css'>").Append(customCSS).Append("</style>");
             }
             
             build.Append("</head><body class='scroll-styled-v");

Core/Other/Analytics/AnalyticsFile.cs

@@ -2,8 +2,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq;
 using System.Reflection;
-using TweetLib.Core.Serialization;
+using TweetDuck.Data.Serialization;
-using TweetLib.Core.Serialization.Converters;
 
 namespace TweetDuck.Core.Other.Analytics{
     [SuppressMessage("ReSharper", "AutoPropertyCanBeMadeGetOnly.Local")]

Core/Other/Analytics/AnalyticsManager.cs

@@ -8,9 +8,7 @@ using System.Threading.Tasks;
 using System.Timers;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Utils;
-using TweetLib.Core;
+using TweetDuck.Plugins;
-using TweetLib.Core.Features.Plugins;
-using TweetLib.Core.Utils;
 
 namespace TweetDuck.Core.Other.Analytics{
     sealed class AnalyticsManager : IDisposable{
@@ -82,7 +80,7 @@ namespace TweetDuck.Core.Other.Analytics{
         private void SetLastDataCollectionTime(DateTime dt, string message = null){
             File.LastDataCollection = new DateTime(dt.Year, dt.Month, dt.Day, dt.Hour, dt.Minute, 0, dt.Kind);
             File.LastCollectionVersion = Program.VersionTag;
-            File.LastCollectionMessage = message ?? dt.ToString("g", Lib.Culture);
+            File.LastCollectionMessage = message ?? dt.ToString("g", Program.Culture);
 
             File.Save();
             RestartTimer();
@@ -119,7 +117,7 @@ namespace TweetDuck.Core.Other.Analytics{
                 System.Diagnostics.Debugger.Break();
                 #endif
 
-                WebUtils.NewClient(BrowserUtils.UserAgentVanilla).UploadValues(CollectionUrl, "POST", report.ToNameValueCollection());
+                BrowserUtils.CreateWebClient().UploadValues(CollectionUrl, "POST", report.ToNameValueCollection());
             }).ContinueWith(task => browser.InvokeAsyncSafe(() => {
                 if (task.Status == TaskStatus.RanToCompletion){
                     SetLastDataCollectionTime(DateTime.Now);

Core/Other/Analytics/AnalyticsReportGenerator.cs

@@ -8,12 +8,10 @@ using TweetDuck.Configuration;
 using System.Linq;
 using System.Management;
 using System.Text.RegularExpressions;
+using TweetDuck.Core.Notification;
 using TweetDuck.Core.Utils;
-using TweetLib.Core;
+using TweetDuck.Plugins;
-using TweetLib.Core.Features.Notifications;
+using TweetDuck.Plugins.Enums;
-using TweetLib.Core.Features.Plugins;
-using TweetLib.Core.Features.Plugins.Enums;
-using TweetLib.Core.Utils;
 
 namespace TweetDuck.Core.Other.Analytics{
     static class AnalyticsReportGenerator{
@@ -29,7 +27,7 @@ namespace TweetDuck.Core.Other.Analytics{
                 { "System Edition"     , SystemEdition },
                 { "System Environment" , Environment.Is64BitOperatingSystem ? "64-bit" : "32-bit" },
                 { "System Build"       , SystemBuild },
-                { "System Locale"      , Lib.Culture.Name.ToLower() },
+                { "System Locale"      , Program.Culture.Name.ToLower() },
                 0,
                 { "RAM" , Exact(RamSize) },
                 { "GPU" , GpuVendor },
@@ -81,7 +79,7 @@ namespace TweetDuck.Core.Other.Analytics{
                 { "Custom Notification CSS" , RoundUp((UserConfig.CustomNotificationCSS ?? string.Empty).Length, 50) },
                 0,
                 { "Plugins All"     , List(plugins.Plugins.Select(Plugin)) },
-                { "Plugins Enabled" , List(plugins.Plugins.Where(plugins.Config.IsEnabled).Select(Plugin)) },
+                { "Plugins Enabled" , List(plugins.Plugins.Where(plugin => plugins.Config.IsEnabled(plugin)).Select(Plugin)) },
                 0,
                 { "Theme"               , Dict(editLayoutDesign, "_theme",                  "light/def") },
                 { "Column Width"        , Dict(editLayoutDesign, "columnWidth",             "310px/def") },
@@ -143,8 +141,7 @@ 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,6 +155,7 @@ namespace TweetDuck.Core.Other.Analytics{
                             osEdition = match.Groups[2].Value;
                         }
                     }
+                }
             }catch{
                 osName = osEdition = osBuild = null;
             }
@@ -167,11 +165,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;
             }
@@ -179,8 +177,7 @@ 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,6 +185,7 @@ namespace TweetDuck.Core.Other.Analytics{
                             gpu = vendor;
                         }
                     }
+                }
             }catch{
                 // rip
             }
@@ -206,30 +204,36 @@ namespace TweetDuck.Core.Other.Analytics{
         }
 
         private static string TrayMode{
-            get => UserConfig.TrayBehavior switch{
+            get{
-                TrayIcon.Behavior.DisplayOnly    => "icon",
+                switch(UserConfig.TrayBehavior){
-                TrayIcon.Behavior.MinimizeToTray => "minimize",
+                    case TrayIcon.Behavior.DisplayOnly: return "icon";
-                TrayIcon.Behavior.CloseToTray    => "close",
+                    case TrayIcon.Behavior.MinimizeToTray: return "minimize";
-                TrayIcon.Behavior.Combined       => "combined",
+                    case TrayIcon.Behavior.CloseToTray: return "close";
-                _                                => "off"
+                    case TrayIcon.Behavior.Combined: return "combined";
-            };
+                    default: return "off";
+                }
+            }
         }
 
         private static string NotificationPosition{
-            get => UserConfig.NotificationPosition switch{
+            get{
-                DesktopNotification.Position.TopLeft     => "top left",
+                switch(UserConfig.NotificationPosition){
-                DesktopNotification.Position.TopRight    => "top right",
+                    case TweetNotification.Position.TopLeft: return "top left";
-                DesktopNotification.Position.BottomLeft  => "bottom left",
+                    case TweetNotification.Position.TopRight: return "top right";
-                DesktopNotification.Position.BottomRight => "bottom right",
+                    case TweetNotification.Position.BottomLeft: return "bottom left";
-                _                                        => "custom"
+                    case TweetNotification.Position.BottomRight: return "bottom right";
-            };
+                    default: return "custom";
+                }
+            }
         }
 
         private static string NotificationSize{
-            get => UserConfig.NotificationSize switch{
+            get{
-                DesktopNotification.Size.Auto => "auto",
+                switch(UserConfig.NotificationSize){
-                _ => RoundUp(UserConfig.CustomNotificationSize.Width, 20) + "x" + RoundUp(UserConfig.CustomNotificationSize.Height, 20)
+                    case TweetNotification.Size.Auto: return "auto";
-            };
+                    default: return RoundUp(UserConfig.CustomNotificationSize.Width, 20)+"x"+RoundUp(UserConfig.CustomNotificationSize.Height, 20);
+                }
+            }
         }
 
         private static string NotificationTimer{

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){
-            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");
+            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");
         }
     }
 }

Core/Other/FormPlugins.Designer.cs

@@ -1,6 +1,4 @@
-using TweetDuck.Core.Controls;
+namespace TweetDuck.Core.Other {
-
-namespace TweetDuck.Core.Other {
     partial class FormPlugins {
         /// <summary>
         /// Required designer variable.
@@ -29,7 +27,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 FlowLayoutPanelNoHScroll();
+            this.flowLayoutPlugins = new TweetDuck.Plugins.Controls.PluginListFlowLayout();
             this.timerLayout = new System.Windows.Forms.Timer(this.components);
             this.SuspendLayout();
             // 
@@ -119,7 +117,7 @@ namespace TweetDuck.Core.Other {
         private System.Windows.Forms.Button btnClose;
         private System.Windows.Forms.Button btnReload;
         private System.Windows.Forms.Button btnOpenFolder;
-        private FlowLayoutPanelNoHScroll flowLayoutPlugins;
+        private Plugins.Controls.PluginListFlowLayout flowLayoutPlugins;
         private System.Windows.Forms.Timer timerLayout;
     }
 }

Core/Other/FormPlugins.cs

@@ -1,11 +1,11 @@
 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 TweetDuck.Plugins.Controls;
-using TweetLib.Core.Features.Plugins;
 
 namespace TweetDuck.Core.Other{
     sealed partial class FormPlugins : Form, FormManager.IAppDialog{
@@ -95,7 +95,7 @@ namespace TweetDuck.Core.Other{
         }
 
         private void btnOpenFolder_Click(object sender, EventArgs e){
-            App.SystemHandler.OpenFileExplorer(pluginManager.PathCustomPlugins);
+            using(Process.Start("explorer.exe", '"'+pluginManager.PathCustomPlugins+'"')){}
         }
 
         private void btnReload_Click(object sender, EventArgs e){

Core/Other/FormSettings.cs

@@ -9,8 +9,8 @@ using TweetDuck.Core.Other.Analytics;
 using TweetDuck.Core.Other.Settings;
 using TweetDuck.Core.Other.Settings.Dialogs;
 using TweetDuck.Core.Utils;
-using TweetLib.Core.Features.Plugins;
+using TweetDuck.Plugins;
-using TweetLib.Core.Features.Updates;
+using TweetDuck.Updates;
 
 namespace TweetDuck.Core.Other{
     sealed partial class FormSettings : Form, FormManager.IAppDialog{
@@ -41,7 +41,6 @@ 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));
 
@@ -196,7 +195,7 @@ namespace TweetDuck.Core.Other{
         private sealed class SettingsTab{
             public Button Button { get; }
 
-            public BaseTabSettings Control => control ??= constructor();
+            public BaseTabSettings Control => control ?? (control = constructor());
             public bool IsInitialized => control != null;
 
             private readonly Func<BaseTabSettings> constructor;

Core/Other/Settings/BaseTabSettings.cs

@@ -9,7 +9,7 @@ namespace TweetDuck.Core.Other.Settings{
 
         public IEnumerable<Control> InteractiveControls{
             get{
-                static IEnumerable<Control> FindInteractiveControls(Control parent){
+                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/DialogSettingsAnalytics.cs

@@ -5,6 +5,8 @@ using TweetDuck.Core.Other.Analytics;
 
 namespace TweetDuck.Core.Other.Settings.Dialogs{
     sealed partial class DialogSettingsAnalytics : Form{
+        public string CefArgs => textBoxReport.Text;
+
         public DialogSettingsAnalytics(AnalyticsReport report){
             InitializeComponent();
             

Core/Other/Settings/Dialogs/DialogSettingsCefArgs.cs

@@ -2,7 +2,7 @@
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Utils;
-using TweetLib.Core.Collections;
+using TweetDuck.Data;
 
 namespace TweetDuck.Core.Other.Settings.Dialogs{
     sealed partial class DialogSettingsCefArgs : Form{

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

@@ -1,154 +0,0 @@
-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

@@ -1,55 +0,0 @@
-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,8 +4,8 @@ using System.IO;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
 using TweetDuck.Core.Management;
-using TweetLib.Core.Features.Plugins;
+using TweetDuck.Core.Utils;
-using TweetLib.Core.Utils;
+using TweetDuck.Plugins;
 
 namespace TweetDuck.Core.Other.Settings.Dialogs{
     sealed partial class DialogSettingsManage : Form{

Core/Other/Settings/Dialogs/DialogSettingsRestart.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
-using TweetLib.Core.Collections;
+using TweetDuck.Data;
 
 namespace TweetDuck.Core.Other.Settings.Dialogs{
     sealed partial class DialogSettingsRestart : Form{
@@ -18,7 +18,7 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
                 tbDataFolder.Enabled = false;
             }
             else{
-                tbDataFolder.Text = currentArgs.GetValue(Arguments.ArgDataFolder) ?? string.Empty;
+                tbDataFolder.Text = currentArgs.GetValue(Arguments.ArgDataFolder, string.Empty);
                 tbDataFolder.TextChanged += control_Change;
             }
 

Core/Other/Settings/TabSettingsAdvanced.Designer.cs

@@ -41,8 +41,6 @@
             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();
@@ -242,8 +240,6 @@
             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";
@@ -251,29 +247,6 @@
             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);
@@ -311,7 +284,5 @@
         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,4 +1,5 @@
 using System;
+using System.Diagnostics;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
@@ -6,7 +7,6 @@ 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,16 +44,6 @@ 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(){
@@ -67,8 +57,6 @@ namespace TweetDuck.Core.Other.Settings{
             
             btnEditCefArgs.Click += btnEditCefArgs_Click;
             btnEditCSS.Click += btnEditCSS_Click;
-
-            checkDevToolsWindowOnTop.CheckedChanged += checkDevToolsWindowOnTop_CheckedChanged;
         }
 
         public override void OnClosing(){
@@ -79,11 +67,11 @@ namespace TweetDuck.Core.Other.Settings{
         #region Application
         
         private void btnOpenAppFolder_Click(object sender, EventArgs e){
-            App.SystemHandler.OpenFileExplorer(Program.ProgramPath);
+            using(Process.Start("explorer.exe", "\""+Program.ProgramPath+"\"")){}
         }
 
         private void btnOpenDataFolder_Click(object sender, EventArgs e){
-            App.SystemHandler.OpenFileExplorer(Program.StoragePath);
+            using(Process.Start("explorer.exe", "\""+Program.StoragePath+"\"")){}
         }
 
         private void btnRestart_Click(object sender, EventArgs e){
@@ -164,13 +152,6 @@ 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 TweetLib.Core.Features.Plugins;
+using TweetDuck.Plugins;
 
 namespace TweetDuck.Core.Other.Settings{
     sealed partial class TabSettingsFeedback : BaseTabSettings{

Core/Other/Settings/TabSettingsGeneral.Designer.cs

@@ -39,39 +39,31 @@
             this.checkAnimatedAvatars = new System.Windows.Forms.CheckBox();
             this.labelUpdates = new System.Windows.Forms.Label();
             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.comboBoxCustomBrowser = new System.Windows.Forms.ComboBox();
+            this.comboBoxBrowserPath = 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
@@ -90,11 +82,11 @@
             // 
             this.checkUpdateNotifications.AutoSize = true;
             this.checkUpdateNotifications.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.checkUpdateNotifications.Location = new System.Drawing.Point(6, 403);
+            this.checkUpdateNotifications.Location = new System.Drawing.Point(6, 393);
             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);
-            this.checkUpdateNotifications.TabIndex = 14;
+            this.checkUpdateNotifications.TabIndex = 13;
             this.checkUpdateNotifications.Text = "Check Updates Automatically";
             this.checkUpdateNotifications.UseVisualStyleBackColor = true;
             // 
@@ -102,12 +94,12 @@
             // 
             this.btnCheckUpdates.AutoSize = true;
             this.btnCheckUpdates.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.btnCheckUpdates.Location = new System.Drawing.Point(5, 427);
+            this.btnCheckUpdates.Location = new System.Drawing.Point(5, 417);
             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);
             this.btnCheckUpdates.Size = new System.Drawing.Size(128, 25);
-            this.btnCheckUpdates.TabIndex = 15;
+            this.btnCheckUpdates.TabIndex = 14;
             this.btnCheckUpdates.Text = "Check Updates Now";
             this.btnCheckUpdates.UseVisualStyleBackColor = true;
             // 
@@ -127,11 +119,11 @@
             // 
             this.checkBestImageQuality.AutoSize = true;
             this.checkBestImageQuality.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.checkBestImageQuality.Location = new System.Drawing.Point(6, 122);
+            this.checkBestImageQuality.Location = new System.Drawing.Point(6, 98);
             this.checkBestImageQuality.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkBestImageQuality.Name = "checkBestImageQuality";
             this.checkBestImageQuality.Size = new System.Drawing.Size(125, 19);
-            this.checkBestImageQuality.TabIndex = 5;
+            this.checkBestImageQuality.TabIndex = 4;
             this.checkBestImageQuality.Text = "Best Image Quality";
             this.checkBestImageQuality.UseVisualStyleBackColor = true;
             // 
@@ -139,11 +131,11 @@
             // 
             this.checkOpenSearchInFirstColumn.AutoSize = true;
             this.checkOpenSearchInFirstColumn.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.checkOpenSearchInFirstColumn.Location = new System.Drawing.Point(6, 74);
+            this.checkOpenSearchInFirstColumn.Location = new System.Drawing.Point(6, 50);
             this.checkOpenSearchInFirstColumn.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkOpenSearchInFirstColumn.Name = "checkOpenSearchInFirstColumn";
             this.checkOpenSearchInFirstColumn.Size = new System.Drawing.Size(245, 19);
-            this.checkOpenSearchInFirstColumn.TabIndex = 3;
+            this.checkOpenSearchInFirstColumn.TabIndex = 2;
             this.checkOpenSearchInFirstColumn.Text = "Add Search Columns Before First Column";
             this.checkOpenSearchInFirstColumn.UseVisualStyleBackColor = true;
             // 
@@ -166,11 +158,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, 299);
+            this.labelZoom.Location = new System.Drawing.Point(3, 155);
             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 = 11;
+            this.labelZoom.TabIndex = 6;
             this.labelZoom.Text = "Zoom";
             // 
             // zoomUpdateTimer
@@ -193,21 +185,21 @@
             // 
             this.panelZoom.Controls.Add(this.trackBarZoom);
             this.panelZoom.Controls.Add(this.labelZoomValue);
-            this.panelZoom.Location = new System.Drawing.Point(0, 315);
+            this.panelZoom.Location = new System.Drawing.Point(0, 171);
             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 = 12;
+            this.panelZoom.TabIndex = 7;
             // 
             // checkAnimatedAvatars
             // 
             this.checkAnimatedAvatars.AutoSize = true;
             this.checkAnimatedAvatars.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.checkAnimatedAvatars.Location = new System.Drawing.Point(6, 146);
+            this.checkAnimatedAvatars.Location = new System.Drawing.Point(6, 122);
             this.checkAnimatedAvatars.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkAnimatedAvatars.Name = "checkAnimatedAvatars";
             this.checkAnimatedAvatars.Size = new System.Drawing.Size(158, 19);
-            this.checkAnimatedAvatars.TabIndex = 6;
+            this.checkAnimatedAvatars.TabIndex = 5;
             this.checkAnimatedAvatars.Text = "Enable Animated Avatars";
             this.checkAnimatedAvatars.UseVisualStyleBackColor = true;
             // 
@@ -215,11 +207,11 @@
             // 
             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, 377);
+            this.labelUpdates.Location = new System.Drawing.Point(0, 367);
-            this.labelUpdates.Margin = new System.Windows.Forms.Padding(0, 27, 0, 1);
+            this.labelUpdates.Margin = new System.Windows.Forms.Padding(0, 30, 0, 1);
             this.labelUpdates.Name = "labelUpdates";
             this.labelUpdates.Size = new System.Drawing.Size(69, 19);
-            this.labelUpdates.TabIndex = 13;
+            this.labelUpdates.TabIndex = 12;
             this.labelUpdates.Text = "UPDATES";
             // 
             // flowPanelLeft
@@ -228,17 +220,16 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.flowPanelLeft.Controls.Add(this.labelUI);
             this.flowPanelLeft.Controls.Add(this.checkExpandLinks);
-            this.flowPanelLeft.Controls.Add(this.checkFocusDmInput);
             this.flowPanelLeft.Controls.Add(this.checkOpenSearchInFirstColumn);
             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);
@@ -249,50 +240,83 @@
             this.flowPanelLeft.TabIndex = 0;
             this.flowPanelLeft.WrapContents = false;
             // 
-            // checkFocusDmInput
-            // 
-            this.checkFocusDmInput.AutoSize = true;
-            this.checkFocusDmInput.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.checkFocusDmInput.Location = new System.Drawing.Point(6, 50);
-            this.checkFocusDmInput.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
-            this.checkFocusDmInput.Name = "checkFocusDmInput";
-            this.checkFocusDmInput.Size = new System.Drawing.Size(282, 19);
-            this.checkFocusDmInput.TabIndex = 2;
-            this.checkFocusDmInput.Text = "Focus Input Field When Opening Direct Message";
-            this.checkFocusDmInput.UseVisualStyleBackColor = true;
-            // 
             // checkKeepLikeFollowDialogsOpen
             // 
             this.checkKeepLikeFollowDialogsOpen.AutoSize = true;
             this.checkKeepLikeFollowDialogsOpen.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.checkKeepLikeFollowDialogsOpen.Location = new System.Drawing.Point(6, 98);
+            this.checkKeepLikeFollowDialogsOpen.Location = new System.Drawing.Point(6, 74);
             this.checkKeepLikeFollowDialogsOpen.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkKeepLikeFollowDialogsOpen.Name = "checkKeepLikeFollowDialogsOpen";
             this.checkKeepLikeFollowDialogsOpen.Size = new System.Drawing.Size(190, 19);
-            this.checkKeepLikeFollowDialogsOpen.TabIndex = 4;
+            this.checkKeepLikeFollowDialogsOpen.TabIndex = 3;
             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, 236);
+            this.labelTray.Margin = new System.Windows.Forms.Padding(0, 30, 0, 1);
+            this.labelTray.Name = "labelTray";
+            this.labelTray.Size = new System.Drawing.Size(99, 19);
+            this.labelTray.TabIndex = 8;
+            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, 260);
+            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 = 9;
+            // 
+            // 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, 295);
+            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 = 10;
+            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, 316);
+            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 = 11;
+            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, 192);
+            this.labelBrowserSettings.Location = new System.Drawing.Point(0, 0);
-            this.labelBrowserSettings.Margin = new System.Windows.Forms.Padding(0, 25, 0, 1);
+            this.labelBrowserSettings.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1);
             this.labelBrowserSettings.Name = "labelBrowserSettings";
             this.labelBrowserSettings.Size = new System.Drawing.Size(143, 19);
-            this.labelBrowserSettings.TabIndex = 7;
+            this.labelBrowserSettings.TabIndex = 0;
             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, 218);
+            this.checkSmoothScrolling.Location = new System.Drawing.Point(6, 26);
             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 = 8;
+            this.checkSmoothScrolling.TabIndex = 1;
             this.checkSmoothScrolling.Text = "Smooth Scrolling";
             this.checkSmoothScrolling.UseVisualStyleBackColor = true;
             // 
@@ -300,57 +324,45 @@
             // 
             this.checkTouchAdjustment.AutoSize = true;
             this.checkTouchAdjustment.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.checkTouchAdjustment.Location = new System.Drawing.Point(6, 242);
+            this.checkTouchAdjustment.Location = new System.Drawing.Point(6, 50);
             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 = 9;
+            this.checkTouchAdjustment.TabIndex = 2;
             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, 275);
+            this.labelBrowserPath.Location = new System.Drawing.Point(3, 107);
             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 = 9;
+            this.labelBrowserPath.TabIndex = 4;
             this.labelBrowserPath.Text = "Open Links With...";
             // 
-            // comboBoxCustomBrowser
+            // comboBoxBrowserPath
             // 
-            this.comboBoxCustomBrowser.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxBrowserPath.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxCustomBrowser.Font = new System.Drawing.Font("Segoe UI", 9F);
+            this.comboBoxBrowserPath.Font = new System.Drawing.Font("Segoe UI", 9F);
-            this.comboBoxCustomBrowser.FormattingEnabled = true;
+            this.comboBoxBrowserPath.FormattingEnabled = true;
-            this.comboBoxCustomBrowser.Location = new System.Drawing.Point(5, 1);
+            this.comboBoxBrowserPath.Location = new System.Drawing.Point(5, 126);
-            this.comboBoxCustomBrowser.Margin = new System.Windows.Forms.Padding(5, 1, 3, 0);
+            this.comboBoxBrowserPath.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
-            this.comboBoxCustomBrowser.Name = "comboBoxCustomBrowser";
+            this.comboBoxBrowserPath.Name = "comboBoxBrowserPath";
-            this.comboBoxCustomBrowser.Size = new System.Drawing.Size(173, 23);
+            this.comboBoxBrowserPath.Size = new System.Drawing.Size(173, 23);
-            this.comboBoxCustomBrowser.TabIndex = 0;
+            this.comboBoxBrowserPath.TabIndex = 5;
             // 
             // 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, 389);
+            this.labelSearchEngine.Location = new System.Drawing.Point(3, 164);
             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 = 13;
+            this.labelSearchEngine.TabIndex = 6;
             this.labelSearchEngine.Text = "Search Engine";
             // 
             // comboBoxSearchEngine
@@ -358,31 +370,30 @@
             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, 408);
+            this.comboBoxSearchEngine.Location = new System.Drawing.Point(5, 183);
             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 = 14;
+            this.comboBoxSearchEngine.TabIndex = 7;
             // 
             // 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";
@@ -390,26 +401,38 @@
             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, 0);
+            this.labelLocales.Location = new System.Drawing.Point(0, 236);
-            this.labelLocales.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1);
+            this.labelLocales.Margin = new System.Windows.Forms.Padding(0, 27, 0, 1);
             this.labelLocales.Name = "labelLocales";
             this.labelLocales.Size = new System.Drawing.Size(67, 19);
-            this.labelLocales.TabIndex = 0;
+            this.labelLocales.TabIndex = 8;
             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, 26);
+            this.checkSpellCheck.Location = new System.Drawing.Point(6, 262);
             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 = 1;
+            this.checkSpellCheck.TabIndex = 9;
             this.checkSpellCheck.Text = "Enable Spell Check";
             this.checkSpellCheck.UseVisualStyleBackColor = true;
             // 
@@ -417,11 +440,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, 59);
+            this.labelSpellCheckLanguage.Location = new System.Drawing.Point(3, 295);
             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 = 2;
+            this.labelSpellCheckLanguage.TabIndex = 10;
             this.labelSpellCheckLanguage.Text = "Spell Check Language";
             // 
             // comboBoxSpellCheckLanguage
@@ -429,21 +452,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, 78);
+            this.comboBoxSpellCheckLanguage.Location = new System.Drawing.Point(5, 314);
             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 = 3;
+            this.comboBoxSpellCheckLanguage.TabIndex = 11;
             // 
             // 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, 116);
+            this.labelTranslationTarget.Location = new System.Drawing.Point(3, 352);
             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 = 4;
+            this.labelTranslationTarget.TabIndex = 12;
             this.labelTranslationTarget.Text = "Bing Translator Language";
             // 
             // comboBoxTranslationTarget
@@ -451,114 +474,11 @@
             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, 135);
+            this.comboBoxTranslationTarget.Location = new System.Drawing.Point(5, 371);
             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 = 5;
+            this.comboBoxTranslationTarget.TabIndex = 13;
-            // 
-            // 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
             // 
@@ -586,10 +506,6 @@
             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);
 
         }
@@ -613,7 +529,7 @@
         private System.Windows.Forms.FlowLayoutPanel flowPanelLeft;
         private System.Windows.Forms.CheckBox checkKeepLikeFollowDialogsOpen;
         private System.Windows.Forms.Label labelBrowserPath;
-        private System.Windows.Forms.ComboBox comboBoxCustomBrowser;
+        private System.Windows.Forms.ComboBox comboBoxBrowserPath;
         private System.Windows.Forms.Label labelBrowserSettings;
         private System.Windows.Forms.CheckBox checkSmoothScrolling;
         private System.Windows.Forms.Label labelSearchEngine;
@@ -621,6 +537,10 @@
         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;
@@ -628,15 +548,5 @@
         private System.Windows.Forms.Label labelTranslationTarget;
         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

@@ -6,8 +6,7 @@ using TweetDuck.Core.Controls;
 using TweetDuck.Core.Handling.General;
 using TweetDuck.Core.Other.Settings.Dialogs;
 using TweetDuck.Core.Utils;
-using TweetLib.Core.Features.Updates;
+using TweetDuck.Updates;
-using TweetLib.Core.Utils;
 
 namespace TweetDuck.Core.Other.Settings{
     sealed partial class TabSettingsGeneral : BaseTabSettings{
@@ -19,9 +18,6 @@ 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;
 
@@ -38,7 +34,6 @@ namespace TweetDuck.Core.Other.Settings{
             // user interface
 
             toolTip.SetToolTip(checkExpandLinks, "Expands links inside the tweets. If disabled,\r\nthe full links show up in a tooltip instead.");
-            toolTip.SetToolTip(checkFocusDmInput, "Places cursor into Direct Message input\r\nfield when opening a conversation.");
             toolTip.SetToolTip(checkOpenSearchInFirstColumn, "By default, TweetDeck adds Search columns at the end.\r\nThis option makes them appear before the first column instead.");
             toolTip.SetToolTip(checkKeepLikeFollowDialogsOpen, "Allows liking and following from multiple accounts at once,\r\ninstead of automatically closing the dialog after taking an action.");
             toolTip.SetToolTip(checkBestImageQuality, "When right-clicking a tweet image, the context menu options\r\nwill use links to the original image size (:orig in the URL).");
@@ -47,7 +42,6 @@ namespace TweetDuck.Core.Other.Settings{
             toolTip.SetToolTip(trackBarZoom, toolTip.GetToolTip(labelZoomValue));
 
             checkExpandLinks.Checked = Config.ExpandLinksOnHover;
-            checkFocusDmInput.Checked = Config.FocusDmInput;
             checkOpenSearchInFirstColumn.Checked = Config.OpenSearchInFirstColumn;
             checkKeepLikeFollowDialogsOpen.Checked = Config.KeepLikeFollowDialogsOpen;
             checkBestImageQuality.Checked = Config.BestImageQuality;
@@ -56,6 +50,21 @@ 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.");
@@ -68,8 +77,7 @@ 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(comboBoxCustomBrowser, "Sets the default browser for opening links.");
+            toolTip.SetToolTip(comboBoxBrowserPath, "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;
@@ -77,17 +85,13 @@ namespace TweetDuck.Core.Other.Settings{
             checkHardwareAcceleration.Checked = SysConfig.HardwareAcceleration;
 
             foreach(WindowsUtils.Browser browserInfo in WindowsUtils.FindInstalledBrowsers()){
-                comboBoxCustomBrowser.Items.Add(browserInfo);
+                comboBoxBrowserPath.Items.Add(browserInfo);
             }
             
-            browserListIndexDefault = comboBoxCustomBrowser.Items.Add("(default browser)");
+            browserListIndexDefault = comboBoxBrowserPath.Items.Add("(default browser)");
-            browserListIndexCustom = comboBoxCustomBrowser.Items.Add("(custom program...)");
+            browserListIndexCustom = comboBoxBrowserPath.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="));
@@ -101,7 +105,6 @@ 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;
 
@@ -120,44 +123,31 @@ 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(){
             checkExpandLinks.CheckedChanged += checkExpandLinks_CheckedChanged;
-            checkFocusDmInput.CheckedChanged += checkFocusDmInput_CheckedChanged;
             checkOpenSearchInFirstColumn.CheckedChanged += checkOpenSearchInFirstColumn_CheckedChanged;
             checkKeepLikeFollowDialogsOpen.CheckedChanged += checkKeepLikeFollowDialogsOpen_CheckedChanged;
             checkBestImageQuality.CheckedChanged += checkBestImageQuality_CheckedChanged;
             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;
-            comboBoxCustomBrowser.SelectedIndexChanged += comboBoxCustomBrowser_SelectedIndexChanged;
+            comboBoxBrowserPath.SelectedIndexChanged += comboBoxBrowserPath_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(){
@@ -170,10 +160,6 @@ namespace TweetDuck.Core.Other.Settings{
             Config.ExpandLinksOnHover = checkExpandLinks.Checked;
         }
 
-        private void checkFocusDmInput_CheckedChanged(object sender, EventArgs e){
-            Config.FocusDmInput = checkFocusDmInput.Checked;
-        }
-
         private void checkOpenSearchInFirstColumn_CheckedChanged(object sender, EventArgs e){
             Config.OpenSearchInFirstColumn = checkOpenSearchInFirstColumn.Checked;
         }
@@ -204,6 +190,18 @@ 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
         
@@ -247,95 +245,43 @@ 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)){
-                comboBoxCustomBrowser.SelectedIndex = browserListIndexDefault;
+                comboBoxBrowserPath.SelectedIndex = browserListIndexDefault;
             }
             else{
-                WindowsUtils.Browser browserInfo = comboBoxCustomBrowser.Items.OfType<WindowsUtils.Browser>().FirstOrDefault(browser => browser.Path == Config.BrowserPath);
+                WindowsUtils.Browser browserInfo = comboBoxBrowserPath.Items.OfType<WindowsUtils.Browser>().FirstOrDefault(browser => browser.Path == Config.BrowserPath);
 
-                if (browserInfo == null || Config.BrowserPathArgs != null){
+                if (browserInfo == null){
-                    comboBoxCustomBrowser.SelectedIndex = browserListIndexCustom;
+                    comboBoxBrowserPath.SelectedIndex = browserListIndexCustom;
                 }
                 else{
-                    comboBoxCustomBrowser.SelectedItem = browserInfo;
+                    comboBoxBrowserPath.SelectedItem = browserInfo;
+                }
             }
         }
 
-            UpdateBrowserChangeButton();
+        private void comboBoxBrowserPath_SelectedIndexChanged(object sender, EventArgs e){
-        }
+            if (comboBoxBrowserPath.SelectedIndex == browserListIndexCustom){
-
+                using(OpenFileDialog dialog = new OpenFileDialog{
-        private void comboBoxCustomBrowser_SelectedIndexChanged(object sender, EventArgs e){
+                    AutoUpgradeEnabled = true,
-            if (comboBoxCustomBrowser.SelectedIndex == browserListIndexCustom){
+                    DereferenceLinks = true,
-                btnCustomBrowserChange_Click(sender, e);
+                    InitialDirectory = Path.GetDirectoryName(Config.BrowserPath), // returns null if argument is null
-            }
+                    Title = "Open Links With...",
-            else{
+                    Filter = "Executables (*.exe;*.bat;*.cmd)|*.exe;*.bat;*.cmd|All Files (*.*)|*.*"
-                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.Path;
+                        Config.BrowserPath = dialog.FileName;
-                    Config.BrowserPathArgs = dialog.Args;
                     }
                 }
 
-            comboBoxCustomBrowser.SelectedIndexChanged -= comboBoxCustomBrowser_SelectedIndexChanged;
+                comboBoxBrowserPath.SelectedIndexChanged -= comboBoxBrowserPath_SelectedIndexChanged;
                 UpdateBrowserPathSelection();
-            comboBoxCustomBrowser.SelectedIndexChanged += comboBoxCustomBrowser_SelectedIndexChanged;
+                comboBoxBrowserPath.SelectedIndexChanged += comboBoxBrowserPath_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{
-                comboBoxCustomVideoPlayer.SelectedIndex = videoPlayerListIndexCustom;
+                Config.BrowserPath = (comboBoxBrowserPath.SelectedItem as WindowsUtils.Browser)?.Path; // default browser item is a string and casts to null
             }
-
-            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){
@@ -401,24 +347,6 @@ 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 DesktopNotification.Position.TopLeft: radioLocTL.Checked = true; break;
+                case TweetNotification.Position.TopLeft: radioLocTL.Checked = true; break;
-                case DesktopNotification.Position.TopRight: radioLocTR.Checked = true; break;
+                case TweetNotification.Position.TopRight: radioLocTR.Checked = true; break;
-                case DesktopNotification.Position.BottomLeft: radioLocBL.Checked = true; break;
+                case TweetNotification.Position.BottomLeft: radioLocBL.Checked = true; break;
-                case DesktopNotification.Position.BottomRight: radioLocBR.Checked = true; break;
+                case TweetNotification.Position.BottomRight: radioLocBR.Checked = true; break;
-                case DesktopNotification.Position.Custom: radioLocCustom.Checked = true; break;
+                case TweetNotification.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 DesktopNotification.Size.Auto: radioSizeAuto.Checked = true; break;
+                case TweetNotification.Size.Auto: radioSizeAuto.Checked = true; break;
-                case DesktopNotification.Size.Custom: radioSizeCustom.Checked = true; break;
+                case TweetNotification.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 = DesktopNotification.Position.TopLeft;
+            if (radioLocTL.Checked)Config.NotificationPosition = TweetNotification.Position.TopLeft;
-            else if (radioLocTR.Checked)Config.NotificationPosition = DesktopNotification.Position.TopRight;
+            else if (radioLocTR.Checked)Config.NotificationPosition = TweetNotification.Position.TopRight;
-            else if (radioLocBL.Checked)Config.NotificationPosition = DesktopNotification.Position.BottomLeft;
+            else if (radioLocBL.Checked)Config.NotificationPosition = TweetNotification.Position.BottomLeft;
-            else if (radioLocBR.Checked)Config.NotificationPosition = DesktopNotification.Position.BottomRight;
+            else if (radioLocBR.Checked)Config.NotificationPosition = TweetNotification.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 = DesktopNotification.Position.Custom;
+            Config.NotificationPosition = TweetNotification.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 = DesktopNotification.Position.TopRight;
+                Config.NotificationPosition = TweetNotification.Position.TopRight;
                 notification.MoveToVisibleLocation();
 
                 Config.CustomNotificationPosition = notification.Location;
 
-                Config.NotificationPosition = DesktopNotification.Position.Custom;
+                Config.NotificationPosition = TweetNotification.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 = DesktopNotification.Size.Auto;
+                Config.NotificationSize = TweetNotification.Size.Auto;
             }
             
             notification.ShowExampleNotification(false);
@@ -276,7 +276,7 @@ namespace TweetDuck.Core.Other.Settings{
                 Config.CustomNotificationSize = notification.BrowserSize;
             }
 
-            Config.NotificationSize = DesktopNotification.Size.Custom;
+            Config.NotificationSize = TweetNotification.Size.Custom;
             notification.ShowExampleNotification(false);
         }
 

Core/Other/Settings/TabSettingsTray.Designer.cs

@@ -1,131 +0,0 @@
-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

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

Core/Utils/BrowserUtils.cs

@@ -3,11 +3,11 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
+using System.Net;
 using System.Windows.Forms;
 using CefSharp.WinForms;
 using TweetDuck.Configuration;
 using TweetDuck.Core.Other;
-using TweetLib.Core.Features.Twitter;
 
 namespace TweetDuck.Core.Utils{
     static class BrowserUtils{
@@ -60,12 +60,8 @@ 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.GetBrowserHost(), Config.ZoomLevel);
+                SetZoomLevel(browser.GetBrowser(), Config.ZoomLevel);
             }
 
             Config.ZoomLevelChanged += UpdateZoomLevel;
@@ -73,29 +69,34 @@ namespace TweetDuck.Core.Utils{
 
             browser.FrameLoadStart += (sender, args) => {
                 if (args.Frame.IsMain && Config.ZoomLevel != 100){
-                    SetZoomLevel(args.Browser.GetHost(), Config.ZoomLevel);
+                    SetZoomLevel(args.Browser, Config.ZoomLevel);
                 }
             };
         }
 
-        public static void OpenDevToolsCustom(this IWebBrowser browser){
+        private const string TwitterTrackingUrl = "t.co";
-            var info = new WindowInfo();
-            info.SetAsPopup(IntPtr.Zero, "Dev Tools");
 
-            if (Config.DevToolsWindowOnTop){
+        public enum UrlCheckResult{
-                info.ExStyle |= 0x00000008; // WS_EX_TOPMOST
+            Invalid, Tracking, Fine
         }
 
-            browser.GetBrowserHost().ShowDevTools(info);
+        public static UrlCheckResult CheckUrl(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 ? UrlCheckResult.Tracking : UrlCheckResult.Fine;
+                }
+            }
+
+            return UrlCheckResult.Invalid;
         }
 
         public static void OpenExternalBrowser(string url){
-            if (string.IsNullOrWhiteSpace(url)){
+            if (string.IsNullOrWhiteSpace(url))return;
-                return;
-            }
 
-            switch(TwitterUrls.Check(url)){
+            switch(CheckUrl(url)){
-                case TwitterUrls.UrlType.Fine:
+                case UrlCheckResult.Fine:
                     if (FormGuide.CheckGuideUrl(url, out string hash)){
                         FormGuide.Show(hash);
                     }
@@ -106,11 +107,8 @@ 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, browserArgs)){}
+                                using(Process.Start(browserPath, url)){}
                             }catch(Exception e){
                                 Program.Reporter.HandleException("Error Opening Browser", "Could not open the browser.", true, e);
                             }
@@ -119,9 +117,9 @@ namespace TweetDuck.Core.Utils{
 
                     break;
 
-                case TwitterUrls.UrlType.Tracking:
+                case UrlCheckResult.Tracking:
                     if (Config.IgnoreTrackingUrlWarning){
-                        goto case TwitterUrls.UrlType.Fine;
+                        goto case UrlCheckResult.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)){
@@ -137,22 +135,20 @@ namespace TweetDuck.Core.Utils{
                         }
 
                         if (result == DialogResult.Ignore || result == DialogResult.Yes){
-                            goto case TwitterUrls.UrlType.Fine;
+                            goto case UrlCheckResult.Fine;
                         }
                     }
 
                     break;
 
-                case TwitterUrls.UrlType.Invalid:
+                case UrlCheckResult.Invalid:
-                    FormMessage.Warning("Blocked URL", "A potentially malicious or invalid URL was blocked from opening:\n" + url, FormMessage.OK);
+                    FormMessage.Warning("Blocked URL", "A potentially malicious URL was blocked from opening:\n"+url, FormMessage.OK);
                     break;
             }
         }
 
         public static void OpenExternalSearch(string query){
-            if (string.IsNullOrWhiteSpace(query)){
+            if (string.IsNullOrWhiteSpace(query))return;
-                return;
-            }
             
             string searchUrl = Config.SearchEngineUrl;
             
@@ -178,8 +174,56 @@ namespace TweetDuck.Core.Utils{
             }
         }
 
+        public static string GetFileNameFromUrl(string url){
+            string file = Path.GetFileName(new Uri(url).AbsolutePath);
+            return string.IsNullOrEmpty(file) ? null : file;
+        }
+
+        public static string GetErrorName(CefErrorCode code){
+            return StringUtils.ConvertPascalCaseToScreamingSnakeCase(Enum.GetName(typeof(CefErrorCode), code) ?? string.Empty);
+        }
+
+        public static WebClient CreateWebClient(){
+            WindowsUtils.EnsureTLS12();
+
+            WebClient client = new WebClient{ Proxy = null };
+            client.Headers[HttpRequestHeader.UserAgent] = UserAgentVanilla;
+            return client;
+        }
+
+        public static WebClient DownloadFileAsync(string url, string target, string cookie, Action onSuccess, Action<Exception> onFailure){
+            WebClient client = CreateWebClient();
+
+            if (cookie != null){
+                client.Headers[HttpRequestHeader.Cookie] = cookie;
+            }
+
+            client.DownloadFileCompleted += (sender, args) => {
+                if (args.Cancelled){
+                    try{
+                        File.Delete(target);
+                    }catch{
+                        // didn't want it deleted anyways
+                    }
+                }
+                else if (args.Error != null){
+                    onFailure?.Invoke(args.Error);
+                }
+                else{
+                    onSuccess?.Invoke();
+                }
+            };
+
+            client.DownloadFileAsync(new Uri(url), target);
+            return client;
+        }
+
         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/LocaleUtils.cs

@@ -3,8 +3,8 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
 
-namespace TweetLib.Core.Utils{
+namespace TweetDuck.Core.Utils{
-    public static class LocaleUtils{
+    static class LocaleUtils{
         // https://cs.chromium.org/chromium/src/third_party/hunspell_dictionaries/
         public static IEnumerable<Item> SpellCheckLanguages { get; } = new List<string>{
             "af-ZA", "bg-BG", "ca-ES", "cs-CZ", "da-DK", "de-DE",
@@ -28,33 +28,13 @@ 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; }
+            public CultureInfo Info { get; }
 
-            private string Name => info?.NativeName ?? Code;
+            public Item(string code, string alt = null){
-
-            private readonly CultureInfo? info;
-
-            public Item(string code, string? alt = null){
                 this.Code = code;
-
+                this.Info = CultureInfo.GetCultureInfo(alt ?? code);
-                try{
-                    this.info = CultureInfo.GetCultureInfo(alt ?? code);
-                }catch(CultureNotFoundException){
-                    // ignore
-                }
             }
 
             public override bool Equals(object obj){
@@ -66,16 +46,12 @@ namespace TweetLib.Core.Utils{
             }
 
             public override string ToString(){
-                if (info == null){
+                string capitalizedName = Info.TextInfo.ToTitleCase(Info.NativeName);
-                    return Code;
+                return Info.DisplayName == Info.NativeName ? capitalizedName : $"{capitalizedName}, {Info.DisplayName}";
-                }
-
-                string capitalizedName = info.TextInfo.ToTitleCase(info.NativeName);
-                return info.DisplayName == info.NativeName ? capitalizedName : $"{capitalizedName}, {info.DisplayName}";
             }
 
             public int CompareTo(Item other){
-                return string.Compare(Name, other.Name, false, CultureInfo.InvariantCulture);
+                return string.Compare(Info.NativeName, other.Info.NativeName, false, CultureInfo.InvariantCulture);
             }
         }
     }

Core/Utils/StringUtils.cs

@@ -2,24 +2,10 @@
 using System.Linq;
 using System.Text.RegularExpressions;
 
-namespace TweetLib.Core.Utils{
+namespace TweetDuck.Core.Utils{
-    public static class StringUtils{
+    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);
-
-            if (index == -1){
-                return null;
-            }
-
-            return (str.Substring(0, index), str.Substring(index + 1));
-        }
-
         public static string ExtractBefore(string str, char search, int startIndex = 0){
             int index = str.IndexOf(search, startIndex);
             return index == -1 ? str : str.Substring(0, index);

Core/Utils/TwitterUtils.cs

@@ -2,33 +2,83 @@
 using CefSharp;
 using System.Drawing;
 using System.IO;
+using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using TweetDuck.Core.Management;
 using TweetDuck.Core.Other;
 using TweetDuck.Data;
 using System.Linq;
-using System.Net;
 using System.Threading.Tasks;
-using TweetLib.Core.Features.Twitter;
-using TweetLib.Core.Utils;
 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 readonly string[] ValidImageExtensions = {
+            ".jpg", ".jpeg", ".png", ".gif"
+        };
+
+        public enum ImageQuality{
+            Default, Orig
+        }
+
+        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");
+        }
+
+        private static string ExtractMediaBaseLink(string url){
+            int slash = url.LastIndexOf('/');
+            return slash == -1 ? url : StringUtils.ExtractBefore(url, ':', slash);
+        }
+
+        public static string GetMediaLink(string url, ImageQuality quality){
+            if (quality == ImageQuality.Orig){
+                string result = ExtractMediaBaseLink(url);
+
+                if (url.Contains("//ton.twitter.com/") && url.Contains("/ton/data/dm/")){
+                    result += ":large";
+                }
+                else if (result != url || url.Contains("//pbs.twimg.com/media/")){
+                    result += ":orig";
+                }
+
+                return result;
+            }
+            else{
+                return url;
+            }
+        }
+
+        public static string GetImageFileName(string url){
+            return BrowserUtils.GetFileNameFromUrl(ExtractMediaBaseLink(url));
+        }
+
         public static void ViewImage(string url, ImageQuality quality){
-            static void ViewImageInternal(string path){
+            void ViewImageInternal(string path){
                 string ext = Path.GetExtension(path);
 
-                if (ImageUrl.ValidExtensions.Contains(ext)){
+                if (ValidImageExtensions.Contains(ext)){
                     WindowsUtils.OpenAssociatedProgram(path);
                 }
                 else{
@@ -36,13 +86,13 @@ namespace TweetDuck.Core.Utils{
                 }
             }
 
-            string file = Path.Combine(BrowserCache.CacheFolder, TwitterUrls.GetImageFileName(url) ?? Path.GetRandomFileName());
+            string file = Path.Combine(BrowserCache.CacheFolder, GetImageFileName(url) ?? Path.GetRandomFileName());
             
-            if (FileUtils.FileExistsAndNotEmpty(file)){
+            if (WindowsUtils.FileExistsAndNotEmpty(file)){
                 ViewImageInternal(file);
             }
             else{
-                DownloadFileAuth(TwitterUrls.GetMediaLink(url, quality), file, () => {
+                DownloadFileAuth(GetMediaLink(url, quality), file, () => {
                     ViewImageInternal(file);
                 }, ex => {
                     FormMessage.Error("Image Download", "An error occurred while downloading the image: "+ex.Message, FormMessage.OK);
@@ -59,10 +109,10 @@ namespace TweetDuck.Core.Utils{
                 return;
             }
 
-            string firstImageLink = TwitterUrls.GetMediaLink(urls[0], quality);
+            string firstImageLink = GetMediaLink(urls[0], quality);
             int qualityIndex = firstImageLink.IndexOf(':', firstImageLink.LastIndexOf('/'));
 
-            string filename = TwitterUrls.GetImageFileName(firstImageLink);
+            string filename = GetImageFileName(firstImageLink);
             string ext = Path.GetExtension(filename); // includes dot
             
             using(SaveFileDialog dialog = new SaveFileDialog{
@@ -73,7 +123,7 @@ namespace TweetDuck.Core.Utils{
                 Filter = (urls.Length == 1 ? "Image" : "Images")+(string.IsNullOrEmpty(ext) ? " (unknown)|*.*" : $" (*{ext})|*{ext}")
             }){
                 if (dialog.ShowDialog() == DialogResult.OK){
-                    static void OnFailure(Exception ex){
+                    void OnFailure(Exception ex){
                         FormMessage.Error("Image Download", "An error occurred while downloading the image: "+ex.Message, FormMessage.OK);
                     }
 
@@ -85,7 +135,7 @@ namespace TweetDuck.Core.Utils{
                         string pathExt = Path.GetExtension(dialog.FileName);
 
                         for(int index = 0; index < urls.Length; index++){
-                            DownloadFileAuth(TwitterUrls.GetMediaLink(urls[index], quality), $"{pathBase} {index + 1}{pathExt}", null, OnFailure);
+                            DownloadFileAuth(GetMediaLink(urls[index], quality), $"{pathBase} {index+1}{pathExt}", null, OnFailure);
                         }
                     }
                 }
@@ -93,7 +143,7 @@ namespace TweetDuck.Core.Utils{
         }
 
         public static void DownloadVideo(string url, string username){
-            string filename = TwitterUrls.GetFileNameFromUrl(url);
+            string filename = BrowserUtils.GetFileNameFromUrl(url);
             string ext = Path.GetExtension(filename);
 
             using(SaveFileDialog dialog = new SaveFileDialog{
@@ -128,10 +178,7 @@ namespace TweetDuck.Core.Utils{
                         }
                     }
 
-                    WebClient client = WebUtils.NewClient(BrowserUtils.UserAgentChrome);
+                    BrowserUtils.DownloadFileAsync(url, target, cookieStr, onSuccess, onFailure);
-                    client.Headers[HttpRequestHeader.Cookie] = cookieStr;
-                    client.DownloadFileCompleted += WebUtils.FileDownloadCallback(target, onSuccess, onFailure);
-                    client.DownloadFileAsync(new Uri(url), target);
                 }, scheduler);
             }
         }

Core/Utils/WindowsUtils.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
+using System.Net;
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
 using System.Threading;
@@ -11,17 +12,66 @@ 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 bool OSVersionEquals(int major, int minor){
+        private static readonly bool IsWindows8OrNewer;
+        private static bool HasMicrosoftBeenBroughtTo2008Yet;
+
+        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;
-            return ver.Major == major && ver.Minor == minor;
+            IsWindows8OrNewer = ver.Major == 6 && ver.Minor == 2; // windows 8/10
+
+            ShouldAvoidToolWindow = IsWindows8OrNewer;
+        }
+        
+        public static void EnsureTLS12(){
+            if (!HasMicrosoftBeenBroughtTo2008Yet){
+                ServicePointManager.SecurityProtocol |= SecurityProtocolType.Tls12;
+                ServicePointManager.SecurityProtocol &= ~(SecurityProtocolType.Ssl3 | SecurityProtocolType.Tls | SecurityProtocolType.Tls11);
+                HasMicrosoftBeenBroughtTo2008Yet = true;
+            }
+        }
+
+        public static void CreateDirectoryForFile(string file){
+            string dir = Path.GetDirectoryName(file);
+
+            if (dir == null){
+                throw new ArgumentException("Invalid file path: "+file);
+            }
+            else if (dir.Length > 0){
+                Directory.CreateDirectory(dir);
+            }
+        }
+
+        public static bool CheckFolderWritePermission(string path){
+            string testFile = Path.Combine(path, ".test");
+
+            try{
+                Directory.CreateDirectory(path);
+
+                using(File.Create(testFile)){}
+                File.Delete(testFile);
+                return true;
+            }catch{
+                return false;
+            }
+        }
+
+        public static bool FileExistsAndNotEmpty(string path){
+            try{
+                return new FileInfo(path).Length > 0;
+            }catch{
+                return false;
+            }
         }
 
         public static bool OpenAssociatedProgram(string file, string arguments = "", bool runElevated = false){
@@ -107,18 +157,16 @@ namespace TweetDuck.Core.Utils{
         }
 
         public static IEnumerable<Browser> FindInstalledBrowsers(){
-            static IEnumerable<Browser> ReadBrowsersFromKey(RegistryHive hive){
+            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;
                             }
@@ -137,6 +185,8 @@ namespace TweetDuck.Core.Utils{
                             yield return new Browser(browserName, browserPath);
                         }
                     }
+                }
+            }
 
             HashSet<Browser> browsers = new HashSet<Browser>();
             

Data/CombinedFileStream.cs

@@ -1,11 +1,11 @@
 using System;
 using System.IO;
 using System.Text;
-using TweetLib.Core.Utils;
+using TweetDuck.Core.Utils;
 
-namespace TweetLib.Core.Data{
+namespace TweetDuck.Data{
-    public sealed class CombinedFileStream : IDisposable{
+    sealed class CombinedFileStream : IDisposable{
-        private const char KeySeparator = '|';
+        public const char KeySeparator = '|';
 
         private readonly Stream stream;
 
@@ -45,7 +45,7 @@ namespace TweetLib.Core.Data{
             stream.Write(contents, 0, contents.Length);
         }
 
-        public Entry? ReadFile(){
+        public Entry ReadFile(){
             int nameLength = stream.ReadByte();
 
             if (nameLength == -1){
@@ -64,7 +64,7 @@ namespace TweetLib.Core.Data{
             return new Entry(Encoding.UTF8.GetString(name), contents);
         }
 
-        public string? SkipFile(){
+        public string SkipFile(){
             int nameLength = stream.ReadByte();
 
             if (nameLength == -1){
@@ -120,7 +120,7 @@ namespace TweetLib.Core.Data{
 
             public void WriteToFile(string path, bool createDirectory){
                 if (createDirectory){
-                    FileUtils.CreateDirectoryForFile(path);
+                    WindowsUtils.CreateDirectoryForFile(path);
                 }
 
                 File.WriteAllBytes(path, contents);

Data/CommandLineArgs.cs

@@ -2,8 +2,8 @@
 using System.Text;
 using System.Text.RegularExpressions;
 
-namespace TweetLib.Core.Collections{
+namespace TweetDuck.Data{
-    public sealed class CommandLineArgs{
+    sealed class CommandLineArgs{
         public static CommandLineArgs FromStringArray(char entryChar, string[] array){
             CommandLineArgs args = new CommandLineArgs();
             ReadStringArray(entryChar, array, args);
@@ -84,8 +84,12 @@ namespace TweetLib.Core.Collections{
             values[key.ToLower()] = value;
         }
 
-        public string? GetValue(string key){
+        public bool HasValue(string key){
-            return values.TryGetValue(key.ToLower(), out string val) ? val : null;
+            return values.ContainsKey(key.ToLower());
+        }
+
+        public string GetValue(string key, string defaultValue){
+            return values.TryGetValue(key.ToLower(), out string val) ? val : defaultValue;
         }
 
         public void RemoveValue(string key){
@@ -99,7 +103,7 @@ namespace TweetLib.Core.Collections{
                 copy.AddFlag(flag);
             }
 
-            foreach(var kvp in values){
+            foreach(KeyValuePair<string, string> kvp in values){
                 copy.SetValue(kvp.Key, kvp.Value);
             }
 
@@ -111,7 +115,7 @@ namespace TweetLib.Core.Collections{
                 target[flag] = "1";
             }
 
-            foreach(var kvp in values){
+            foreach(KeyValuePair<string, string> kvp in values){
                 target[kvp.Key] = kvp.Value;
             }
         }
@@ -123,7 +127,7 @@ namespace TweetLib.Core.Collections{
                 build.Append(flag).Append(' ');
             }
 
-            foreach(var kvp in values){
+            foreach(KeyValuePair<string, string> kvp in values){
                 build.Append(kvp.Key).Append(" \"").Append(kvp.Value).Append("\" ");
             }
 

Data/InjectedHTML.cs

@@ -1,7 +1,7 @@
 using System;
 
-namespace TweetLib.Core.Data{
+namespace TweetDuck.Data{
-    public sealed class InjectedHTML{
+    sealed class InjectedHTML{
         public enum Position{
             Before, After
         }

Data/Result.cs

@@ -1,14 +1,14 @@
 using System;
 
-namespace TweetLib.Core.Data{
+namespace TweetDuck.Data{
-    public sealed class Result<T>{
+    sealed class Result<T>{
         public bool HasValue => exception == null;
 
         public T Value => HasValue ? value : throw new InvalidOperationException("Requested value from a failed result.");
         public Exception Exception => exception ?? throw new InvalidOperationException("Requested exception from a successful result.");
 
         private readonly T value;
-        private readonly Exception? exception;
+        private readonly Exception exception;
 
         public Result(T value){
             this.value = value;
@@ -16,7 +16,7 @@ namespace TweetLib.Core.Data{
         }
 
         public Result(Exception exception){
-            this.value = default!;
+            this.value = default(T);
             this.exception = exception ?? throw new ArgumentNullException(nameof(exception));
         }
 
@@ -25,12 +25,12 @@ namespace TweetLib.Core.Data{
                 onSuccess(value);
             }
             else{
-                onException(exception!);
+                onException(exception);
             }
         }
 
         public Result<R> Select<R>(Func<T, R> map){
-            return HasValue ? new Result<R>(map(value)) : new Result<R>(exception!);
+            return HasValue ? new Result<R>(map(value)) : new Result<R>(exception);
         }
     }
 }

Data/Serialization/FileSerializer.cs

@@ -4,11 +4,10 @@ using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text;
-using TweetLib.Core.Serialization.Converters;
+using TweetDuck.Core.Utils;
-using TweetLib.Core.Utils;
 
-namespace TweetLib.Core.Serialization{
+namespace TweetDuck.Data.Serialization{
-    public sealed class FileSerializer<T>{
+    sealed class FileSerializer<T>{
         private const string NewLineReal = "\r\n";
         private const string NewLineCustom = "\r~\n";
 
@@ -50,6 +49,8 @@ namespace TweetLib.Core.Serialization{
             return build.Append(data.Substring(index)).ToString();
         }
 
+        private static readonly ITypeConverter BasicSerializerObj = new BasicTypeConverter();
+        
         private readonly Dictionary<string, PropertyInfo> props;
         private readonly Dictionary<Type, ITypeConverter> converters;
 
@@ -65,7 +66,7 @@ namespace TweetLib.Core.Serialization{
         public void Write(string file, T obj){
             LinkedList<string> errors = new LinkedList<string>();
 
-            FileUtils.CreateDirectoryForFile(file);
+            WindowsUtils.CreateDirectoryForFile(file);
 
             using(StreamWriter writer = new StreamWriter(new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.None))){
                 foreach(KeyValuePair<string, PropertyInfo> prop in props){
@@ -73,10 +74,10 @@ namespace TweetLib.Core.Serialization{
                     object value = prop.Value.GetValue(obj);
                     
                     if (!converters.TryGetValue(type, out ITypeConverter serializer)){
-                        serializer = ClrTypeConverter.Instance;
+                        serializer = BasicSerializerObj;
                     }
 
-                    if (serializer.TryWriteType(type, value, out string? converted)){
+                    if (serializer.TryWriteType(type, value, out string converted)){
                         if (converted != null){
                             writer.Write(prop.Key);
                             writer.Write(' ');
@@ -141,10 +142,10 @@ namespace TweetLib.Core.Serialization{
 
                 if (props.TryGetValue(property, out PropertyInfo info)){
                     if (!converters.TryGetValue(info.PropertyType, out ITypeConverter serializer)){
-                        serializer = ClrTypeConverter.Instance;
+                        serializer = BasicSerializerObj;
                     }
 
-                    if (serializer.TryReadType(info.PropertyType, value, out object? converted)){
+                    if (serializer.TryReadType(info.PropertyType, value, out object converted)){
                         info.SetValue(obj, converted);
                     }
                     else{
@@ -164,5 +165,53 @@ namespace TweetLib.Core.Serialization{
             }catch(FileNotFoundException){
             }catch(DirectoryNotFoundException){}
         }
+
+        private sealed class BasicTypeConverter : ITypeConverter{
+            bool ITypeConverter.TryWriteType(Type type, object value, out string converted){
+                switch(Type.GetTypeCode(type)){
+                    case TypeCode.Boolean:
+                        converted = value.ToString();
+                        return true;
+
+                    case TypeCode.Int32:
+                        converted = ((int)value).ToString(); // cast required for enums
+                        return true;
+
+                    case TypeCode.String:
+                        converted = value?.ToString();
+                        return true;
+
+                    default:
+                        converted = null;
+                        return false;
+                }
+            }
+
+            bool ITypeConverter.TryReadType(Type type, string value, out object converted){
+                switch(Type.GetTypeCode(type)){
+                    case TypeCode.Boolean:
+                        if (bool.TryParse(value, out bool b)){
+                            converted = b;
+                            return true;
+                        }
+                        else goto default;
+
+                    case TypeCode.Int32:
+                        if (int.TryParse(value, out int i)){
+                            converted = i;
+                            return true;
+                        }
+                        else goto default;
+
+                    case TypeCode.String:
+                        converted = value;
+                        return true;
+
+                    default:
+                        converted = null;
+                        return false;
+                }
+            }
+        }
     }
 }

Data/Serialization/ITypeConverter.cs

@@ -0,0 +1,8 @@
+using System;
+
+namespace TweetDuck.Data.Serialization{
+    interface ITypeConverter{
+        bool TryWriteType(Type type, object value, out string converted);
+        bool TryReadType(Type type, string value, out object converted);
+    }
+}

Data/Serialization/SerializationSoftException.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 
-namespace TweetLib.Core.Serialization{
+namespace TweetDuck.Data.Serialization{
-    public sealed class SerializationSoftException : Exception{
+    sealed class SerializationSoftException : Exception{
         public IList<string> Errors { get; }
 
         public SerializationSoftException(IList<string> errors) : base(string.Join(Environment.NewLine, errors)){

Data/Serialization/SingleTypeConverter.cs

@@ -1,11 +1,11 @@
 using System;
 
-namespace TweetLib.Core.Serialization.Converters{
+namespace TweetDuck.Data.Serialization{
-    public sealed class SingleTypeConverter<T> : ITypeConverter{
+    sealed class SingleTypeConverter<T> : ITypeConverter{
         public Func<T, string> ConvertToString { get; set; }
         public Func<string, T> ConvertToObject { get; set; }
 
-        bool ITypeConverter.TryWriteType(Type type, object value, out string? converted){
+        bool ITypeConverter.TryWriteType(Type type, object value, out string converted){
             try{
                 converted = ConvertToString((T)value);
                 return true;
@@ -15,7 +15,7 @@ namespace TweetLib.Core.Serialization.Converters{
             }
         }
 
-        bool ITypeConverter.TryReadType(Type type, string value, out object? converted){
+        bool ITypeConverter.TryReadType(Type type, string value, out object converted){
             try{
                 converted = ConvertToObject(value);
                 return true;

Data/TwoKeyDictionary.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace TweetLib.Core.Collections{
+namespace TweetDuck.Data{
-    public sealed class TwoKeyDictionary<K1, K2, V>{
+    sealed class TwoKeyDictionary<K1, K2, V>{
         private readonly Dictionary<K1, Dictionary<K2, V>> dict;
         private readonly int innerCapacity;
 
@@ -85,8 +85,7 @@ namespace TweetLib.Core.Collections{
 
                 return true;
             }
-
+            else return false;
-            return false;
         }
 
         public bool TryGetValue(K1 outerKey, K2 innerKey, out V value){
@@ -94,7 +93,7 @@ namespace TweetLib.Core.Collections{
                 return innerDict.TryGetValue(innerKey, out value);
             }
             else{
-                value = default!;
+                value = default(V);
                 return false;
             }
         }

Data/WindowState.cs

@@ -1,8 +1,8 @@
 using System.Drawing;
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
-using TweetLib.Core.Serialization.Converters;
+using TweetDuck.Core.Utils;
-using TweetLib.Core.Utils;
+using TweetDuck.Data.Serialization;
 
 namespace TweetDuck.Data{
     sealed class WindowState{

Impl/LockHandler.cs

@@ -1,58 +0,0 @@
-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

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

Plugins/Controls/PluginControl.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDuck.Plugins {
+namespace TweetDuck.Plugins.Controls {
     partial class PluginControl {
         /// <summary> 
         /// Required designer variable.

Plugins/Controls/PluginControl.cs

@@ -3,10 +3,9 @@ using System.Drawing;
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Utils;
-using TweetLib.Core.Features.Plugins;
+using TweetDuck.Plugins.Enums;
-using TweetLib.Core.Features.Plugins.Enums;
 
-namespace TweetDuck.Plugins{
+namespace TweetDuck.Plugins.Controls{
     sealed partial class PluginControl : UserControl{
         private readonly PluginManager pluginManager;
         private readonly Plugin plugin;
@@ -64,11 +63,11 @@ namespace TweetDuck.Plugins{
             
             int requiredLines = Math.Max(descriptionLines, 1+(string.IsNullOrEmpty(labelVersion.Text) ? 0 : 1)+(isConfigurable ? 1 : 0));
             
-            nextHeight = requiredLines switch{
+            switch(requiredLines){
-                1 => MaximumSize.Height - 2 * (font.Height - 1),
+                case 1: nextHeight = MaximumSize.Height-2*(font.Height-1); break;
-                2 => MaximumSize.Height - 1 * (font.Height - 1),
+                case 2: nextHeight = MaximumSize.Height-(font.Height-1); break;
-                _ => MaximumSize.Height
+                default: nextHeight = MaximumSize.Height; break;
-            };
+            }
 
             if (nextHeight != Height){
                 timerLayout.Start();

Plugins/Controls/PluginListFlowLayout.cs

@@ -1,8 +1,13 @@
 using System.Windows.Forms;
 using TweetDuck.Core.Utils;
 
-namespace TweetDuck.Core.Controls{
+namespace TweetDuck.Plugins.Controls{
-    sealed class FlowLayoutPanelNoHScroll : FlowLayoutPanel{
+    sealed class PluginListFlowLayout : 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

Plugins/Enums/PluginEnvironment.cs

@@ -0,0 +1,88 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
+using System.Linq;
+
+namespace TweetDuck.Plugins.Enums{
+    [Flags]
+    enum PluginEnvironment{
+        None = 0,
+        Browser = 1,
+        Notification = 2
+    }
+
+    static class PluginEnvironmentExtensions{
+        public static IEnumerable<PluginEnvironment> Values{
+            get{
+                yield return PluginEnvironment.Browser;
+                yield return PluginEnvironment.Notification;
+            }
+        }
+
+        public static bool IncludesDisabledPlugins(this PluginEnvironment environment){
+            return environment == PluginEnvironment.Browser;
+        }
+
+        public static string GetPluginScriptFile(this PluginEnvironment environment){
+            switch(environment){
+                case PluginEnvironment.Browser: return "browser.js";
+                case PluginEnvironment.Notification: return "notification.js";
+                default: return null;
+            }
+        }
+
+        public static string GetPluginScriptVariables(this PluginEnvironment environment){
+            switch(environment){
+                case PluginEnvironment.Browser: return "$,$TD,$TDP,TD";
+                case PluginEnvironment.Notification: return "$TD,$TDP";
+                default: return string.Empty;
+            }
+        }
+
+        public static IReadOnlyDictionary<PluginEnvironment, T> Map<T>(T forNone, T forBrowser, T forNotification){
+            return new PluginEnvironmentDictionary<T>(forNone, forBrowser, forNotification);
+        }
+
+        [SuppressMessage("ReSharper", "MemberHidesStaticFromOuterClass")]
+        private sealed class PluginEnvironmentDictionary<T> : IReadOnlyDictionary<PluginEnvironment, T>{
+            private const int TotalKeys = 3;
+
+            public IEnumerable<PluginEnvironment> Keys => Enum.GetValues(typeof(PluginEnvironment)).Cast<PluginEnvironment>();
+            public IEnumerable<T> Values => data;
+            public int Count => TotalKeys;
+
+            public T this[PluginEnvironment key] => data[(int)key];
+
+            private readonly T[] data;
+
+            public PluginEnvironmentDictionary(T forNone, T forBrowser, T forNotification){
+                this.data = new T[TotalKeys];
+                this.data[(int)PluginEnvironment.None] = forNone;
+                this.data[(int)PluginEnvironment.Browser] = forBrowser;
+                this.data[(int)PluginEnvironment.Notification] = forNotification;
+            }
+
+            public bool ContainsKey(PluginEnvironment key){
+                return key >= 0 && (int)key < TotalKeys;
+            }
+
+            public bool TryGetValue(PluginEnvironment key, out T value){
+                if (ContainsKey(key)){
+                    value = this[key];
+                    return true;
+                }
+                else{
+                    value = default(T);
+                    return false;
+                }
+            }
+
+            public IEnumerator<KeyValuePair<PluginEnvironment, T>> GetEnumerator(){
+                return Keys.Select(key => new KeyValuePair<PluginEnvironment, T>(key, this[key])).GetEnumerator();
+            }
+
+            IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
+        }
+    }
+}

Plugins/Enums/PluginFolder.cs

@@ -0,0 +1,5 @@
+namespace TweetDuck.Plugins.Enums{
+    enum PluginFolder{
+        Root, Data
+    }
+}

Plugins/Enums/PluginGroup.cs

@@ -0,0 +1,23 @@
+namespace TweetDuck.Plugins.Enums{
+    enum PluginGroup{
+        Official, Custom
+    }
+
+    static class PluginGroupExtensions{
+        public static string GetIdentifierPrefix(this PluginGroup group){
+            switch(group){
+                case PluginGroup.Official: return "official/";
+                case PluginGroup.Custom: return "custom/";
+                default: return "unknown/";
+            }
+        }
+
+        public static string GetIdentifierPrefixShort(this PluginGroup group){
+            switch(group){
+                case PluginGroup.Official: return "o/";
+                case PluginGroup.Custom: return "c/";
+                default: return "?/";
+            }
+        }
+    }
+}

Plugins/Events/PluginChangedStateEventArgs.cs

@@ -1,7 +1,7 @@
 using System;
 
-namespace TweetLib.Core.Features.Plugins.Events{
+namespace TweetDuck.Plugins.Events{
-    public sealed class PluginChangedStateEventArgs : EventArgs{
+    sealed class PluginChangedStateEventArgs : EventArgs{
         public Plugin Plugin { get; }
         public bool IsEnabled { get; }
 

Plugins/Events/PluginErrorEventArgs.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Collections.Generic;
 
-namespace TweetLib.Core.Features.Plugins.Events{
+namespace TweetDuck.Plugins.Events{
-    public sealed class PluginErrorEventArgs : EventArgs{
+    sealed class PluginErrorEventArgs : EventArgs{
         public bool HasErrors => Errors.Count > 0;
 
         public IList<string> Errors { get; }

Plugins/IPluginConfig.cs

@@ -1,13 +1,12 @@
 using System;
 using System.Collections.Generic;
-using TweetLib.Core.Features.Plugins.Events;
+using TweetDuck.Plugins.Events;
-
-namespace TweetLib.Core.Features.Plugins.Config{
-    public interface IPluginConfig{
-        event EventHandler<PluginChangedStateEventArgs> PluginChangedState;
 
+namespace TweetDuck.Plugins{
+    interface IPluginConfig{
         IEnumerable<string> DisabledPlugins { get; }
-        void Reset(IEnumerable<string> newDisabledPlugins);
+
+        event EventHandler<PluginChangedStateEventArgs> PluginChangedState;
         
         void SetEnabled(Plugin plugin, bool enabled);
         bool IsEnabled(Plugin plugin);

Plugins/Plugin.cs

@@ -1,15 +1,14 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
+using TweetDuck.Plugins.Enums;
-using TweetLib.Core.Features.Plugins.Enums;
 
-namespace TweetLib.Core.Features.Plugins{
+namespace TweetDuck.Plugins{
-    public sealed class Plugin{
+    sealed class Plugin{
-        private static readonly Version AppVersion = new Version(Lib.VersionTag);
+        private static readonly Version AppVersion = new Version(Program.VersionTag);
 
         public string Identifier { get; }
         public PluginGroup Group { get; }
+        public PluginEnvironment Environments { get; }
 
         public string Name { get; }
         public string Description { get; }
@@ -40,15 +39,14 @@ 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;
@@ -62,13 +60,9 @@ 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.Contains(environment)){
+            if (Environments.HasFlag(environment)){
-                string? file = environment.GetPluginScriptFile();
+                string file = environment.GetPluginScriptFile();
                 return file != null ? Path.Combine(pathRoot, file) : string.Empty;
             }
             else{
@@ -77,11 +71,11 @@ namespace TweetLib.Core.Features.Plugins{
         }
 
         public string GetPluginFolder(PluginFolder folder){
-            return folder switch{
+            switch(folder){
-                PluginFolder.Root => pathRoot,
+                case PluginFolder.Root: return pathRoot;
-                PluginFolder.Data => pathData,
+                case PluginFolder.Data: return pathData;
-                _                 => string.Empty
+                default: return string.Empty;
-            };
+            }
         }
 
         public string GetFullPathIfSafe(PluginFolder folder, string relativePath){
@@ -130,7 +124,7 @@ namespace TweetLib.Core.Features.Plugins{
         public sealed class Builder{
             private static readonly Version DefaultRequiredVersion = new Version(0, 0, 0, 0);
 
-            public string Name             { get; set; } = string.Empty;
+            public string Name             { get; set; }
             public string Description      { get; set; } = string.Empty;
             public string Author           { get; set; } = "(anonymous)";
             public string Version          { get; set; } = string.Empty;
@@ -139,7 +133,7 @@ namespace TweetLib.Core.Features.Plugins{
             public string ConfigDefault    { get; set; } = string.Empty;
             public Version RequiredVersion { get; set; } = DefaultRequiredVersion;
 
-            public ISet<PluginEnvironment> Environments { get; } = new HashSet<PluginEnvironment>();
+            public PluginEnvironment Environments { get; private set; } = PluginEnvironment.None;
 
             private readonly PluginGroup group;
             private readonly string pathRoot;
@@ -154,7 +148,7 @@ namespace TweetLib.Core.Features.Plugins{
             }
 
             public void AddEnvironment(PluginEnvironment environment){
-                Environments.Add(environment);
+                this.Environments |= environment;
             }
 
             public Plugin BuildAndSetup(){
@@ -164,7 +158,7 @@ namespace TweetLib.Core.Features.Plugins{
                     throw new InvalidOperationException("Plugin is missing a name in the .meta file");
                 }
 
-                if (!PluginEnvironments.All.Any(plugin.HasEnvironment)){
+                if (plugin.Environments == PluginEnvironment.None){
                     throw new InvalidOperationException("Plugin has no script files");
                 }
 

Plugins/PluginBridge.cs

@@ -0,0 +1,127 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using TweetDuck.Core.Utils;
+using TweetDuck.Data;
+using TweetDuck.Plugins.Enums;
+using TweetDuck.Plugins.Events;
+
+namespace TweetDuck.Plugins{
+    sealed class PluginBridge{
+        private static string SanitizeCacheKey(string key){
+            return key.Replace('\\', '/').Trim();
+        }
+
+        private readonly PluginManager manager;
+        private readonly TwoKeyDictionary<int, string, string> fileCache = new TwoKeyDictionary<int, string, string>(4, 2);
+        private readonly TwoKeyDictionary<int, string, InjectedHTML> notificationInjections = new TwoKeyDictionary<int, string, InjectedHTML>(4, 1);
+
+        public IEnumerable<InjectedHTML> NotificationInjections => notificationInjections.InnerValues;
+        public HashSet<Plugin> WithConfigureFunction { get; } = new HashSet<Plugin>();
+
+        public PluginBridge(PluginManager manager){
+            this.manager = manager;
+            this.manager.Reloaded += manager_Reloaded;
+            this.manager.Config.PluginChangedState += Config_PluginChangedState;
+        }
+
+        // Event handlers
+
+        private void manager_Reloaded(object sender, PluginErrorEventArgs e){
+            fileCache.Clear();
+        }
+
+        private void Config_PluginChangedState(object sender, PluginChangedStateEventArgs e){
+            if (!e.IsEnabled){
+                int token = manager.GetTokenFromPlugin(e.Plugin);
+
+                fileCache.Remove(token);
+                notificationInjections.Remove(token);
+            }
+        }
+
+        // Utility methods
+
+        private string GetFullPathOrThrow(int token, PluginFolder folder, string path){
+            Plugin plugin = manager.GetPluginFromToken(token);
+            string fullPath = plugin == null ? string.Empty : plugin.GetFullPathIfSafe(folder, path);
+
+            if (fullPath.Length == 0){
+                switch(folder){
+                    case PluginFolder.Data: throw new ArgumentException("File path has to be relative to the plugin data folder.");
+                    case PluginFolder.Root: throw new ArgumentException("File path has to be relative to the plugin root folder.");
+                    default: throw new ArgumentException("Invalid folder type "+folder+", this is a TweetDuck error.");
+                }
+            }
+            else{
+                return fullPath;
+            }
+        }
+
+        private string ReadFileUnsafe(int token, string cacheKey, string fullPath, bool readCached){
+            cacheKey = SanitizeCacheKey(cacheKey);
+            
+            if (readCached && fileCache.TryGetValue(token, cacheKey, out string cachedContents)){
+                return cachedContents;
+            }
+
+            try{
+                return fileCache[token, cacheKey] = File.ReadAllText(fullPath, Encoding.UTF8);
+            }catch(FileNotFoundException){
+                throw new FileNotFoundException("File not found.");
+            }catch(DirectoryNotFoundException){
+                throw new DirectoryNotFoundException("Directory not found.");
+            }
+        }
+
+        // Public methods
+
+        public void WriteFile(int token, string path, string contents){
+            string fullPath = GetFullPathOrThrow(token, PluginFolder.Data, path);
+
+            WindowsUtils.CreateDirectoryForFile(fullPath);
+            File.WriteAllText(fullPath, contents, Encoding.UTF8);
+            fileCache[token, SanitizeCacheKey(path)] = contents;
+        }
+
+        public string ReadFile(int token, string path, bool cache){
+            return ReadFileUnsafe(token, path, GetFullPathOrThrow(token, PluginFolder.Data, path), cache);
+        }
+
+        public void DeleteFile(int token, string path){
+            string fullPath = GetFullPathOrThrow(token, PluginFolder.Data, path);
+
+            fileCache.Remove(token, SanitizeCacheKey(path));
+            File.Delete(fullPath);
+        }
+
+        public bool CheckFileExists(int token, string path){
+            return File.Exists(GetFullPathOrThrow(token, PluginFolder.Data, path));
+        }
+
+        public string ReadFileRoot(int token, string path){
+            return ReadFileUnsafe(token, "root*"+path, GetFullPathOrThrow(token, PluginFolder.Root, path), true);
+        }
+
+        public bool CheckFileExistsRoot(int token, string path){
+            return File.Exists(GetFullPathOrThrow(token, PluginFolder.Root, path));
+        }
+
+        public void InjectIntoNotificationsBefore(int token, string key, string search, string html){
+            notificationInjections[token, key] = new InjectedHTML(InjectedHTML.Position.Before, search, html);
+        }
+
+        public void InjectIntoNotificationsAfter(int token, string key, string search, string html){
+            notificationInjections[token, key] = new InjectedHTML(InjectedHTML.Position.After, search, html);
+        }
+
+        public void SetConfigurable(int token){
+            Plugin plugin = manager.GetPluginFromToken(token);
+
+            if (plugin != null){
+                WithConfigureFunction.Add(plugin);
+            }
+        }
+    }
+}

Plugins/PluginDispatcher.cs

@@ -1,34 +0,0 @@
-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/PluginLoader.cs

@@ -0,0 +1,70 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Text;
+using TweetDuck.Plugins.Enums;
+
+namespace TweetDuck.Plugins{
+    static class PluginLoader{
+        private static readonly string[] EndTag = { "[END]" };
+
+        public static Plugin FromFolder(string path, PluginGroup group){
+            string name = Path.GetFileName(path);
+
+            if (string.IsNullOrEmpty(name)){
+                throw new ArgumentException("Could not extract directory name from path: "+path);
+            }
+            
+            Plugin.Builder builder = new Plugin.Builder(group, name, path, Path.Combine(Program.PluginDataPath, group.GetIdentifierPrefix(), name));
+
+            foreach(string file in Directory.EnumerateFiles(path, "*.js", SearchOption.TopDirectoryOnly).Select(Path.GetFileName)){
+                builder.AddEnvironment(PluginEnvironmentExtensions.Values.FirstOrDefault(env => file.Equals(env.GetPluginScriptFile(), StringComparison.Ordinal)));
+            }
+
+            string metaFile = Path.Combine(path, ".meta");
+
+            if (!File.Exists(metaFile)){
+                throw new ArgumentException("Plugin is missing a .meta file");
+            }
+            
+            string currentTag = null, currentContents = string.Empty;
+
+            foreach(string line in File.ReadAllLines(metaFile, Encoding.UTF8).Concat(EndTag).Select(line => line.TrimEnd()).Where(line => line.Length > 0)){
+                if (line[0] == '[' && line[line.Length-1] == ']'){
+                    if (currentTag != null){
+                        SetProperty(builder, currentTag, currentContents);
+                    }
+
+                    currentTag = line.Substring(1, line.Length-2).ToUpper();
+                    currentContents = string.Empty;
+
+                    if (line.Equals(EndTag[0])){
+                        break;
+                    }
+                }
+                else if (currentTag != null){
+                    currentContents = currentContents.Length == 0 ? line : currentContents+Environment.NewLine+line;
+                }
+                else{
+                    throw new FormatException("Missing metadata tag before value: "+line);
+                }
+            }
+
+            return builder.BuildAndSetup();
+        }
+
+        private static void SetProperty(Plugin.Builder builder, string tag, string value){
+            switch(tag){
+                case "NAME":          builder.Name = value; break;
+                case "DESCRIPTION":   builder.Description = value; break;
+                case "AUTHOR":        builder.Author = value; break;
+                case "VERSION":       builder.Version = value; break;
+                case "WEBSITE":       builder.Website = value; break;
+                case "CONFIGFILE":    builder.ConfigFile = value; break;
+                case "CONFIGDEFAULT": builder.ConfigDefault = value; break;
+                case "REQUIRES":      builder.RequiredVersion = Version.TryParse(value, out Version version) ? version : throw new FormatException("Invalid required minimum version: "+value); break;
+                default: throw new FormatException("Invalid metadata tag: "+tag);
+            }
+        }
+    }
+}

Plugins/PluginManager.cs

@@ -0,0 +1,183 @@
+using CefSharp;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
+using System.Linq;
+using System.Windows.Forms;
+using TweetDuck.Core.Utils;
+using TweetDuck.Data;
+using TweetDuck.Plugins.Enums;
+using TweetDuck.Plugins.Events;
+using TweetDuck.Resources;
+
+namespace TweetDuck.Plugins{
+    sealed class PluginManager{
+        private static readonly IReadOnlyDictionary<PluginEnvironment, string> PluginSetupScriptNames = PluginEnvironmentExtensions.Map(null, "plugins.browser.js", "plugins.notification.js");
+
+        public string PathOfficialPlugins => Path.Combine(rootPath, "official");
+        public string PathCustomPlugins => Path.Combine(rootPath, "user");
+
+        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 rootPath;
+        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(IPluginConfig config, string rootPath){
+            this.Config = config;
+            this.Config.PluginChangedState += Config_PluginChangedState;
+
+            this.rootPath = rootPath;
+            this.bridge = new PluginBridge(this);
+        }
+
+        public void Register(IWebBrowser browser, PluginEnvironment environment, Control sync, bool asMainBrowser = false){
+            browser.FrameLoadEnd += (sender, args) => {
+                IFrame frame = args.Frame;
+
+                if (frame.IsMain && TwitterUtils.IsTweetDeckWebsite(frame)){
+                    ExecutePlugins(frame, environment, sync);
+                }
+            };
+
+            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>(2);
+
+            IEnumerable<Plugin> LoadPluginsFrom(string path, PluginGroup group){
+                if (!Directory.Exists(path)){
+                    yield break;
+                }
+
+                foreach(string fullDir in Directory.EnumerateDirectories(path, "*", SearchOption.TopDirectoryOnly)){
+                    Plugin plugin;
+
+                    try{
+                        plugin = PluginLoader.FromFolder(fullDir, group);
+                    }catch(Exception e){
+                        loadErrors.Add(group.GetIdentifierPrefix()+Path.GetFileName(fullDir)+": "+e.Message);
+                        continue;
+                    }
+
+                    yield return plugin;
+                }
+            }
+            
+            plugins.UnionWith(LoadPluginsFrom(PathOfficialPlugins, PluginGroup.Official));
+            plugins.UnionWith(LoadPluginsFrom(PathCustomPlugins, PluginGroup.Custom));
+
+            Reloaded?.Invoke(this, new PluginErrorEventArgs(loadErrors));
+        }
+
+        private void ExecutePlugins(IFrame frame, PluginEnvironment environment, Control sync){
+            if (!HasAnyPlugin(environment) || !ScriptLoader.ExecuteFile(frame, PluginSetupScriptNames[environment], 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);
+            }
+
+            Executed?.Invoke(this, new PluginErrorEventArgs(failedPlugins));
+        }
+    }
+}

Plugins/PluginScriptGenerator.cs

@@ -1,11 +1,10 @@
 using System.Linq;
-using TweetLib.Core.Features.Plugins.Config;
+using TweetDuck.Plugins.Enums;
-using TweetLib.Core.Features.Plugins.Enums;
 
-namespace TweetLib.Core.Features.Plugins{
+namespace TweetDuck.Plugins{
-    public static class PluginScriptGenerator{
+    static class PluginScriptGenerator{
         public static string GenerateConfig(IPluginConfig config){
-            return "window.TD_PLUGINS.disabled = [" + string.Join(",", config.DisabledPlugins.Select(id => '"' + id + '"')) + "]";
+            return "window.TD_PLUGINS.disabled = ["+string.Join(",", config.DisabledPlugins.Select(id => $"\"{id}\""))+"]";
         }
 
         public static string GeneratePlugin(string pluginIdentifier, string pluginContents, int pluginToken, PluginEnvironment environment){

Program.cs

@@ -2,8 +2,10 @@ using CefSharp;
 using CefSharp.WinForms;
 using System;
 using System.Diagnostics;
+using System.Globalization;
 using System.IO;
 using System.Linq;
+using System.Threading;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
 using TweetDuck.Core;
@@ -12,20 +14,15 @@ using TweetDuck.Core.Handling.General;
 using TweetDuck.Core.Other;
 using TweetDuck.Core.Management;
 using TweetDuck.Core.Utils;
-using TweetDuck.Impl;
+using TweetDuck.Data;
-using TweetDuck.Resources;
-using TweetLib.Core;
-using TweetLib.Core.Application.Helpers;
-using TweetLib.Core.Collections;
-using TweetLib.Core.Utils;
 
 namespace TweetDuck{
     static class Program{
-        public const string BrandName = Lib.BrandName;
+        public const string BrandName = "TweetDuck";
-        public const string VersionTag = Lib.VersionTag;
-
         public const string Website = "https://tweetduck.chylex.com";
 
+        public const string VersionTag = "1.17.3";
+
         public static readonly string ProgramPath = AppDomain.CurrentDomain.BaseDirectory;
         public static readonly bool IsPortable = File.Exists(Path.Combine(ProgramPath, "makeportable"));
 
@@ -51,28 +48,23 @@ namespace TweetDuck{
         private static readonly LockManager LockManager = new LockManager(Path.Combine(StoragePath, ".lock"));
         private static bool HasCleanedUp;
         
+        public static CultureInfo Culture { get; }
         public static Reporter Reporter { get; }
         public static ConfigManager Config { get; }
-        public static ScriptLoader Resources { get; }
         
         static Program(){
+            Culture = CultureInfo.CurrentCulture;
+            Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
+            CultureInfo.DefaultThreadCurrentCulture = CultureInfo.InvariantCulture;
+
+            #if DEBUG
+            CultureInfo.DefaultThreadCurrentUICulture = Thread.CurrentThread.CurrentUICulture = new CultureInfo("en-us"); // force english exceptions
+            #endif
+
             Reporter = new Reporter(ErrorLogFilePath);
             Reporter.SetupUnhandledExceptionHandler("TweetDuck Has Failed :(");
 
             Config = new ConfigManager();
-
-            #if DEBUG
-            Resources = new ScriptLoaderDebug();
-            #else
-            Resources = new ScriptLoader();
-            #endif
-
-            Lib.Initialize(new App.Builder{
-                ErrorHandler = Reporter,
-                LockHandler = new LockHandler(),
-                SystemHandler = new SystemHandler(),
-                ResourceHandler = Resources
-            });
         }
 
         [STAThread]
@@ -83,7 +75,7 @@ namespace TweetDuck{
             
             WindowRestoreMessage = NativeMethods.RegisterWindowMessage("TweetDuckRestore");
 
-            if (!FileUtils.CheckFolderWritePermission(StoragePath)){
+            if (!WindowsUtils.CheckFolderWritePermission(StoragePath)){
                 FormMessage.Warning("Permission Error", "TweetDuck does not have write permissions to the storage folder: "+StoragePath, FormMessage.OK);
                 return;
             }
@@ -107,17 +99,15 @@ namespace TweetDuck{
                 LockManager.Result lockResult = LockManager.Lock();
                 
                 if (lockResult == LockManager.Result.HasProcess){
-                    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.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.CloseLockingProcess()){
+                        if (!LockManager.CloseLockingProcess(10000, 5000)){
                             FormMessage.Error("TweetDuck Has Failed :(", "Could not close the other process.", FormMessage.OK);
                             return;
                         }
 
                         lockResult = LockManager.Lock();
                     }
-                    else{
+                    else return;
-                        return;
-                    }
                 }
 
                 if (lockResult != LockManager.Result.Success){
@@ -141,7 +131,7 @@ namespace TweetDuck{
             }
             
             try{
-                RequestHandlerBase.LoadResourceRewriteRules(Arguments.GetValue(Arguments.ArgFreeze));
+                RequestHandlerBase.LoadResourceRewriteRules(Arguments.GetValue(Arguments.ArgFreeze, null));
             }catch(Exception e){
                 FormMessage.Error("Resource Freeze", "Error parsing resource rewrite rules: "+e.Message, FormMessage.OK);
                 return;
@@ -171,7 +161,6 @@ namespace TweetDuck{
             Application.ApplicationExit += (sender, args) => ExitCleanup();
             
             FormBrowser mainForm = new FormBrowser();
-            Resources.Initialize(mainForm);
             Application.Run(mainForm);
 
             if (mainForm.UpdateInstallerPath != null){
@@ -179,7 +168,7 @@ namespace TweetDuck{
 
                 // ProgramPath has a trailing backslash
                 string updaterArgs = "/SP- /SILENT /FORCECLOSEAPPLICATIONS /UPDATEPATH=\""+ProgramPath+"\" /RUNARGS=\""+Arguments.GetCurrentForInstallerCmd()+"\""+(IsPortable ? " /PORTABLE=1" : "");
-                bool runElevated = !IsPortable || !FileUtils.CheckFolderWritePermission(ProgramPath);
+                bool runElevated = !IsPortable || !WindowsUtils.CheckFolderWritePermission(ProgramPath);
 
                 if (WindowsUtils.OpenAssociatedProgram(mainForm.UpdateInstallerPath, updaterArgs, runElevated)){
                     Application.Exit();
@@ -191,7 +180,7 @@ namespace TweetDuck{
         }
 
         private static string GetDataStoragePath(){
-            string custom = Arguments.GetValue(Arguments.ArgDataFolder);
+            string custom = Arguments.GetValue(Arguments.ArgDataFolder, null);
 
             if (custom != null && (custom.Contains(Path.DirectorySeparatorChar) || custom.Contains(Path.AltDirectorySeparatorChar))){
                 if (Path.GetInvalidPathChars().Any(custom.Contains)){

Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace TweetDuck.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {

README.md

@@ -1,28 +1,30 @@
 # Support
 
-[Follow TweetDuck on Twitter](https://twitter.com/TryMyAwesomeApp)  |  [Support via Ko-fi](https://ko-fi.com/chylex)  |  [Support via Patreon](https://www.patreon.com/chylex)
+[Follow TweetDuck on Twitter](https://twitter.com/TryMyAwesomeApp)  |  [Support via PayPal](https://paypal.me/chylex)  |  [Support via Patreon](https://www.patreon.com/chylex)
 
 # Build Instructions
 
 ### Setup
 
-The program can be built using Visual Studio 2019. Before opening the solution, please make sure you have the following workloads and components installed (optional components that are not listed can be deselected to save space):
+The program was built using Visual Studio 2017. Before opening the solution, please make sure you have the following workloads and components installed (optional components that are not listed can be deselected to save space):
 * **.NET desktop development**
-  * .NET Framework 4.7.2 SDK
+  * .NET Framework 4 – 4.6 development tools
   * F# desktop language support
 * **Desktop development with C++**
-  * MSVC v142 - VS 2019 C++ x64/x86 build tools (v14.20)
+  * VC++ 2017 latest v141 tools
 
 After opening the solution, right-click the solution and select **Restore NuGet Packages**, or manually run this command in the **Package Manager Console**:
 ```
-PM> Install-Package CefSharp.WinForms -Version 67.0.0
+PM> Install-Package CefSharp.WinForms -Version 67.0.0-pre01
 ```
 
+Note that some pre-release builds of CefSharp are not available on NuGet. To correctly restore packages in that case, open **Package Manager Settings**, and add `https://www.myget.org/F/cefsharp/api/v3/index.json` to the list of package sources.
+
 ### Debug
 
 The `Debug` configuration uses a separate data folder by default (`%LOCALAPPDATA%\TweetDuckDebug`) to avoid affecting an existing installation of TweetDuck. You can modify this by opening **TweetDuck Properties** in Visual Studio, clicking the **Debug** tab, and changing the **Command line arguments** field.
 
-While debugging, opening the main menu and clicking **Reload browser** automatically rebuilds all resources in `Resources/Scripts` and `Resources/Plugins`. This allows editing HTML/CSS/JS files without restarting the program, but it will cause a short delay between browser reloads.
+While debugging, opening the main menu and clicking **Reload browser** automatically rebuilds all resources in `Resources/Scripts` and `Resources/Plugins`. This allows editing HTML/CSS/JS files without restarting the program, but it will cause a short delay between browser reloads. An F# compiler must be present when building the project to enable this feature: `C:\Program Files (x86)\Microsoft SDKs\F#\10.1\Framework\v4.0\fsc.exe`
 
 ### Release
 
@@ -42,13 +44,18 @@ If you decide to publicly release a custom version, please make it clear that it
 - Some files are checked for invalid characters:
   - `Resources/Plugins/emoji-keyboard/emoji-ordering.txt` line endings must be LF (line feed); any CR (carriage return) in the file will cause a failed build, and you will need to ensure correct line endings in your text editor
 
+#### Error: The "EmbedAllSources" parameter is not supported by the "Csc" task
+1. Open `C:\Program Files (x86)\Visual Studio\2017\<edition>\MSBuild\15.0\Bin\Roslyn\Microsoft.CSharp.Core.targets` in a text editor
+2. Remove line that says `EmbedAllSources="$(EmbedAllSources)"`
+3. Hope the next Visual Studio update fixes it...
+
 ### Installers
 
-TweetDuck uses **Inno Setup** for installers and updates. First, download and install [InnoSetup 5.6.1](http://files.jrsoftware.org/is/5/innosetup-5.6.1.exe) (with Preprocessor support) and the [Inno Download Plugin 1.5.0](https://drive.google.com/folderview?id=0Bzw1xBVt0mokSXZrUEFIanV4azA&usp=sharing#list).
+TweetDuck uses **Inno Setup** for installers and updates. First, download and install [InnoSetup QuickStart Pack](http://www.jrsoftware.org/isdl.php) (non-unicode; editor and encryption support not required) and the [Inno Download Plugin](https://code.google.com/archive/p/inno-download-plugin).
 
-Next, add the Inno Setup installation folder (usually `C:\Program Files (x86)\Inno Setup 5`) into your **PATH** environment variable. You may need to restart File Explorer and Visual Studio for the change to take place.
+Next, add the Inno Setup installation folder (usually `C:\Program Files (x86)\Inno Setup 5`) into your **PATH** environment variable. You may need to restart File Explorer for the change to take place.
 
-Now you can generate installers by running `bld/GEN INSTALLERS.bat`. Note that this will only package the files, you still need to run the [release build](#release) in Visual Studio first!
+Now you can generate installers by running `bld/GEN INSTALLERS.bat`. Note that this will only package the files, you still need to run the [release build](#release) in Visual Studio!
 
 After the window closes, three installers will be generated inside the `bld/Output` folder:
 * **TweetDuck.exe**

Reporter.cs

@@ -6,11 +6,9 @@ using System.Text;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
 using TweetDuck.Core.Other;
-using TweetLib.Core;
-using TweetLib.Core.Application;
 
 namespace TweetDuck{
-    sealed class Reporter : IAppErrorHandler{
+    sealed class Reporter{
         private readonly string logFile;
 
         public Reporter(string logFile){
@@ -30,12 +28,8 @@ namespace TweetDuck{
         }
 
         public bool LogImportant(string data){
-            return ((IAppErrorHandler)this).Log(data);
-        }
-
-        bool IAppErrorHandler.Log(string text){
             #if DEBUG
-            Debug.WriteLine(text);
+            Debug.WriteLine(data);
             #endif
 
             StringBuilder build = new StringBuilder();
@@ -44,8 +38,8 @@ namespace TweetDuck{
                 build.Append("Please, report all issues to: https://github.com/chylex/TweetDuck/issues\r\n\r\n");
             }
 
-            build.Append("[").Append(DateTime.Now.ToString("G", Lib.Culture)).Append("]\r\n");
+            build.Append("[").Append(DateTime.Now.ToString("G", Program.Culture)).Append("]\r\n");
-            build.Append(text).Append("\r\n\r\n");
+            build.Append(data).Append("\r\n\r\n");
 
             try{
                 File.AppendAllText(logFile, build.ToString(), Encoding.UTF8);

Resources/Plugins/clear-columns/browser.js

@@ -87,9 +87,9 @@ enabled(){
   // update UI
   
   this.btnClearAllHTML = `
-<a class="clear-columns-btn-all-parent js-header-action link-clean cf app-nav-link padding-h--16 padding-v--2" data-title="Clear columns (hold Shift to restore)" data-action="td-clearcolumns-doall">
+<a class="clear-columns-btn-all-parent js-header-action link-clean cf app-nav-link padding-h--10" data-title="Clear columns (hold Shift to restore)" data-action="td-clearcolumns-doall">
   <div class="obj-left margin-l--2"><i class="icon icon-medium icon-clear-timeline"></i></div>
-  <div class="clear-columns-btn-all nbfc padding-ts hide-condensed txt-size--14 app-nav-link-text">Clear columns</div>
+  <div class="clear-columns-btn-all nbfc padding-ts hide-condensed txt-size--16 app-nav-link-text">Clear columns</div>
 </a>`;
   
   this.btnClearOneHTML = `
@@ -123,7 +123,6 @@ enabled(){
   this.css.insert(".js-app-add-column.is-hidden + .clear-columns-btn-all-parent { display: none; }");
   this.css.insert(".column-navigator-overflow .clear-columns-btn-all-parent { display: none !important; }");
   this.css.insert(".column-navigator-overflow { bottom: 224px !important; }");
-  this.css.insert(".app-navigator .clear-columns-btn-all-parent { font-weight: 700; }");
   
   this.css.insert(".column-header-links { min-width: 51px !important; }");
   this.css.insert(".column[data-td-icon='icon-message'] .column-header-links { min-width: 110px !important; }");

Resources/Plugins/edit-design/browser.js

@@ -8,7 +8,6 @@ enabled(){
     _theme: "light",
     themeOverride: false,
     columnWidth: "310px",
-    composerWidth: "default",
     fontSize: "12px",
     hideTweetActions: true,
     moveTweetActionsToRight: true,
@@ -381,15 +380,8 @@ enabled(){
     this.css.insert("#general_settings .cf { display: none !important }");
     this.css.insert("#settings-modal .js-setting-list li:nth-child(3) { border-bottom: 1px solid #ccd6dd }");
     
-    this.css.insert(`html[data-td-font] { font-size: ${this.config.fontSize} !important }`);
+    this.css.insert("html[data-td-font] { font-size: "+this.config.fontSize+" !important }");
-    this.css.insert(`.avatar { border-radius: ${this.config.avatarRadius}% !important }`);
+    this.css.insert(".avatar { border-radius: "+this.config.avatarRadius+"% !important }");
-    
-    if (this.config.composerWidth !== "default"){
-      const width = this.config.composerWidth;
-      this.css.insert(`.js-app-content.is-open { margin-right: ${width} !important; transform: translateX(${width}) !important }`);
-      this.css.insert(`#tduck .js-app-content.tduck-is-opening { margin-right: 0 !important }`);
-      this.css.insert(`.js-drawer { width: ${width} !important; left: -${width} !important }`);
-    }
     
     let currentTheme = TD.settings.getTheme();
     
@@ -578,7 +570,7 @@ ${iconData.map(entry => `#tduck .icon-${entry[0]}:before{content:\"\\f0${entry[1
       let cols = this.config.columnWidth.slice(1);
       
       this.css.insert(".column { width: calc((100vw - 205px) / "+cols+" - 6px) !important; min-width: 160px }");
-      this.css.insert(".is-condensed .column { width: calc((100vw - 65px) / "+cols+" - 6px) !important }");
+      this.css.insert(".is-condensed .column { width: calc((100vw - 55px) / "+cols+" - 6px) !important }");
     }
     else{
       this.css.insert(".column { width: "+this.config.columnWidth+" !important }");
@@ -646,13 +638,6 @@ ${notificationScrollbarColor ? `
       $(".js-dropdown.pos-r").toggleClass("pos-r pos-l");
     }
   };
-  
-  this.uiDrawerActiveEvent = (e, data) => {
-    return if data.activeDrawer === null || this.config.composerWidth === "default";
-    
-    const ele = $(".js-app-content").addClass("tduck-is-opening");
-    setTimeout(() => ele.removeClass("tduck-is-opening"), 250);
-  };
 }
 
 ready(){
@@ -662,7 +647,6 @@ ready(){
   
   // layout events
   $(document).on("uiShowActionsMenu", this.uiShowActionsMenuEvent);
-  $(document).on("uiDrawerActive", this.uiDrawerActiveEvent);
   
   // modal
   $("[data-action='settings-menu']").on("click", this.onSettingsMenuClickedEvent);
@@ -725,12 +709,10 @@ disabled(){
     window.clearTimeout(this.optimizationTimer);
   }
   
+  $(document).off("uiShowActionsMenu", this.uiShowActionsMenuEvent);
   $(window).off("focus", this.onWindowFocusEvent);
   $(window).off("blur", this.onWindowBlurEvent);
   
-  $(document).off("uiShowActionsMenu", this.uiShowActionsMenuEvent);
-  $(document).off("uiDrawerActive", this.uiDrawerActiveEvent);
-  
   TD.components.GlobalSettings.prototype.getInfo = this.prevFuncSettingsGetInfo;
   TD.components.GlobalSettings.prototype.switchTab = this.prevFuncSettingsSwitchTab;