Bump edit-design plugin version

Closes #160

Configuration/Arguments.cs

@@ -12,6 +12,7 @@ namespace TweetDuck.Configuration{
         // internal args
         public const string ArgRestart = "-restart";
         public const string ArgImportCookies = "-importcookies";
+        public const string ArgDeleteCookies = "-deletecookies";
         public const string ArgUpdated = "-updated";
 
         // class data and methods
@@ -29,6 +30,7 @@ namespace TweetDuck.Configuration{
             CommandLineArgs args = Current.Clone();
             args.RemoveFlag(ArgRestart);
             args.RemoveFlag(ArgImportCookies);
+            args.RemoveFlag(ArgDeleteCookies);
             args.RemoveFlag(ArgUpdated);
             return args;
         }

Configuration/SystemConfig.cs

@@ -5,9 +5,7 @@ using TweetDuck.Data.Serialization;
 
 namespace TweetDuck.Configuration{
     sealed class SystemConfig{
-        private static readonly FileSerializer<SystemConfig> Serializer = new FileSerializer<SystemConfig>{
-            // HandleUnknownProperties = (obj, data) => {}
-        };
+        private static readonly FileSerializer<SystemConfig> Serializer = new FileSerializer<SystemConfig>();
 
         public static readonly bool IsHardwareAccelerationSupported = File.Exists(Path.Combine(Program.ProgramPath, "libEGL.dll")) &&
                                                                       File.Exists(Path.Combine(Program.ProgramPath, "libGLESv2.dll"));
@@ -50,19 +48,8 @@ namespace TweetDuck.Configuration{
             
             try{
                 Serializer.Read(file, config);
-                return config;
             }catch(FileNotFoundException){
             }catch(DirectoryNotFoundException){
-            }catch(FormatException){
-                try{
-                    using(Stream stream = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read)){
-                        config.HardwareAcceleration = stream.ReadByte() > 0;
-                    }
-
-                    config.Save();
-                }catch(Exception e){
-                    Program.Reporter.HandleException("Configuration Error", "Could not update the system configuration file.", true, e);
-                }
             }catch(Exception e){
                 Program.Reporter.HandleException("Configuration Error", "Could not open the system configuration file. If you continue, you will lose system specific configuration such as Hardware Acceleration.", true, e);
             }

Configuration/UserConfig.cs

@@ -14,16 +14,6 @@ namespace TweetDuck.Configuration{
         private static readonly FileSerializer<UserConfig> Serializer = new FileSerializer<UserConfig>{ HandleUnknownProperties = HandleUnknownProperties };
 
         private static void HandleUnknownProperties(UserConfig obj, Dictionary<string, string> data){
-            if (data.TryGetValue("EnableBrowserGCReload", out string propGCReload) && data.TryGetValue("BrowserMemoryThreshold", out string propMemThreshold)){
-                if (bool.TryParse(propGCReload, out bool isGCReloadEnabled) && isGCReloadEnabled && int.TryParse(propMemThreshold, out int memThreshold)){
-                    // SystemConfig initialization was moved before UserConfig to allow for this
-                    // TODO remove the migration soon
-                    Program.SystemConfig.EnableBrowserGCReload = true;
-                    Program.SystemConfig.BrowserMemoryThreshold = memThreshold;
-                    Program.SystemConfig.Save();
-                }
-            }
-
             data.Remove("EnableBrowserGCReload");
             data.Remove("BrowserMemoryThreshold");
 
@@ -54,19 +44,23 @@ namespace TweetDuck.Configuration{
         
         // CONFIGURATION DATA
 
+        public bool FirstRun            { get; set; } = true;
+        public bool AllowDataCollection { get; set; } = false;
+
         public WindowState BrowserWindow { get; set; } = new WindowState();
         public WindowState PluginsWindow { get; set; } = new WindowState();
 
-        public bool ExpandLinksOnHover     { get; set; } = true;
-        public bool SwitchAccountSelectors { get; set; } = true;
-        public bool BestImageQuality       { get; set; } = true;
-        public bool EnableSpellCheck       { get; set; } = false;
-        public int VideoPlayerVolume       { get; set; } = 50;
+        public bool ExpandLinksOnHover      { get; set; } = true;
+        public bool SwitchAccountSelectors  { get; set; } = true;
+        public bool OpenSearchInFirstColumn { get; set; } = true;
+        public bool BestImageQuality        { get; set; } = true;
+        public bool EnableSpellCheck        { get; set; } = false;
+        public int VideoPlayerVolume        { get; set; } = 50;
         private int _zoomLevel                           = 100;
         private bool _muteNotifications;
         
-        private TrayIcon.Behavior _trayBehavior          = TrayIcon.Behavior.Disabled;
-        public bool EnableTrayHighlight    { get; set; } = true;
+        private TrayIcon.Behavior _trayBehavior       = TrayIcon.Behavior.Disabled;
+        public bool EnableTrayHighlight { get; set; } = true;
 
         public bool EnableUpdateCheck { get; set; } = true;
         public string DismissedUpdate { get; set; } = null;
@@ -90,6 +84,7 @@ namespace TweetDuck.Configuration{
         public Size CustomNotificationSize             { get; set; } = Size.Empty;
         public int NotificationScrollSpeed             { get; set; } = 10;
 
+        public int NotificationSoundVolume { get; set; } = 100;
         private string _notificationSoundPath;
 
         public string CustomCefArgs         { get; set; } = null;
@@ -114,7 +109,7 @@ namespace TweetDuck.Configuration{
             set{
                 if (_muteNotifications != value){
                     _muteNotifications = value;
-                    MuteToggled?.Invoke(this, new EventArgs());
+                    MuteToggled?.Invoke(this, EventArgs.Empty);
                 }
             }
         }
@@ -125,7 +120,7 @@ namespace TweetDuck.Configuration{
             set{
                 if (_zoomLevel != value){
                     _zoomLevel = value;
-                    ZoomLevelChanged?.Invoke(this, new EventArgs());
+                    ZoomLevelChanged?.Invoke(this, EventArgs.Empty);
                 }
             }
         }
@@ -138,7 +133,7 @@ namespace TweetDuck.Configuration{
             set{
                 if (_trayBehavior != value){
                     _trayBehavior = value;
-                    TrayBehaviorChanged?.Invoke(this, new EventArgs());
+                    TrayBehaviorChanged?.Invoke(this, EventArgs.Empty);
                 }
             }
         }
@@ -153,7 +148,7 @@ namespace TweetDuck.Configuration{
         
         private readonly string file;
 
-        public UserConfig(string file){ // TODO make private after removing UserConfigLegacy
+        private UserConfig(string file){
             this.file = file;
         }
 
@@ -174,6 +169,29 @@ namespace TweetDuck.Configuration{
                 return false;
             }
         }
+
+        public bool Reload(){
+            try{
+                LoadInternal(false);
+                return true;
+            }catch(FileNotFoundException){
+                try{
+                    Serializer.Write(file, new UserConfig(file));
+                    LoadInternal(false);
+                    return true;
+                }catch(Exception e){
+                    Program.Reporter.HandleException("Configuration Error", "Could not regenerate configuration file.", true, e);
+                    return false;
+                }
+            }catch(Exception e){
+                Program.Reporter.HandleException("Configuration Error", "Could not reload configuration file.", true, e);
+                return false;
+            }
+        }
+
+        private void LoadInternal(bool backup){
+            Serializer.Read(backup ? GetBackupFile(file) : file, this);
+        }
         
         public static UserConfig Load(string file){
             Exception firstException = null;
@@ -181,22 +199,23 @@ namespace TweetDuck.Configuration{
             for(int attempt = 0; attempt < 2; attempt++){
                 try{
                     UserConfig config = new UserConfig(file);
-                    Serializer.Read(attempt == 0 ? file : GetBackupFile(file), config);
+                    config.LoadInternal(attempt > 0);
                     return config;
                 }catch(FileNotFoundException){
                 }catch(DirectoryNotFoundException){
                     break;
-                }catch(FormatException){
-                    UserConfig config = UserConfigLegacy.Load(file);
-                    config.Save();
-                    return config;
                 }catch(Exception e){
                     if (attempt == 0){
                         firstException = e;
                         Program.Reporter.Log(e.ToString());
                     }
+                    else if (firstException is FormatException){
+                        Program.Reporter.HandleException("Configuration Error", "The configuration file is outdated or corrupted. If you continue, your program options will be reset.", true, e);
+                        return new UserConfig(file);
+                    }
                     else if (firstException != null){
                         Program.Reporter.HandleException("Configuration Error", "Could not open the backup configuration file. If you continue, your program options will be reset.", true, e);
+                        return new UserConfig(file);
                     }
                 }
             }

Configuration/UserConfigLegacy.cs

@@ -1,210 +0,0 @@
-using System;
-using System.Drawing;
-using System.IO;
-using System.Runtime.Serialization;
-using System.Runtime.Serialization.Formatters.Binary;
-using TweetDuck.Core;
-using TweetDuck.Core.Controls;
-using TweetDuck.Core.Notification;
-using TweetDuck.Data;
-
-namespace TweetDuck.Configuration{
-    [Serializable]
-    sealed class UserConfigLegacy{ // TODO remove eventually
-        private static readonly IFormatter Formatter = new BinaryFormatter{ Binder = new LegacyBinder() };
-
-        private class LegacyBinder : SerializationBinder{
-            public override Type BindToType(string assemblyName, string typeName){
-                return Type.GetType(string.Format("{0}, {1}", typeName.Replace("TweetDck", "TweetDuck").Replace(".UserConfig", ".UserConfigLegacy").Replace("Core.Utils.WindowState", "Data.WindowState"), assemblyName.Replace("TweetDck", "TweetDuck")));
-            }
-        }
-        
-        private const int CurrentFileVersion = 11;
-
-        // START OF CONFIGURATION
-
-        public WindowState BrowserWindow { get; set; }
-        public WindowState PluginsWindow { get; set; }
-
-        public bool DisplayNotificationColumn { get; set; }
-        public bool DisplayNotificationTimer { get; set; }
-        public bool NotificationTimerCountDown { get; set; }
-        public bool NotificationSkipOnLinkClick { get; set; }
-        public bool NotificationNonIntrusiveMode { get; set; }
-
-        public int NotificationIdlePauseSeconds { get; set; }
-        public int NotificationDurationValue { get; set; }
-        public int NotificationScrollSpeed { get; set; }
-
-        public TweetNotification.Position NotificationPosition { get; set; }
-        public Point CustomNotificationPosition { get; set; }
-        public int NotificationEdgeDistance { get; set; }
-        public int NotificationDisplay { get; set; }
-
-        public TweetNotification.Size NotificationSize { get; set; }
-        public Size CustomNotificationSize { get; set; }
-
-        public bool EnableSpellCheck { get; set; }
-        public bool ExpandLinksOnHover { get; set; }
-        public bool SwitchAccountSelectors { get; set; }
-        public bool EnableTrayHighlight { get; set; }
-
-        public bool EnableUpdateCheck { get; set; }
-        public string DismissedUpdate { get; set; }
-
-        public string CustomCefArgs { get; set; }
-        public string CustomBrowserCSS { get; set; }
-        public string CustomNotificationCSS { get; set; }
-        
-        public string NotificationSoundPath{
-            get => string.IsNullOrEmpty(notificationSoundPath) ? string.Empty : notificationSoundPath;
-            set => notificationSoundPath = value;
-        }
-
-        public bool MuteNotifications{
-            get => muteNotifications;
-            set => muteNotifications = value;
-        }
-
-        public int ZoomLevel{
-            get => zoomLevel;
-            set => zoomLevel = value;
-        }
-
-        public TrayIcon.Behavior TrayBehavior{
-            get => trayBehavior;
-            set => trayBehavior = value;
-        }
-
-        // END OF CONFIGURATION
-        
-        [NonSerialized]
-        private string file;
-
-        private int fileVersion;
-        private bool muteNotifications;
-        private int zoomLevel;
-        private string notificationSoundPath;
-        private TrayIcon.Behavior trayBehavior;
-
-        private UserConfigLegacy(string file){
-            this.file = file;
-
-            BrowserWindow = new WindowState();
-            ZoomLevel = 100;
-            DisplayNotificationTimer = true;
-            NotificationNonIntrusiveMode = true;
-            NotificationPosition = TweetNotification.Position.TopRight;
-            CustomNotificationPosition = ControlExtensions.InvisibleLocation;
-            NotificationSize = TweetNotification.Size.Auto;
-            NotificationEdgeDistance = 8;
-            NotificationDurationValue = 25;
-            NotificationScrollSpeed = 100;
-            EnableUpdateCheck = true;
-            ExpandLinksOnHover = true;
-            SwitchAccountSelectors = true;
-            EnableTrayHighlight = true;
-            PluginsWindow = new WindowState();
-        }
-
-        private void UpgradeFile(){
-            if (fileVersion == CurrentFileVersion){
-                return;
-            }
-
-            // if outdated, cycle through all versions
-            if (fileVersion <= 5){
-                DisplayNotificationTimer = true;
-                EnableUpdateCheck = true;
-                ExpandLinksOnHover = true;
-                BrowserWindow = new WindowState();
-                PluginsWindow = new WindowState();
-                EnableTrayHighlight = true;
-                NotificationDurationValue = 25;
-                fileVersion = 6;
-            }
-
-            if (fileVersion == 6){
-                NotificationNonIntrusiveMode = true;
-                ++fileVersion;
-            }
-
-            if (fileVersion == 7){
-                ZoomLevel = 100;
-                ++fileVersion;
-            }
-
-            if (fileVersion == 8){
-                SwitchAccountSelectors = true;
-                ++fileVersion;
-            }
-
-            if (fileVersion == 9){
-                NotificationScrollSpeed = 100;
-                ++fileVersion;
-            }
-
-            if (fileVersion == 10){
-                NotificationSize = TweetNotification.Size.Auto;
-                ++fileVersion;
-            }
-
-            // update the version
-            fileVersion = CurrentFileVersion;
-        }
-
-        public UserConfig ConvertLegacy(){
-            return new UserConfig(file){
-                BrowserWindow = BrowserWindow,
-                PluginsWindow = PluginsWindow,
-                DisplayNotificationColumn = DisplayNotificationColumn,
-                DisplayNotificationTimer = DisplayNotificationTimer,
-                NotificationTimerCountDown = NotificationTimerCountDown,
-                NotificationSkipOnLinkClick = NotificationSkipOnLinkClick,
-                NotificationNonIntrusiveMode = NotificationNonIntrusiveMode,
-                NotificationIdlePauseSeconds = NotificationIdlePauseSeconds,
-                NotificationDurationValue = NotificationDurationValue,
-                NotificationScrollSpeed = NotificationScrollSpeed,
-                NotificationPosition = NotificationPosition,
-                CustomNotificationPosition = CustomNotificationPosition,
-                NotificationEdgeDistance = NotificationEdgeDistance,
-                NotificationDisplay = NotificationDisplay,
-                NotificationSize = NotificationSize,
-                CustomNotificationSize = CustomNotificationSize,
-                EnableSpellCheck = EnableSpellCheck,
-                ExpandLinksOnHover = ExpandLinksOnHover,
-                SwitchAccountSelectors = SwitchAccountSelectors,
-                EnableTrayHighlight = EnableTrayHighlight,
-                EnableUpdateCheck = EnableUpdateCheck,
-                DismissedUpdate = DismissedUpdate,
-                CustomCefArgs = CustomCefArgs,
-                CustomBrowserCSS = CustomBrowserCSS,
-                CustomNotificationCSS = CustomNotificationCSS,
-                NotificationSoundPath = NotificationSoundPath,
-                MuteNotifications = MuteNotifications,
-                ZoomLevel = ZoomLevel,
-                TrayBehavior = TrayBehavior
-            };
-        }
-        
-        public static UserConfig Load(string file){
-            UserConfigLegacy config = null;
-            
-            try{
-                using(Stream stream = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read)){
-                    if ((config = Formatter.Deserialize(stream) as UserConfigLegacy) != null){
-                        config.file = file;
-                    }
-                }
-
-                config?.UpgradeFile();
-            }catch(FileNotFoundException){
-            }catch(DirectoryNotFoundException){
-            }catch(Exception e){
-                Program.Reporter.HandleException("Configuration Error", "Could not open the configuration file.", true, e);
-            }
-
-            return (config ?? new UserConfigLegacy(file)).ConvertLegacy();
-        }
-    }
-}

Core/Bridge/PropertyBridge.cs

@@ -17,6 +17,7 @@ namespace TweetDuck.Core.Bridge{
             
             if (environment == Environment.Browser){
                 build.Append("x.switchAccountSelectors=").Append(Bool(Program.UserConfig.SwitchAccountSelectors));
+                build.Append("x.openSearchInFirstColumn=").Append(Bool(Program.UserConfig.OpenSearchInFirstColumn));
                 build.Append("x.muteNotifications=").Append(Bool(Program.UserConfig.MuteNotifications));
                 build.Append("x.hasCustomNotificationSound=").Append(Bool(Program.UserConfig.NotificationSoundPath.Length > 0));
                 build.Append("x.notificationMediaPreviews=").Append(Bool(Program.UserConfig.NotificationMediaPreviews));

Core/Bridge/TweetDeckBridge.cs

@@ -3,6 +3,7 @@ using System.Text;
 using System.Windows.Forms;
 using CefSharp;
 using TweetDuck.Core.Controls;
+using TweetDuck.Core.Handling;
 using TweetDuck.Core.Notification;
 using TweetDuck.Core.Other;
 using TweetDuck.Core.Utils;
@@ -10,17 +11,22 @@ using TweetDuck.Resources;
 
 namespace TweetDuck.Core.Bridge{
     sealed class TweetDeckBridge{
-        public static string LastRightClickedLink = string.Empty;
-        public static string LastRightClickedImage = string.Empty;
-        public static string LastHighlightedTweet = string.Empty;
-        public static string LastHighlightedQuotedTweet = string.Empty;
-        public static string LastHighlightedTweetAuthor = string.Empty;
-        public static string[] LastHighlightedTweetImages = StringUtils.EmptyArray;
-        public static Dictionary<string, string> SessionData = new Dictionary<string, string>(2);
+        public static string FontSize { get; private set; }
+        public static string NotificationHeadLayout { get; private set; }
+
+        public static string LastHighlightedTweetUrl = string.Empty;
+        public static string LastHighlightedQuoteUrl = string.Empty;
+        private static string LastHighlightedTweetAuthors = string.Empty;
+        private static string LastHighlightedTweetImages = string.Empty;
+
+        public static string[] LastHighlightedTweetAuthorsArray => LastHighlightedTweetAuthors.Split(';');
+        public static string[] LastHighlightedTweetImagesArray => LastHighlightedTweetImages.Split(';');
+
+        private static readonly Dictionary<string, string> SessionData = new Dictionary<string, string>(2);
 
         public static void ResetStaticProperties(){
-            LastRightClickedLink = LastRightClickedImage = LastHighlightedTweet = LastHighlightedQuotedTweet = LastHighlightedTweetAuthor = string.Empty;
-            LastHighlightedTweetImages = StringUtils.EmptyArray;
+            FontSize = NotificationHeadLayout = null;
+            LastHighlightedTweetUrl = LastHighlightedQuoteUrl = LastHighlightedTweetAuthors = LastHighlightedTweetImages = string.Empty;
         }
 
         public static void RestoreSessionData(IFrame frame){
@@ -44,32 +50,29 @@ namespace TweetDuck.Core.Bridge{
             this.notification = notification;
         }
 
-        public void LoadFontSizeClass(string fsClass){
+        public void OnIntroductionClosed(bool showGuide, bool allowDataCollection){
             form.InvokeAsyncSafe(() => {
-               TweetNotification.SetFontSizeClass(fsClass);
+                form.OnIntroductionClosed(showGuide, allowDataCollection);
             });
         }
 
-        public void LoadNotificationHeadContents(string headContents){
+        public void LoadNotificationLayout(string fontSize, string headLayout){
             form.InvokeAsyncSafe(() => {
-               TweetNotification.SetHeadTag(headContents); 
+                FontSize = fontSize;
+                NotificationHeadLayout = headLayout;
             });
         }
 
-        public void SetLastRightClickedLink(string link){
-            form.InvokeAsyncSafe(() => LastRightClickedLink = link);
+        public void SetLastRightClickInfo(string type, string link){
+            form.InvokeAsyncSafe(() => ContextMenuBase.SetContextInfo(type, link));
         }
 
-        public void SetLastRightClickedImage(string link){
-            form.InvokeAsyncSafe(() => LastRightClickedImage = link);
-        }
-
-        public void SetLastHighlightedTweet(string link, string quotedLink, string author, string imageList){
+        public void SetLastHighlightedTweet(string tweetUrl, string quoteUrl, string authors, string imageList){
             form.InvokeAsyncSafe(() => {
-                LastHighlightedTweet = link;
-                LastHighlightedQuotedTweet = quotedLink;
-                LastHighlightedTweetAuthor = author;
-                LastHighlightedTweetImages = imageList.Split(';');
+                LastHighlightedTweetUrl = tweetUrl;
+                LastHighlightedQuoteUrl = quoteUrl;
+                LastHighlightedTweetAuthors = authors;
+                LastHighlightedTweetImages = imageList;
             });
         }
 
@@ -77,10 +80,10 @@ namespace TweetDuck.Core.Bridge{
             form.InvokeAsyncSafe(form.OpenContextMenu);
         }
 
-        public void OnTweetPopup(string columnName, string tweetHtml, int tweetCharacters, string tweetUrl, string quoteUrl){
+        public void OnTweetPopup(string columnId, string chirpId, string columnName, string tweetHtml, int tweetCharacters, string tweetUrl, string quoteUrl){
             notification.InvokeAsyncSafe(() => {
                 form.OnTweetNotification();
-                notification.ShowNotification(new TweetNotification(columnName, tweetHtml, tweetCharacters, tweetUrl, quoteUrl));
+                notification.ShowNotification(new TweetNotification(columnId, chirpId, columnName, tweetHtml, tweetCharacters, tweetUrl, quoteUrl));
             });
         }
 
@@ -122,12 +125,12 @@ namespace TweetDuck.Core.Bridge{
             form.InvokeAsyncSafe(WindowsUtils.ClipboardStripHtmlStyles);
         }
 
-        public int GetIdleSeconds(){
-            return NativeMethods.GetIdleSeconds();
+        public void OpenBrowser(string url){
+            form.InvokeAsyncSafe(() => BrowserUtils.OpenExternalBrowser(url));
         }
 
-        public void OpenBrowser(string url){
-            BrowserUtils.OpenExternalBrowser(url);
+        public int GetIdleSeconds(){
+            return NativeMethods.GetIdleSeconds();
         }
 
         public void Alert(string type, string contents){

Core/Controls/ControlExtensions.cs

@@ -2,8 +2,6 @@ using System;
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
-using TweetDuck.Core.Utils;
-using TweetLib.Communication;
 
 namespace TweetDuck.Core.Controls{
     static class ControlExtensions{
@@ -68,12 +66,6 @@ namespace TweetDuck.Core.Controls{
             else return true;
         }
 
-        public static void SetElevated(this Button button){
-            button.Text = " "+button.Text;
-            button.FlatStyle = FlatStyle.System;
-            Comms.SendMessage(button.Handle, NativeMethods.BCM_SETSHIELD, 0, 1);
-        }
-
         public static void EnableMultilineShortcuts(this TextBox textBox){
             textBox.KeyDown += (sender, args) => {
                 if (args.Control && args.KeyCode == Keys.A){

Core/Controls/FlatButton.cs

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

Core/FormBrowser.Designer.cs

@@ -39,10 +39,10 @@
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = TweetDuck.Core.Utils.TwitterUtils.BackgroundColor;
-            this.ClientSize = new System.Drawing.Size(324, 386);
+            this.ClientSize = new System.Drawing.Size(400, 386);
             this.Icon = Properties.Resources.icon;
             this.Location = TweetDuck.Core.Controls.ControlExtensions.InvisibleLocation;
-            this.MinimumSize = new System.Drawing.Size(340, 424);
+            this.MinimumSize = new System.Drawing.Size(416, 424);
             this.Name = "FormBrowser";
             this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
             this.Activated += new System.EventHandler(this.FormBrowser_Activated);

Core/FormBrowser.cs

@@ -19,7 +19,6 @@ using TweetDuck.Plugins.Enums;
 using TweetDuck.Plugins.Events;
 using TweetDuck.Resources;
 using TweetDuck.Updates;
-using TweetDuck.Updates.Events;
 using TweetLib.Audio;
 
 namespace TweetDuck.Core{
@@ -85,6 +84,8 @@ namespace TweetDuck.Core{
             this.notification.Show();
 
             this.browser = new ChromiumWebBrowser("https://tweetdeck.twitter.com/"){
+                DialogHandler = new FileDialogHandler(),
+                DragHandler = new DragHandlerBrowser(),
                 MenuHandler = new ContextMenuBrowser(this),
                 JsDialogHandler = new JavaScriptDialogHandler(),
                 KeyboardHandler = new KeyboardHandlerBrowser(this),
@@ -201,6 +202,7 @@ namespace TweetDuck.Core{
                 UpdateProperties(PropertyBridge.Environment.Browser);
                 TweetDeckBridge.RestoreSessionData(e.Frame);
                 ScriptLoader.ExecuteFile(e.Frame, "code.js");
+                InjectBrowserCSS();
                 ReinjectCustomCSS(Config.CustomBrowserCSS);
                 plugins.ExecutePlugins(e.Frame, PluginEnvironment.Browser);
 
@@ -209,6 +211,10 @@ namespace TweetDuck.Core{
                 if (Program.SystemConfig.EnableBrowserGCReload){
                     memoryUsageTracker.Start(this, e.Browser, Program.SystemConfig.BrowserMemoryThreshold);
                 }
+
+                if (Config.FirstRun){
+                    ScriptLoader.ExecuteFile(e.Frame, "introduction.js");
+                }
             }
         }
 
@@ -337,7 +343,7 @@ namespace TweetDuck.Core{
             browser.ExecuteScriptAsync("window.TDPF_setPluginState", e.Plugin, e.IsEnabled);
         }
 
-        private void updates_UpdateAccepted(object sender, UpdateAcceptedEventArgs e){
+        private void updates_UpdateAccepted(object sender, UpdateEventArgs e){
             this.InvokeAsyncSafe(() => {
                 FormManager.CloseAllDialogs();
             
@@ -351,9 +357,9 @@ namespace TweetDuck.Core{
             });
         }
 
-        private void updates_UpdateDismissed(object sender, UpdateDismissedEventArgs e){
+        private void updates_UpdateDismissed(object sender, UpdateEventArgs e){
             this.InvokeAsyncSafe(() => {
-                Config.DismissedUpdate = e.VersionTag;
+                Config.DismissedUpdate = e.UpdateInfo.VersionTag;
                 Config.Save();
             });
         }
@@ -378,7 +384,7 @@ namespace TweetDuck.Core{
             if (isLoaded){
                 if (m.Msg == Program.WindowRestoreMessage){
                     if (WindowsUtils.CurrentProcessID == m.WParam.ToInt32()){
-                        trayIcon_ClickRestore(trayIcon, new EventArgs());
+                        trayIcon_ClickRestore(trayIcon, EventArgs.Empty);
                     }
 
                     return;
@@ -424,6 +430,10 @@ namespace TweetDuck.Core{
 
         // javascript calls
 
+        public void InjectBrowserCSS(){
+            browser.ExecuteScriptAsync("TDGF_injectBrowserCSS", ScriptLoader.LoadResource("styles/browser.css").TrimEnd());
+        }
+
         public void ReinjectCustomCSS(string css){
             browser.ExecuteScriptAsync("TDGF_reinjectCustomCSS", css?.Replace(Environment.NewLine, " ") ?? string.Empty);
         }
@@ -437,6 +447,18 @@ namespace TweetDuck.Core{
         }
 
         // callback handlers
+        
+        public void OnIntroductionClosed(bool showGuide, bool allowDataCollection){
+            if (Config.FirstRun){
+                Config.FirstRun = false;
+                Config.AllowDataCollection = allowDataCollection;
+                Config.Save();
+            }
+
+            if (showGuide){
+                ShowChildForm(new FormGuide());
+            }
+        }
 
         public void OpenContextMenu(){
             contextMenu.Show(this, PointToClient(Cursor.Position));
@@ -454,8 +476,10 @@ namespace TweetDuck.Core{
 
                 form.FormClosed += (sender, args) => {
                     if (!prevEnableUpdateCheck && Config.EnableUpdateCheck){
-                        updates.DismissUpdate(string.Empty);
-                        updates.Check(false);
+                        Config.DismissedUpdate = null;
+                        Config.Save();
+                        
+                        updates.Check(true);
                     }
 
                     if (!Config.EnableTrayHighlight){
@@ -469,7 +493,13 @@ namespace TweetDuck.Core{
                         memoryUsageTracker.Stop();
                     }
                     
-                    UpdateProperties(PropertyBridge.Environment.Browser);
+                    if (form.ShouldReloadBrowser){
+                        FormManager.TryFind<FormPlugins>()?.Close();
+                        plugins.Reload(); // also reloads the browser
+                    }
+                    else{
+                        UpdateProperties(PropertyBridge.Environment.Browser);
+                    }
 
                     notification.RequiresResize = true;
                     form.Dispose();
@@ -507,6 +537,7 @@ namespace TweetDuck.Core{
                 soundNotification.PlaybackError += soundNotification_PlaybackError;
             }
 
+            soundNotification.SetVolume(Config.NotificationSoundVolume);
             soundNotification.Play(Config.NotificationSoundPath);
         }
 
@@ -528,17 +559,31 @@ namespace TweetDuck.Core{
             videoPlayer.Launch(url);
         }
 
-        public bool ToggleVideoPause(){
+        public void HideVideoOverlay(){
+            browser.ExecuteScriptAsync("$('#td-video-player-overlay').remove()");
+        }
+
+        public bool ProcessBrowserKey(Keys key){
             if (videoPlayer != null && videoPlayer.Running){
-                videoPlayer.TogglePause();
+                videoPlayer.SendKeyEvent(key);
                 return true;
             }
 
             return false;
         }
 
-        public void HideVideoOverlay(){
-            browser.ExecuteScriptAsync("$('#td-video-player-overlay').remove()");
+        public void ShowTweetDetail(string columnId, string chirpId, string fallbackUrl){
+            Activate();
+
+            using(IFrame frame = browser.GetBrowser().MainFrame){
+                if (!TwitterUtils.IsTweetDeckWebsite(frame)){
+                    FormMessage.Error("View Tweet Detail", "TweetDeck is not currently loaded.", FormMessage.OK);
+                    return;
+                }
+            }
+
+            notification.FinishCurrentNotification();
+            browser.ExecuteScriptAsync("window.TDGF_showTweetDetail", columnId, chirpId, fallbackUrl);
         }
 
         public void OnTweetScreenshotReady(string html, int width, int height){

Core/FormManager.cs

@@ -4,8 +4,12 @@ using TweetDuck.Core.Other;
 
 namespace TweetDuck.Core{
     static class FormManager{
+        public static T TryFind<T>() where T : Form{
+            return Application.OpenForms.OfType<T>().FirstOrDefault();
+        }
+
         public static bool TryBringToFront<T>() where T : Form{
-            T form = Application.OpenForms.OfType<T>().FirstOrDefault();
+            T form = TryFind<T>();
 
             if (form != null){
                 form.BringToFront();
@@ -16,7 +20,7 @@ namespace TweetDuck.Core{
 
         public static void CloseAllDialogs(){
             foreach(Form form in Application.OpenForms.Cast<Form>().Reverse()){
-                if (form is FormSettings || form is FormPlugins || form is FormAbout){
+                if (form is FormSettings || form is FormPlugins || form is FormAbout || form is FormGuide){
                     form.Close();
                 }
             }

Core/Handling/ContextMenuBase.cs

@@ -6,70 +6,85 @@ using CefSharp;
 using TweetDuck.Core.Bridge;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Utils;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace TweetDuck.Core.Handling{
     abstract class ContextMenuBase : IContextMenuHandler{
         protected static readonly bool HasDevTools = File.Exists(Path.Combine(Program.ProgramPath, "devtools_resources.pak"));
 
         private static TwitterUtils.ImageQuality ImageQuality => Program.UserConfig.TwitterImageQuality;
-
-        private static string GetLink(IContextMenuParams parameters){
-            return string.IsNullOrEmpty(TweetDeckBridge.LastRightClickedLink) ? parameters.UnfilteredLinkUrl : TweetDeckBridge.LastRightClickedLink;
-        }
-
-        private static string GetImage(IContextMenuParams parameters){
-            return string.IsNullOrEmpty(TweetDeckBridge.LastRightClickedImage) ? parameters.SourceUrl : TweetDeckBridge.LastRightClickedImage;
-        }
-
-        private const int MenuOpenLinkUrl = 26500;
-        private const int MenuCopyLinkUrl = 26501;
-        private const int MenuCopyUsername = 26502;
-        private const int MenuOpenImageUrl = 26503;
-        private const int MenuCopyImageUrl = 26504;
-        private const int MenuSaveImage = 26505;
-        private const int MenuSaveAllImages = 26506;
-        private const int MenuOpenDevTools = 26599;
-
-        private readonly Form form;
         
-        private string lastHighlightedTweetAuthor;
+        private static KeyValuePair<string, string> ContextInfo;
+        private static bool IsLink => ContextInfo.Key == "link";
+        private static bool IsImage => ContextInfo.Key == "image";
+        private static bool IsVideo => ContextInfo.Key == "video";
+
+        public static void SetContextInfo(string type, string link){
+            ContextInfo = new KeyValuePair<string, string>(string.IsNullOrEmpty(link) ? null : type, link);
+        }
+
+        private static string GetMediaLink(IContextMenuParams parameters){
+            return IsImage || IsVideo ? ContextInfo.Value : parameters.SourceUrl;
+        }
+
+        private const CefMenuCommand MenuOpenLinkUrl     = (CefMenuCommand)26500;
+        private const CefMenuCommand MenuCopyLinkUrl     = (CefMenuCommand)26501;
+        private const CefMenuCommand MenuCopyUsername    = (CefMenuCommand)26502;
+        private const CefMenuCommand MenuOpenMediaUrl    = (CefMenuCommand)26503;
+        private const CefMenuCommand MenuCopyMediaUrl    = (CefMenuCommand)26504;
+        private const CefMenuCommand MenuSaveMedia       = (CefMenuCommand)26505;
+        private const CefMenuCommand MenuSaveTweetImages = (CefMenuCommand)26506;
+        private const CefMenuCommand MenuOpenDevTools    = (CefMenuCommand)26599;
+        
+        private string[] lastHighlightedTweetAuthors;
         private string[] lastHighlightedTweetImageList;
 
-        protected ContextMenuBase(Form form){
-            this.form = form;
-        }
-
         public virtual void OnBeforeContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model){
-            bool hasTweetImage = !string.IsNullOrEmpty(TweetDeckBridge.LastRightClickedImage);
-            lastHighlightedTweetAuthor = TweetDeckBridge.LastHighlightedTweetAuthor;
-            lastHighlightedTweetImageList = TweetDeckBridge.LastHighlightedTweetImages;
-
             if (!TwitterUtils.IsTweetDeckWebsite(frame) || browser.IsLoading){
-                lastHighlightedTweetAuthor = string.Empty;
+                lastHighlightedTweetAuthors = StringUtils.EmptyArray;
                 lastHighlightedTweetImageList = StringUtils.EmptyArray;
+                ContextInfo = default(KeyValuePair<string, string>);
+            }
+            else{
+                lastHighlightedTweetAuthors = TweetDeckBridge.LastHighlightedTweetAuthorsArray;
+                lastHighlightedTweetImageList = TweetDeckBridge.LastHighlightedTweetImagesArray;
             }
 
-            if (parameters.TypeFlags.HasFlag(ContextMenuType.Link) && !parameters.UnfilteredLinkUrl.EndsWith("tweetdeck.twitter.com/#", StringComparison.Ordinal) && !hasTweetImage){
+            bool hasTweetImage = IsImage;
+            bool hasTweetVideo = IsVideo;
+
+            string TextOpen(string name) => "Open "+name+" in browser";
+            string TextCopy(string name) => "Copy "+name+" address";
+            string TextSave(string name) => "Save "+name+" as...";
+            
+            if (parameters.TypeFlags.HasFlag(ContextMenuType.Link) && !parameters.UnfilteredLinkUrl.EndsWith("tweetdeck.twitter.com/#", StringComparison.Ordinal) && !hasTweetImage && !hasTweetVideo){
                 if (TwitterUtils.RegexAccount.IsMatch(parameters.UnfilteredLinkUrl)){
-                    model.AddItem((CefMenuCommand)MenuOpenLinkUrl, "Open account in browser");
-                    model.AddItem((CefMenuCommand)MenuCopyLinkUrl, "Copy account address");
-                    model.AddItem((CefMenuCommand)MenuCopyUsername, "Copy account username");
+                    model.AddItem(MenuOpenLinkUrl, TextOpen("account"));
+                    model.AddItem(MenuCopyLinkUrl, TextCopy("account"));
+                    model.AddItem(MenuCopyUsername, "Copy account username");
                 }
                 else{
-                    model.AddItem((CefMenuCommand)MenuOpenLinkUrl, "Open link in browser");
-                    model.AddItem((CefMenuCommand)MenuCopyLinkUrl, "Copy link address");
+                    model.AddItem(MenuOpenLinkUrl, TextOpen("link"));
+                    model.AddItem(MenuCopyLinkUrl, TextCopy("link"));
                 }
 
                 model.AddSeparator();
             }
 
-            if ((parameters.TypeFlags.HasFlag(ContextMenuType.Media) && parameters.HasImageContents) || hasTweetImage){
-                model.AddItem((CefMenuCommand)MenuOpenImageUrl, "Open image in browser");
-                model.AddItem((CefMenuCommand)MenuCopyImageUrl, "Copy image address");
-                model.AddItem((CefMenuCommand)MenuSaveImage, "Save image as...");
+            if (hasTweetVideo){
+                model.AddItem(MenuOpenMediaUrl, TextOpen("video"));
+                model.AddItem(MenuCopyMediaUrl, TextCopy("video"));
+                model.AddItem(MenuSaveMedia, TextSave("video"));
+                model.AddSeparator();
+            }
+            else if ((parameters.TypeFlags.HasFlag(ContextMenuType.Media) && parameters.HasImageContents) || hasTweetImage){
+                model.AddItem(MenuOpenMediaUrl, TextOpen("image"));
+                model.AddItem(MenuCopyMediaUrl, TextCopy("image"));
+                model.AddItem(MenuSaveMedia, TextSave("image"));
 
                 if (lastHighlightedTweetImageList.Length > 1){
-                    model.AddItem((CefMenuCommand)MenuSaveAllImages, "Save all images as...");
+                    model.AddItem(MenuSaveTweetImages, TextSave("all images"));
                 }
 
                 model.AddSeparator();
@@ -77,34 +92,40 @@ namespace TweetDuck.Core.Handling{
         }
 
         public virtual bool OnContextMenuCommand(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, CefMenuCommand commandId, CefEventFlags eventFlags){
-            switch((int)commandId){
+            switch(commandId){
                 case MenuOpenLinkUrl:
-                    BrowserUtils.OpenExternalBrowser(parameters.LinkUrl);
+                    OpenBrowser(browserControl.AsControl(), IsLink ? ContextInfo.Value : parameters.LinkUrl);
                     break;
 
                 case MenuCopyLinkUrl:
-                    SetClipboardText(GetLink(parameters));
-                    break;
-
-                case MenuOpenImageUrl:
-                    BrowserUtils.OpenExternalBrowser(TwitterUtils.GetImageLink(GetImage(parameters), ImageQuality));
-                    break;
-
-                case MenuSaveImage:
-                    TwitterUtils.DownloadImage(GetImage(parameters), lastHighlightedTweetAuthor, ImageQuality);
-                    break;
-
-                case MenuSaveAllImages:
-                    TwitterUtils.DownloadImages(lastHighlightedTweetImageList, lastHighlightedTweetAuthor, ImageQuality);
-                    break;
-
-                case MenuCopyImageUrl:
-                    SetClipboardText(TwitterUtils.GetImageLink(GetImage(parameters), ImageQuality));
+                    SetClipboardText(browserControl.AsControl(), IsLink ? ContextInfo.Value : parameters.UnfilteredLinkUrl);
                     break;
 
                 case MenuCopyUsername:
                     Match match = TwitterUtils.RegexAccount.Match(parameters.UnfilteredLinkUrl);
-                    SetClipboardText(match.Success ? match.Groups[1].Value : parameters.UnfilteredLinkUrl);
+                    SetClipboardText(browserControl.AsControl(), match.Success ? match.Groups[1].Value : parameters.UnfilteredLinkUrl);
+                    break;
+
+                case MenuOpenMediaUrl:
+                    OpenBrowser(browserControl.AsControl(), TwitterUtils.GetMediaLink(GetMediaLink(parameters), ImageQuality));
+                    break;
+
+                case MenuCopyMediaUrl:
+                    SetClipboardText(browserControl.AsControl(), TwitterUtils.GetMediaLink(GetMediaLink(parameters), ImageQuality));
+                    break;
+
+                case MenuSaveMedia:
+                    if (IsVideo){
+                        TwitterUtils.DownloadVideo(GetMediaLink(parameters));
+                    }
+                    else{
+                        TwitterUtils.DownloadImage(GetMediaLink(parameters), lastHighlightedTweetAuthors.LastOrDefault(), ImageQuality);
+                    }
+
+                    break;
+
+                case MenuSaveTweetImages:
+                    TwitterUtils.DownloadImages(lastHighlightedTweetImageList, lastHighlightedTweetAuthors.LastOrDefault(), ImageQuality);
                     break;
                     
                 case MenuOpenDevTools:
@@ -116,20 +137,23 @@ namespace TweetDuck.Core.Handling{
         }
 
         public virtual void OnContextMenuDismissed(IWebBrowser browserControl, IBrowser browser, IFrame frame){
-            TweetDeckBridge.LastRightClickedLink = string.Empty;
-            TweetDeckBridge.LastRightClickedImage = string.Empty;
+            ContextInfo = default(KeyValuePair<string, string>);
         }
 
         public virtual bool RunContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model, IRunContextMenuCallback callback){
             return false;
         }
 
-        protected void SetClipboardText(string text){
-            form.InvokeAsyncSafe(() => WindowsUtils.SetClipboard(text, TextDataFormat.UnicodeText));
+        protected void OpenBrowser(Control control, string url){
+            control.InvokeAsyncSafe(() => BrowserUtils.OpenExternalBrowser(url));
+        }
+
+        protected void SetClipboardText(Control control, string text){
+            control.InvokeAsyncSafe(() => WindowsUtils.SetClipboard(text, TextDataFormat.UnicodeText));
         }
         
         protected static void AddDebugMenuItems(IMenuModel model){
-            model.AddItem((CefMenuCommand)MenuOpenDevTools, "Open dev tools");
+            model.AddItem(MenuOpenDevTools, "Open dev tools");
         }
 
         protected static void RemoveSeparatorIfLast(IMenuModel model){

Core/Handling/ContextMenuBrowser.cs

@@ -5,18 +5,18 @@ using TweetDuck.Core.Controls;
 using TweetDuck.Core.Utils;
 
 namespace TweetDuck.Core.Handling{
-    class ContextMenuBrowser : ContextMenuBase{
-        private const int MenuGlobal = 26600;
-        private const int MenuMute = 26601;
-        private const int MenuSettings = 26602;
-        private const int MenuPlugins = 26003;
-        private const int MenuAbout = 26604;
+    sealed class ContextMenuBrowser : ContextMenuBase{
+        private const CefMenuCommand MenuGlobal   = (CefMenuCommand)26600;
+        private const CefMenuCommand MenuMute     = (CefMenuCommand)26601;
+        private const CefMenuCommand MenuSettings = (CefMenuCommand)26602;
+        private const CefMenuCommand MenuPlugins  = (CefMenuCommand)26003;
+        private const CefMenuCommand MenuAbout    = (CefMenuCommand)26604;
         
-        private const int MenuOpenTweetUrl = 26610;
-        private const int MenuCopyTweetUrl = 26611;
-        private const int MenuOpenQuotedTweetUrl = 26612;
-        private const int MenuCopyQuotedTweetUrl = 26613;
-        private const int MenuScreenshotTweet = 26614;
+        private const CefMenuCommand MenuOpenTweetUrl       = (CefMenuCommand)26610;
+        private const CefMenuCommand MenuCopyTweetUrl       = (CefMenuCommand)26611;
+        private const CefMenuCommand MenuOpenQuotedTweetUrl = (CefMenuCommand)26612;
+        private const CefMenuCommand MenuCopyQuotedTweetUrl = (CefMenuCommand)26613;
+        private const CefMenuCommand MenuScreenshotTweet    = (CefMenuCommand)26614;
 
         private const string TitleReloadBrowser = "Reload browser";
         private const string TitleMuteNotifications = "Mute notifications";
@@ -26,10 +26,10 @@ namespace TweetDuck.Core.Handling{
 
         private readonly FormBrowser form;
 
-        private string lastHighlightedTweet;
-        private string lastHighlightedQuotedTweet;
+        private string lastHighlightedTweetUrl;
+        private string lastHighlightedQuoteUrl;
 
-        public ContextMenuBrowser(FormBrowser form) : base(form){
+        public ContextMenuBrowser(FormBrowser form){
             this.form = form;
         }
 
@@ -46,23 +46,23 @@ namespace TweetDuck.Core.Handling{
 
             base.OnBeforeContextMenu(browserControl, browser, frame, parameters, model);
 
-            lastHighlightedTweet = TweetDeckBridge.LastHighlightedTweet;
-            lastHighlightedQuotedTweet = TweetDeckBridge.LastHighlightedQuotedTweet;
+            lastHighlightedTweetUrl = TweetDeckBridge.LastHighlightedTweetUrl;
+            lastHighlightedQuoteUrl = TweetDeckBridge.LastHighlightedQuoteUrl;
 
             if (!TwitterUtils.IsTweetDeckWebsite(frame) || browser.IsLoading){
-                lastHighlightedTweet = string.Empty;
-                lastHighlightedQuotedTweet = string.Empty;
+                lastHighlightedTweetUrl = string.Empty;
+                lastHighlightedQuoteUrl = string.Empty;
             }
 
-            if (!string.IsNullOrEmpty(lastHighlightedTweet) && (parameters.TypeFlags & (ContextMenuType.Editable | ContextMenuType.Selection)) == 0){
-                model.AddItem((CefMenuCommand)MenuOpenTweetUrl, "Open tweet in browser");
-                model.AddItem((CefMenuCommand)MenuCopyTweetUrl, "Copy tweet address");
-                model.AddItem((CefMenuCommand)MenuScreenshotTweet, "Screenshot tweet to clipboard");
+            if (!string.IsNullOrEmpty(lastHighlightedTweetUrl) && (parameters.TypeFlags & (ContextMenuType.Editable | ContextMenuType.Selection)) == 0){
+                model.AddItem(MenuOpenTweetUrl, "Open tweet in browser");
+                model.AddItem(MenuCopyTweetUrl, "Copy tweet address");
+                model.AddItem(MenuScreenshotTweet, "Screenshot tweet to clipboard");
 
-                if (!string.IsNullOrEmpty(lastHighlightedQuotedTweet)){
+                if (!string.IsNullOrEmpty(lastHighlightedQuoteUrl)){
                     model.AddSeparator();
-                    model.AddItem((CefMenuCommand)MenuOpenQuotedTweetUrl, "Open quoted tweet in browser");
-                    model.AddItem((CefMenuCommand)MenuCopyQuotedTweetUrl, "Copy quoted tweet address");
+                    model.AddItem(MenuOpenQuotedTweetUrl, "Open quoted tweet in browser");
+                    model.AddItem(MenuCopyQuotedTweetUrl, "Copy quoted tweet address");
                 }
 
                 model.AddSeparator();
@@ -71,16 +71,16 @@ namespace TweetDuck.Core.Handling{
             if ((parameters.TypeFlags & (ContextMenuType.Editable | ContextMenuType.Selection)) == 0){
                 AddSeparator(model);
 
-                IMenuModel globalMenu = model.Count == 0 ? model : model.AddSubMenu((CefMenuCommand)MenuGlobal, Program.BrandName);
+                IMenuModel globalMenu = model.Count == 0 ? model : model.AddSubMenu(MenuGlobal, Program.BrandName);
             
                 globalMenu.AddItem(CefMenuCommand.Reload, TitleReloadBrowser);
-                globalMenu.AddCheckItem((CefMenuCommand)MenuMute, TitleMuteNotifications);
-                globalMenu.SetChecked((CefMenuCommand)MenuMute, Program.UserConfig.MuteNotifications);
+                globalMenu.AddCheckItem(MenuMute, TitleMuteNotifications);
+                globalMenu.SetChecked(MenuMute, Program.UserConfig.MuteNotifications);
                 globalMenu.AddSeparator();
 
-                globalMenu.AddItem((CefMenuCommand)MenuSettings, TitleSettings);
-                globalMenu.AddItem((CefMenuCommand)MenuPlugins, TitlePlugins);
-                globalMenu.AddItem((CefMenuCommand)MenuAbout, TitleAboutProgram);
+                globalMenu.AddItem(MenuSettings, TitleSettings);
+                globalMenu.AddItem(MenuPlugins, TitlePlugins);
+                globalMenu.AddItem(MenuAbout, TitleAboutProgram);
 
                 if (HasDevTools){
                     globalMenu.AddSeparator();
@@ -96,8 +96,8 @@ namespace TweetDuck.Core.Handling{
                 return true;
             }
 
-            switch((int)commandId){
-                case (int)CefMenuCommand.Reload:
+            switch(commandId){
+                case CefMenuCommand.Reload:
                     form.InvokeAsyncSafe(form.ReloadToTweetDeck);
                     return true;
 
@@ -118,11 +118,11 @@ namespace TweetDuck.Core.Handling{
                     return true;
 
                 case MenuOpenTweetUrl:
-                    BrowserUtils.OpenExternalBrowser(lastHighlightedTweet);
+                    OpenBrowser(form, lastHighlightedTweetUrl);
                     return true;
 
                 case MenuCopyTweetUrl:
-                    SetClipboardText(lastHighlightedTweet);
+                    SetClipboardText(form, lastHighlightedTweetUrl);
                     return true;
 
                 case MenuScreenshotTweet:
@@ -130,11 +130,11 @@ namespace TweetDuck.Core.Handling{
                     return true;
 
                 case MenuOpenQuotedTweetUrl:
-                    BrowserUtils.OpenExternalBrowser(lastHighlightedQuotedTweet);
+                    OpenBrowser(form, lastHighlightedQuoteUrl);
                     return true;
 
                 case MenuCopyQuotedTweetUrl:
-                    SetClipboardText(lastHighlightedQuotedTweet);
+                    SetClipboardText(form, lastHighlightedQuoteUrl);
                     return true;
             }
 

Core/Handling/ContextMenuGuide.cs

@@ -0,0 +1,15 @@
+using CefSharp;
+
+namespace TweetDuck.Core.Handling{
+    sealed class ContextMenuGuide : ContextMenuBase{
+        public override void OnBeforeContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model){
+            model.Clear();
+            base.OnBeforeContextMenu(browserControl, browser, frame, parameters, model);
+
+            if (HasDevTools){
+                AddSeparator(model);
+                AddDebugMenuItems(model);
+            }
+        }
+    }
+}

Core/Handling/ContextMenuNotification.cs

@@ -3,16 +3,17 @@ using TweetDuck.Core.Controls;
 using TweetDuck.Core.Notification;
 
 namespace TweetDuck.Core.Handling{
-    class ContextMenuNotification : ContextMenuBase{
-        private const int MenuSkipTweet = 26600;
-        private const int MenuFreeze = 26601;
-        private const int MenuCopyTweetUrl = 26602;
-        private const int MenuCopyQuotedTweetUrl = 26603;
+    sealed class ContextMenuNotification : ContextMenuBase{
+        private const CefMenuCommand MenuViewDetail         = (CefMenuCommand)26600;
+        private const CefMenuCommand MenuSkipTweet          = (CefMenuCommand)26601;
+        private const CefMenuCommand MenuFreeze             = (CefMenuCommand)26602;
+        private const CefMenuCommand MenuCopyTweetUrl       = (CefMenuCommand)26603;
+        private const CefMenuCommand MenuCopyQuotedTweetUrl = (CefMenuCommand)26604;
 
         private readonly FormNotificationBase form;
         private readonly bool enableCustomMenu;
 
-        public ContextMenuNotification(FormNotificationBase form, bool enableCustomMenu) : base(form){
+        public ContextMenuNotification(FormNotificationBase form, bool enableCustomMenu){
             this.form = form;
             this.enableCustomMenu = enableCustomMenu;
         }
@@ -28,23 +29,26 @@ namespace TweetDuck.Core.Handling{
             base.OnBeforeContextMenu(browserControl, browser, frame, parameters, model);
 
             if (enableCustomMenu){
-                model.AddItem((CefMenuCommand)MenuSkipTweet, "Skip tweet");
-                model.AddCheckItem((CefMenuCommand)MenuFreeze, "Freeze");
-                model.SetChecked((CefMenuCommand)MenuFreeze, form.FreezeTimer);
-                model.AddSeparator();
+                if (form.CanViewDetail){
+                    model.AddItem(MenuViewDetail, "View detail");
+                }
+
+                model.AddItem(MenuSkipTweet, "Skip tweet");
+                model.AddCheckItem(MenuFreeze, "Freeze");
+                model.SetChecked(MenuFreeze, form.FreezeTimer);
 
                 if (!string.IsNullOrEmpty(form.CurrentTweetUrl)){
-                    model.AddItem((CefMenuCommand)MenuCopyTweetUrl, "Copy tweet address");
+                    model.AddSeparator();
+                    model.AddItem(MenuCopyTweetUrl, "Copy tweet address");
 
                     if (!string.IsNullOrEmpty(form.CurrentQuoteUrl)){
-                        model.AddItem((CefMenuCommand)MenuCopyQuotedTweetUrl, "Copy quoted tweet address");
+                        model.AddItem(MenuCopyQuotedTweetUrl, "Copy quoted tweet address");
                     }
-
-                    model.AddSeparator();
                 }
             }
             
             if (HasDevTools){
+                AddSeparator(model);
                 AddDebugMenuItems(model);
             }
 
@@ -58,7 +62,7 @@ namespace TweetDuck.Core.Handling{
                 return true;
             }
 
-            switch((int)commandId){
+            switch(commandId){
                 case MenuSkipTweet:
                     form.InvokeAsyncSafe(form.FinishCurrentNotification);
                     return true;
@@ -67,12 +71,16 @@ namespace TweetDuck.Core.Handling{
                     form.InvokeAsyncSafe(() => form.FreezeTimer = !form.FreezeTimer);
                     return true;
 
+                case MenuViewDetail:
+                    form.InvokeSafe(form.ShowTweetDetail);
+                    return true;
+
                 case MenuCopyTweetUrl:
-                    SetClipboardText(form.CurrentTweetUrl);
+                    SetClipboardText(form, form.CurrentTweetUrl);
                     return true;
 
                 case MenuCopyQuotedTweetUrl:
-                    SetClipboardText(form.CurrentQuoteUrl);
+                    SetClipboardText(form, form.CurrentQuoteUrl);
                     return true;
             }
 

Core/Handling/DragHandlerBrowser.cs

@@ -0,0 +1,26 @@
+using System.Collections.Generic;
+using CefSharp;
+
+namespace TweetDuck.Core.Handling{
+    sealed class DragHandlerBrowser : IDragHandler{
+        public bool OnDragEnter(IWebBrowser browserControl, IBrowser browser, IDragData dragData, DragOperationsMask mask){
+            void TriggerDragStart(string type, string data = null){
+                browserControl.ExecuteScriptAsync("window.TDGF_onGlobalDragStart", type, data);
+            }
+
+            if (dragData.IsLink){
+                TriggerDragStart("link", dragData.LinkUrl);
+            }
+            else if (dragData.IsFragment){
+                TriggerDragStart("text", dragData.FragmentText.Trim());
+            }
+            else{
+                TriggerDragStart("unknown");
+            }
+
+            return false;
+        }
+
+        public void OnDraggableRegionsChanged(IWebBrowser browserControl, IBrowser browser, IList<DraggableRegion> regions){}
+    }
+}

Core/Handling/General/BrowserProcessHandler.cs

@@ -2,7 +2,7 @@
 using CefSharp;
 
 namespace TweetDuck.Core.Handling.General{
-    class BrowserProcessHandler : IBrowserProcessHandler{
+    sealed class BrowserProcessHandler : IBrowserProcessHandler{
         void IBrowserProcessHandler.OnContextInitialized(){
             using(IRequestContext ctx = Cef.GetGlobalRequestContext()){
                 ctx.SetPreference("browser.enable_spellchecking", Program.UserConfig.EnableSpellCheck, out string _);

Core/Handling/General/FileDialogHandler.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Windows.Forms;
+using CefSharp;
+
+namespace TweetDuck.Core.Handling.General{
+    sealed class FileDialogHandler : IDialogHandler{
+        public bool OnFileDialog(IWebBrowser browserControl, IBrowser browser, CefFileDialogMode mode, string title, string defaultFilePath, List<string> acceptFilters, int selectedAcceptFilter, IFileDialogCallback callback){
+            CefFileDialogMode dialogType = mode & CefFileDialogMode.TypeMask;
+
+            if (dialogType == CefFileDialogMode.Open || dialogType == CefFileDialogMode.OpenMultiple){
+                string allFilters = string.Join(";", acceptFilters.Select(filter => "*"+filter));
+
+                using(OpenFileDialog dialog = new OpenFileDialog{
+                    AutoUpgradeEnabled = true,
+                    DereferenceLinks = true,
+                    Multiselect = dialogType == CefFileDialogMode.OpenMultiple,
+                    Title = "Open Files",
+                    Filter = $"All Supported Formats ({allFilters})|{allFilters}|All Files (*.*)|*.*"
+                }){
+                    if (dialog.ShowDialog() == DialogResult.OK){
+                        string ext = Path.GetExtension(dialog.FileName);
+                        callback.Continue(acceptFilters.FindIndex(filter => filter.Equals(ext, StringComparison.OrdinalIgnoreCase)), dialog.FileNames.ToList());
+                    }
+                    else{
+                        callback.Cancel();
+                    }
+
+                    callback.Dispose();
+                }
+
+                return true;
+            }
+            else{
+                callback.Dispose();
+                return false;
+            }
+        }
+    }
+}

Core/Handling/General/JavaScriptDialogHandler.cs

@@ -7,32 +7,52 @@ using TweetDuck.Core.Other;
 using TweetDuck.Core.Utils;
 
 namespace TweetDuck.Core.Handling.General{
-    class JavaScriptDialogHandler : IJsDialogHandler{
+    sealed class JavaScriptDialogHandler : IJsDialogHandler{
+        private static FormMessage CreateMessageForm(string caption, string text){
+            MessageBoxIcon icon = MessageBoxIcon.None;
+            int pipe = text.IndexOf('|');
+
+            if (pipe != -1){
+                switch(text.Substring(0, pipe)){
+                    case "error": icon = MessageBoxIcon.Error; break;
+                    case "warning": icon = MessageBoxIcon.Warning; break;
+                    case "info": icon = MessageBoxIcon.Information; break;
+                    case "question": icon = MessageBoxIcon.Question; break;
+                    default: return new FormMessage(caption, text, icon);
+                }
+
+                text = text.Substring(pipe+1);
+            }
+
+            return new FormMessage(caption, text, icon);
+        }
+
         bool IJsDialogHandler.OnJSDialog(IWebBrowser browserControl, IBrowser browser, string originUrl, CefJsDialogType dialogType, string messageText, string defaultPromptText, IJsDialogCallback callback, ref bool suppressMessage){
             ((ChromiumWebBrowser)browserControl).InvokeSafe(() => {
                 FormMessage form;
                 TextBox input = null;
 
                 if (dialogType == CefJsDialogType.Alert){
-                    form = new FormMessage("Browser Message", messageText, MessageBoxIcon.None);
+                    form = CreateMessageForm("Browser Message", messageText);
                     form.AddButton(FormMessage.OK, ControlType.Accept | ControlType.Focused);
                 }
                 else if (dialogType == CefJsDialogType.Confirm){
-                    form = new FormMessage("Browser Confirmation", messageText, MessageBoxIcon.None);
+                    form = CreateMessageForm("Browser Confirmation", messageText);
                     form.AddButton(FormMessage.No, DialogResult.No, ControlType.Cancel);
                     form.AddButton(FormMessage.Yes, ControlType.Focused);
                 }
                 else if (dialogType == CefJsDialogType.Prompt){
-                    form = new FormMessage("Browser Prompt", messageText, MessageBoxIcon.None);
+                    form = CreateMessageForm("Browser Prompt", messageText);
                     form.AddButton(FormMessage.Cancel, DialogResult.Cancel, ControlType.Cancel);
                     form.AddButton(FormMessage.OK, ControlType.Accept | ControlType.Focused);
 
                     float dpiScale = form.GetDPIScale();
+                    int inputPad = form.HasIcon ? 43 : 0;
 
                     input = new TextBox{
                         Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Bottom,
-                        Location = new Point(BrowserUtils.Scale(22, dpiScale), form.ActionPanelY-BrowserUtils.Scale(46, dpiScale)),
-                        Size = new Size(form.ClientSize.Width-BrowserUtils.Scale(44, dpiScale), 20)
+                        Location = new Point(BrowserUtils.Scale(22+inputPad, dpiScale), form.ActionPanelY-BrowserUtils.Scale(46, dpiScale)),
+                        Size = new Size(form.ClientSize.Width-BrowserUtils.Scale(44+inputPad, dpiScale), 20)
                     };
 
                     form.Controls.Add(input);

Core/Handling/General/LifeSpanHandler.cs

@@ -1,8 +1,9 @@
 using CefSharp;
+using TweetDuck.Core.Controls;
 using TweetDuck.Core.Utils;
 
 namespace TweetDuck.Core.Handling.General{
-    class LifeSpanHandler : ILifeSpanHandler{
+    sealed class LifeSpanHandler : ILifeSpanHandler{
         public bool OnBeforePopup(IWebBrowser browserControl, IBrowser browser, IFrame frame, string targetUrl, string targetFrameName, WindowOpenDisposition targetDisposition, bool userGesture, IPopupFeatures popupFeatures, IWindowInfo windowInfo, IBrowserSettings browserSettings, ref bool noJavascriptAccess, out IWebBrowser newBrowser){
             newBrowser = null;
 
@@ -11,7 +12,7 @@ namespace TweetDuck.Core.Handling.General{
                 case WindowOpenDisposition.NewForegroundTab:
                 case WindowOpenDisposition.NewPopup:
                 case WindowOpenDisposition.NewWindow:
-                    BrowserUtils.OpenExternalBrowser(targetUrl);
+                    browserControl.AsControl().InvokeAsyncSafe(() => BrowserUtils.OpenExternalBrowser(targetUrl));
                     return true;
 
                 default:

Core/Handling/KeyboardHandlerBrowser.cs

@@ -10,11 +10,7 @@ namespace TweetDuck.Core.Handling{
         }
 
         bool IKeyboardHandler.OnPreKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey, ref bool isKeyboardShortcut){
-            if (type == KeyType.RawKeyDown && (Keys)windowsKeyCode == Keys.Space){
-                return form.ToggleVideoPause();
-            }
-
-            return false;
+            return type == KeyType.RawKeyDown && form.ProcessBrowserKey((Keys)windowsKeyCode);
         }
 
         bool IKeyboardHandler.OnKeyEvent(IWebBrowser browserControl, IBrowser browser, KeyType type, int windowsKeyCode, int nativeKeyCode, CefEventFlags modifiers, bool isSystemKey){

Core/Handling/RequestHandlerBrowser.cs

@@ -2,7 +2,7 @@
 using TweetDuck.Core.Handling.General;
 
 namespace TweetDuck.Core.Handling{
-    class RequestHandlerBrowser : RequestHandlerBase{
+    sealed class RequestHandlerBrowser : RequestHandlerBase{
         public override void OnRenderProcessTerminated(IWebBrowser browserControl, IBrowser browser, CefTerminationStatus status){
             browser.Reload();
         }

Core/Handling/ResourceHandlerNotification.cs

@@ -4,7 +4,7 @@ using System.IO;
 using System.Text;
 
 namespace TweetDuck.Core.Handling{
-    class ResourceHandlerNotification : IResourceHandler{
+    sealed class ResourceHandlerNotification : IResourceHandler{
         private readonly NameValueCollection headers = new NameValueCollection(0);
         private MemoryStream dataIn;
 

Core/Notification/FormNotificationBase.cs

@@ -4,6 +4,7 @@ using System;
 using System.Drawing;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
+using TweetDuck.Core.Bridge;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Handling;
 using TweetDuck.Core.Handling.General;
@@ -12,6 +13,18 @@ using TweetDuck.Core.Utils;
 
 namespace TweetDuck.Core.Notification{
     partial class FormNotificationBase : Form{
+        protected static int FontSizeLevel{
+            get{
+                switch(TweetDeckBridge.FontSize){
+                    case "largest": return 4;
+                    case "large": return 3;
+                    case "small": return 1;
+                    case "smallest": return 0;
+                    default: return 2;
+                }
+            }
+        }
+
         protected Point PrimaryLocation{
             get{
                 UserConfig config = Program.UserConfig;
@@ -73,25 +86,27 @@ namespace TweetDuck.Core.Notification{
 
         protected double SizeScale => dpiScale*Program.UserConfig.ZoomMultiplier;
 
-        protected readonly Form owner;
+        protected readonly FormBrowser owner;
         protected readonly ChromiumWebBrowser browser;
         
         private readonly ResourceHandlerNotification resourceHandler = new ResourceHandlerNotification();
         private readonly float dpiScale;
 
-        private string currentColumn;
+        private TweetNotification currentNotification;
         private int pauseCounter;
+        
+        public string CurrentTweetUrl => currentNotification?.TweetUrl;
+        public string CurrentQuoteUrl => currentNotification?.QuoteUrl;
 
+        public bool CanViewDetail => currentNotification != null && !string.IsNullOrEmpty(currentNotification.ColumnId) && !string.IsNullOrEmpty(currentNotification.ChirpId);
         public bool IsPaused => pauseCounter > 0;
-
+        
         public bool FreezeTimer { get; set; }
         public bool ContextMenuOpen { get; set; }
-        public string CurrentTweetUrl { get; private set; }
-        public string CurrentQuoteUrl { get; private set; }
 
         public event EventHandler Initialized;
 
-        public FormNotificationBase(Form owner, bool enableContextMenu){
+        protected FormNotificationBase(FormBrowser owner, bool enableContextMenu){
             InitializeComponent();
 
             this.owner = owner;
@@ -143,7 +158,7 @@ namespace TweetDuck.Core.Notification{
 
         private void Browser_IsBrowserInitializedChanged(object sender, IsBrowserInitializedChangedEventArgs e){
             if (e.IsBrowserInitialized){
-                Initialized?.Invoke(this, new EventArgs());
+                Initialized?.Invoke(this, EventArgs.Empty);
 
                 int identifier = browser.GetBrowser().Identifier;
                 Disposed += (sender2, args2) => BrowserProcesses.Forget(identifier);
@@ -158,7 +173,7 @@ namespace TweetDuck.Core.Notification{
             }
 
             Location = ControlExtensions.InvisibleLocation;
-            currentColumn = null;
+            currentNotification = null;
         }
 
         public virtual void FinishCurrentNotification(){}
@@ -181,10 +196,7 @@ namespace TweetDuck.Core.Notification{
         }
 
         protected virtual void LoadTweet(TweetNotification tweet){
-            CurrentTweetUrl = tweet.TweetUrl;
-            CurrentQuoteUrl = tweet.QuoteUrl;
-            currentColumn = tweet.Column;
-
+            currentNotification = tweet;
             resourceHandler.SetHTML(GetTweetHTML(tweet));
             browser.Load(TwitterUtils.TweetDeckURL);
         }
@@ -193,12 +205,13 @@ namespace TweetDuck.Core.Notification{
             browser.ClientSize = ClientSize = new Size(BrowserUtils.Scale(width, SizeScale), BrowserUtils.Scale(height, SizeScale));
         }
 
-        protected virtual void OnNotificationReady(){
-            MoveToVisibleLocation();
+        protected virtual void UpdateTitle(){
+            string title = currentNotification?.ColumnTitle;
+            Text = string.IsNullOrEmpty(title) || !Program.UserConfig.DisplayNotificationColumn ? Program.BrandName : Program.BrandName+" - "+title;
         }
 
-        protected virtual void UpdateTitle(){
-            Text = string.IsNullOrEmpty(currentColumn) || !Program.UserConfig.DisplayNotificationColumn ? Program.BrandName : Program.BrandName+" - "+currentColumn;
+        public void ShowTweetDetail(){
+            owner.ShowTweetDetail(currentNotification.ColumnId, currentNotification.ChirpId, currentNotification.TweetUrl);
         }
 
         public void MoveToVisibleLocation(){

Core/Notification/FormNotificationMain.cs

@@ -33,7 +33,7 @@ namespace TweetDuck.Core.Notification{
 
         public bool RequiresResize{
             get{
-                return !prevDisplayTimer.HasValue || !prevFontSize.HasValue || prevDisplayTimer != Program.UserConfig.DisplayNotificationTimer || prevFontSize != TweetNotification.FontSizeLevel || CanResizeWindow;
+                return !prevDisplayTimer.HasValue || !prevFontSize.HasValue || prevDisplayTimer != Program.UserConfig.DisplayNotificationTimer || prevFontSize != FontSizeLevel || CanResizeWindow;
             }
 
             set{
@@ -43,7 +43,7 @@ namespace TweetDuck.Core.Notification{
                 }
                 else{
                     prevDisplayTimer = Program.UserConfig.DisplayNotificationTimer;
-                    prevFontSize = TweetNotification.FontSizeLevel;
+                    prevFontSize = FontSizeLevel;
                 }
             }
         }
@@ -52,7 +52,7 @@ namespace TweetDuck.Core.Notification{
             get{
                 switch(Program.UserConfig.NotificationSize){
                     default:
-                        return BrowserUtils.Scale(284, SizeScale*(1.0+0.05*TweetNotification.FontSizeLevel));
+                        return BrowserUtils.Scale(284, SizeScale*(1.0+0.05*FontSizeLevel));
 
                     case TweetNotification.Size.Custom:
                         return Program.UserConfig.CustomNotificationSize.Width;
@@ -64,7 +64,7 @@ namespace TweetDuck.Core.Notification{
             get{
                 switch(Program.UserConfig.NotificationSize){
                     default:
-                        return BrowserUtils.Scale(122, SizeScale*(1.0+0.075*TweetNotification.FontSizeLevel));
+                        return BrowserUtils.Scale(122, SizeScale*(1.0+0.075*FontSizeLevel));
 
                     case TweetNotification.Size.Custom:
                         return Program.UserConfig.CustomNotificationSize.Height;
@@ -279,7 +279,7 @@ namespace TweetDuck.Core.Notification{
             StartMouseHook();
         }
 
-        protected override void OnNotificationReady(){
+        protected virtual void OnNotificationReady(){
             PrepareAndDisplayWindow();
             timerProgress.Start();
         }

Core/Notification/Screenshot/FormNotificationScreenshotable.cs

@@ -14,7 +14,7 @@ namespace TweetDuck.Core.Notification.Screenshot{
     sealed class FormNotificationScreenshotable : FormNotificationBase{
         private readonly PluginManager plugins;
 
-        public FormNotificationScreenshotable(Action callback, Form owner, PluginManager pluginManager) : base(owner, false){
+        public FormNotificationScreenshotable(Action callback, FormBrowser owner, PluginManager pluginManager) : base(owner, false){
             this.plugins = pluginManager;
 
             browser.RegisterAsyncJsObject("$TD_NotificationScreenshot", new CallbackBridge(this, callback));
@@ -22,7 +22,7 @@ namespace TweetDuck.Core.Notification.Screenshot{
             browser.LoadingStateChanged += (sender, args) => {
                 if (!args.IsLoading){
                     using(IFrame frame = args.Browser.MainFrame){
-                        ScriptLoader.ExecuteScript(frame, "window.setTimeout($TD_NotificationScreenshot.trigger, 129)", "gen:screenshot");
+                        ScriptLoader.ExecuteScript(frame, "window.setTimeout($TD_NotificationScreenshot.trigger, document.getElementsByTagName('iframe').length ? 267 : 67)", "gen:screenshot");
                     }
                 }
             };

Core/Notification/Screenshot/TweetScreenshotManager.cs

@@ -46,7 +46,7 @@ namespace TweetDuck.Core.Notification.Screenshot{
                 CanMoveWindow = () => false
             };
 
-            screenshot.LoadNotificationForScreenshot(new TweetNotification(string.Empty, html, 0, string.Empty, string.Empty), width, height);
+            screenshot.LoadNotificationForScreenshot(new TweetNotification(string.Empty, string.Empty, string.Empty, html, 0, string.Empty, string.Empty), width, height);
             screenshot.Show();
             timeout.Start();
 

Core/Notification/SoundNotification.cs

@@ -17,6 +17,10 @@ namespace TweetDuck.Core.Notification{
             player.Play(file);
         }
 
+        public bool SetVolume(int volume){
+            return player.SetVolume(volume);
+        }
+
         private void Player_PlaybackError(object sender, PlaybackErrorEventArgs e){
             PlaybackError?.Invoke(this, e);
         }

Core/Notification/TweetNotification.cs

@@ -1,27 +1,12 @@
 using System;
 using System.Text;
+using TweetDuck.Core.Bridge;
 using TweetDuck.Resources;
 
 namespace TweetDuck.Core.Notification{
     sealed class TweetNotification{
-        private static string FontSizeClass { get; set; }
-        private static string HeadTag { get; set; }
-
-        private const string DefaultFontSizeClass = "medium";
-        private const string DefaultHeadTag = @"<meta charset='utf-8'><meta http-equiv='X-UA-Compatible' content='chrome=1'><link rel='stylesheet' href='https://ton.twimg.com/tweetdeck-web/web/css/font.5ef884f9f9.css'><link rel='stylesheet' href='https://ton.twimg.com/tweetdeck-web/web/css/app-dark.5631e0dd42.css'><style type='text/css'>body{background:#222426}</style>";
-        private const string CustomCSS = @"body:before{content:none}body{overflow-y:auto}.scroll-styled-v::-webkit-scrollbar{width:7px}.scroll-styled-v::-webkit-scrollbar-thumb{border-radius:0}.scroll-styled-v::-webkit-scrollbar-track{border-left:0}#td-skip{opacity:0;cursor:pointer;transition:opacity 0.15s ease}.td-hover #td-skip{opacity:0.75}#td-skip:hover{opacity:1}.media-size-medium{height:calc(100vh - 16px)!important;max-height:240px;border-radius:1px!important}.js-quote-detail .media-size-medium{height:calc(100vh - 28px)!important;}.js-media.margin-vm, .js-media-preview-container.margin-vm{margin-bottom:0!important}";
-
-        public static int FontSizeLevel{
-            get{
-                switch(FontSizeClass){
-                    case "largest": return 4;
-                    case "large": return 3;
-                    case "medium": return 2;
-                    case "small": return 1;
-                    default: return 0;
-                }
-            }
-        }
+        private const string DefaultHeadLayout = @"<html class='os-windows txt-size--14' data-td-font='medium' data-td-theme='dark'><head><meta charset='utf-8'><meta http-equiv='X-UA-Compatible' content='chrome=1'><link rel='stylesheet' href='https://ton.twimg.com/tweetdeck-web/web/css/font.5ef884f9f9.css'><link rel='stylesheet' href='https://ton.twimg.com/tweetdeck-web/web/css/app-dark.5631e0dd42.css'><style type='text/css'>body{background:#222426}</style>";
+        private static readonly string CustomCSS = ScriptLoader.LoadResource("styles/notification.css");
 
         private static string ExampleTweetHTML;
 
@@ -35,18 +20,10 @@ namespace TweetDuck.Core.Notification{
                     #endif
                 }
 
-                return new TweetNotification("Home", ExampleTweetHTML, 95, string.Empty, string.Empty, true);
+                return new TweetNotification(string.Empty, string.Empty, "Home", ExampleTweetHTML, 95, string.Empty, string.Empty, true);
             }
         }
 
-        public static void SetFontSizeClass(string newFSClass){
-            FontSizeClass = newFSClass;
-        }
-
-        public static void SetHeadTag(string headContents){
-            HeadTag = headContents;
-        }
-
         public enum Position{
             TopLeft, TopRight, BottomLeft, BottomRight, Custom
         }
@@ -55,7 +32,10 @@ namespace TweetDuck.Core.Notification{
             Auto, Custom
         }
 
-        public string Column { get; }
+        public string ColumnId { get; }
+        public string ChirpId { get; }
+
+        public string ColumnTitle { get; }
         public string TweetUrl { get; }
         public string QuoteUrl { get; }
         
@@ -63,10 +43,13 @@ namespace TweetDuck.Core.Notification{
         private readonly int characters;
         private readonly bool isExample;
 
-        public TweetNotification(string column, string html, int characters, string tweetUrl, string quoteUrl) : this(column, html, characters, tweetUrl, quoteUrl, false){}
+        public TweetNotification(string columnId, string chirpId, string title, string html, int characters, string tweetUrl, string quoteUrl) : this(columnId, chirpId, title, html, characters, tweetUrl, quoteUrl, false){}
 
-        private TweetNotification(string column, string html, int characters, string tweetUrl, string quoteUrl, bool isExample){
-            this.Column = column;
+        private TweetNotification(string columnId, string chirpId, string title, string html, int characters, string tweetUrl, string quoteUrl, bool isExample){
+            this.ColumnId = columnId;
+            this.ChirpId = chirpId;
+
+            this.ColumnTitle = title;
             this.TweetUrl = tweetUrl;
             this.QuoteUrl = quoteUrl;
 
@@ -82,8 +65,7 @@ namespace TweetDuck.Core.Notification{
         public string GenerateHtml(string bodyClasses = null, bool enableCustomCSS = true){
             StringBuilder build = new StringBuilder();
             build.Append("<!DOCTYPE html>");
-            build.Append("<html class='os-windows txt-base-").Append(FontSizeClass ?? DefaultFontSizeClass).Append("'>");
-            build.Append("<head>").Append(HeadTag ?? DefaultHeadTag);
+            build.Append(TweetDeckBridge.NotificationHeadLayout ?? DefaultHeadLayout);
             
             if (enableCustomCSS){
                 build.Append("<style type='text/css'>").Append(CustomCSS).Append("</style>");

Core/Other/FormAbout.Designer.cs

@@ -131,11 +131,14 @@ namespace TweetDuck.Core.Other {
             this.Controls.Add(this.labelDescription);
             this.Controls.Add(this.pictureLogo);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
+            this.HelpButton = true;
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "FormAbout";
             this.ShowIcon = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.HelpButtonClicked += new System.ComponentModel.CancelEventHandler(this.FormAbout_HelpButtonClicked);
+            this.HelpRequested += new System.Windows.Forms.HelpEventHandler(this.FormAbout_HelpRequested);
             ((System.ComponentModel.ISupportInitialize)(this.pictureLogo)).EndInit();
             this.tablePanelLinks.ResumeLayout(false);
             this.tablePanelLinks.PerformLayout();

Core/Other/FormAbout.cs

@@ -1,4 +1,6 @@
-using System.Windows.Forms;
+using System.ComponentModel;
+using System.Windows.Forms;
+using TweetDuck.Core.Controls;
 using TweetDuck.Core.Utils;
 
 namespace TweetDuck.Core.Other{
@@ -21,5 +23,19 @@ namespace TweetDuck.Core.Other{
         private void OnLinkClicked(object sender, LinkLabelLinkClickedEventArgs e){
             BrowserUtils.OpenExternalBrowserUnsafe(e.Link.LinkData as string);
         }
+
+        private void FormAbout_HelpRequested(object sender, HelpEventArgs hlpevent){
+            ShowGuide();
+        }
+
+        private void FormAbout_HelpButtonClicked(object sender, CancelEventArgs e){
+            e.Cancel = true;
+            ShowGuide();
+        }
+
+        private void ShowGuide(){
+            new FormGuide().Show();
+            Close();
+        }
     }
 }

Core/Other/FormGuide.Designer.cs

@@ -0,0 +1,44 @@
+namespace TweetDuck.Core.Other {
+    partial class FormGuide {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing) {
+            if (disposing && (components != null)) {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent() {
+            this.SuspendLayout();
+            // 
+            // FormGuide
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(34)))), ((int)(((byte)(34)))), ((int)(((byte)(34)))));
+            this.ClientSize = new System.Drawing.Size(424, 282);
+            this.Icon = global::TweetDuck.Properties.Resources.icon;
+            this.MinimumSize = new System.Drawing.Size(440, 320);
+            this.Name = "FormGuide";
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+    }
+}

Core/Other/FormGuide.cs

@@ -0,0 +1,71 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using CefSharp;
+using CefSharp.WinForms;
+using TweetDuck.Core.Controls;
+using TweetDuck.Core.Handling;
+using TweetDuck.Core.Handling.General;
+using TweetDuck.Core.Utils;
+
+namespace TweetDuck.Core.Other{
+    sealed partial class FormGuide : Form{
+        private const string GuideUrl = "https://tweetduck.chylex.com/guide/v1/";
+
+        private readonly ChromiumWebBrowser browser;
+
+        public FormGuide(){
+            InitializeComponent();
+
+            Text = Program.BrandName+" Guide";
+
+            FormBrowser owner = FormManager.TryFind<FormBrowser>();
+
+            if (owner != null){
+                Size = new Size(owner.Size.Width*3/4, owner.Size.Height*3/4);
+                VisibleChanged += (sender, args) => this.MoveToCenter(owner);
+            }
+            
+            this.browser = new ChromiumWebBrowser(GuideUrl){
+                MenuHandler = new ContextMenuGuide(),
+                JsDialogHandler = new JavaScriptDialogHandler(),
+                LifeSpanHandler = new LifeSpanHandler(),
+                RequestHandler = new RequestHandlerBrowser()
+            };
+
+            browser.LoadingStateChanged += browser_LoadingStateChanged;
+            browser.FrameLoadStart += browser_FrameLoadStart;
+            
+            browser.BrowserSettings.BackgroundColor = (uint)BackColor.ToArgb();
+            browser.Dock = DockStyle.None;
+            browser.Location = ControlExtensions.InvisibleLocation;
+            Controls.Add(browser);
+
+            Disposed += (sender, args) => {
+                Program.UserConfig.ZoomLevelChanged -= Config_ZoomLevelChanged;
+                browser.Dispose();
+            };
+
+            Program.UserConfig.ZoomLevelChanged += Config_ZoomLevelChanged;
+        }
+
+        private void browser_LoadingStateChanged(object sender, LoadingStateChangedEventArgs e){
+            if (!e.IsLoading){
+                this.InvokeAsyncSafe(() => {
+                    browser.Location = Point.Empty;
+                    browser.Dock = DockStyle.Fill;
+                });
+
+                browser.LoadingStateChanged -= browser_LoadingStateChanged;
+            }
+        }
+
+        private void browser_FrameLoadStart(object sender, FrameLoadStartEventArgs e){
+            BrowserUtils.SetZoomLevel(browser.GetBrowser(), Program.UserConfig.ZoomLevel);
+        }
+
+        private void Config_ZoomLevelChanged(object sender, EventArgs e){
+            BrowserUtils.SetZoomLevel(browser.GetBrowser(), Program.UserConfig.ZoomLevel);
+        }
+    }
+}

Core/Other/FormMessage.cs

@@ -60,6 +60,7 @@ namespace TweetDuck.Core.Other{
 
         public Button ClickedButton { get; private set; }
 
+        public bool HasIcon => icon != null;
         public int ActionPanelY => panelActions.Location.Y;
 
         private int ClientWidth{

Core/Other/FormSettings.cs

@@ -19,6 +19,8 @@ namespace TweetDuck.Core.Other{
         private readonly Dictionary<Type, SettingsTab> tabs = new Dictionary<Type, SettingsTab>(4);
         private SettingsTab currentTab;
 
+        public bool ShouldReloadBrowser { get; private set; }
+
         public FormSettings(FormBrowser browser, PluginManager plugins, UpdateHandler updates, Type startTab){
             InitializeComponent();
 
@@ -32,8 +34,10 @@ namespace TweetDuck.Core.Other{
             this.buttonHeight = BrowserUtils.Scale(39, this.GetDPIScale()) | 1;
 
             AddButton("General", () => new TabSettingsGeneral(updates));
+            AddButton("System Tray", () => new TabSettingsTray());
             AddButton("Notifications", () => new TabSettingsNotifications(browser.CreateNotificationForm(false)));
             AddButton("Sounds", () => new TabSettingsSounds());
+            AddButton("Feedback", () => new TabSettingsFeedback());
             AddButton("Advanced", () => new TabSettingsAdvanced(browser.ReinjectCustomCSS));
 
             SelectTab(tabs[startTab ?? typeof(TabSettingsGeneral)]);
@@ -52,13 +56,19 @@ namespace TweetDuck.Core.Other{
         }
 
         private void btnManageOptions_Click(object sender, EventArgs e){
-            using(DialogSettingsManage dialog = new DialogSettingsManage(plugins)){
-                if (dialog.ShowDialog() == DialogResult.OK && dialog.ShouldReloadUI){
-                    foreach(SettingsTab tab in tabs.Values){
-                        tab.Control = null;
-                    }
+            foreach(SettingsTab tab in tabs.Values){
+                if (tab.IsInitialized){
+                    tab.Control.OnClosing();
+                }
+            }
 
-                    SelectTab(currentTab);
+            using(DialogSettingsManage dialog = new DialogSettingsManage(plugins)){
+                if (dialog.ShowDialog() == DialogResult.OK){
+                    FormClosing -= FormSettings_FormClosing;
+                    browser.ResumeNotification();
+
+                    ShouldReloadBrowser = dialog.ShouldReloadBrowser;
+                    Close();
                 }
             }
         }
@@ -120,11 +130,16 @@ namespace TweetDuck.Core.Other{
                 tab.Control.OnReady();
             }
             
+            panelContents.VerticalScroll.Enabled = false; // required to stop animation that would otherwise break everything
+            panelContents.PerformLayout();
+
             panelContents.SuspendLayout();
             panelContents.VerticalScroll.Value = 0; // https://gfycat.com/GrotesqueTastyAstarte
             panelContents.Controls.Clear();
             panelContents.Controls.Add(tab.Control);
             panelContents.ResumeLayout(true);
+
+            panelContents.VerticalScroll.Enabled = true;
             panelContents.Focus();
 
             currentTab = tab;
@@ -139,7 +154,7 @@ namespace TweetDuck.Core.Other{
             panelContents.Focus();
         }
 
-        private class SettingsTab{
+        private sealed class SettingsTab{
             public Button Button { get; }
 
             public BaseTabSettings Control{

Core/Other/Management/VideoPlayer.cs

@@ -68,8 +68,8 @@ namespace TweetDuck.Core.Other.Management{
             }
         }
 
-        public void TogglePause(){
-            currentPipe?.Write("pause");
+        public void SendKeyEvent(Keys key){
+            currentPipe?.Write("key", ((int)key).ToString());
         }
 
         private void currentPipe_DataIn(object sender, DuplexPipe.PipeReadEventArgs e){
@@ -83,6 +83,10 @@ namespace TweetDuck.Core.Other.Management{
 
                         break;
 
+                    case "download":
+                        TwitterUtils.DownloadVideo(lastUrl);
+                        break;
+
                     case "rip":
                         currentPipe.Dispose();
                         currentPipe = null;
@@ -143,7 +147,15 @@ namespace TweetDuck.Core.Other.Management{
         }
 
         private void process_Exited(object sender, EventArgs e){
-            switch(currentProcess.ExitCode){
+            int exitCode = currentProcess.ExitCode;
+
+            currentProcess.Dispose();
+            currentProcess = null;
+
+            currentPipe.Dispose();
+            currentPipe = null;
+
+            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 a browser?", FormMessage.Yes, FormMessage.No)){
                         BrowserUtils.OpenExternalBrowser(lastUrl);
@@ -158,18 +170,12 @@ namespace TweetDuck.Core.Other.Management{
 
                     break;
             }
-
-            currentProcess.Dispose();
-            currentProcess = null;
-
-            currentPipe.Dispose();
-            currentPipe = null;
             
             owner.InvokeAsyncSafe(TriggerProcessExitEventUnsafe);
         }
 
         private void TriggerProcessExitEventUnsafe(){
-            ProcessExited?.Invoke(this, new EventArgs());
+            ProcessExited?.Invoke(this, EventArgs.Empty);
         }
     }
 }

Core/Other/Settings/BaseTabSettings.cs

@@ -17,7 +17,7 @@ namespace TweetDuck.Core.Other.Settings{
             }
         }
 
-        public BaseTabSettings(){
+        protected BaseTabSettings(){
             Padding = new Padding(6);
         }
 

Core/Other/Settings/Dialogs/DialogSettingsManage.cs

@@ -1,12 +1,14 @@
 using System;
+using System.IO;
 using System.Windows.Forms;
+using TweetDuck.Configuration;
 using TweetDuck.Core.Other.Settings.Export;
 using TweetDuck.Plugins;
 
 namespace TweetDuck.Core.Other.Settings.Dialogs{
     sealed partial class DialogSettingsManage : Form{
         private enum State{
-            Deciding, Import, Export
+            Deciding, Reset, Import, Export
         }
 
         public ExportFileFlags Flags{
@@ -20,7 +22,7 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
             }
         }
 
-        public bool ShouldReloadUI { get; private set; }
+        public bool ShouldReloadBrowser { get; private set; }
         
         private readonly PluginManager plugins;
         private State currentState;
@@ -58,15 +60,10 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
                 case State.Deciding:
                     // Reset
                     if (radioReset.Checked){
-                        if (FormMessage.Warning("Reset TweetDuck Options", "This will reset all of your program options. Plugins will not be affected. Do you want to proceed?", FormMessage.Yes, FormMessage.No)){
-                            Program.ResetConfig();
+                        currentState = State.Reset;
 
-                            ShouldReloadUI = true;
-                            DialogResult = DialogResult.OK;
-                            Close();
-                        }
-
-                        return;
+                        Text = "Restore Defaults";
+                        Flags = ExportFileFlags.Config;
                     }
 
                     // Import
@@ -109,10 +106,43 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
                     panelExport.Visible = true;
                     break;
 
+                case State.Reset:
+                    if (FormMessage.Warning("Reset TweetDuck Options", "This will reset the selected items. Are you sure you want to proceed?", FormMessage.Yes, FormMessage.No)){
+                        if (Flags.HasFlag(ExportFileFlags.Config)){
+                            Program.ResetConfig();
+                        }
+
+                        if (Flags.HasFlag(ExportFileFlags.PluginData)){
+                            try{
+                                File.Delete(Program.PluginConfigFilePath);
+                                Directory.Delete(Program.PluginDataPath, true);
+                            }catch(Exception ex){
+                                Program.Reporter.HandleException("Plugin Data Reset Error", "Could not delete plugin data.", true, ex);
+                            }
+                        }
+
+                        if (Flags.HasFlag(ExportFileFlags.Session)){
+                            Program.Restart(Arguments.ArgDeleteCookies);
+                        }
+                        else{
+                            ShouldReloadBrowser = true;
+                        }
+
+                        DialogResult = DialogResult.OK;
+                        Close();
+                    }
+
+                    break;
+
                 case State.Import:
                     if (importManager.Import(Flags)){
-                        if (!importManager.IsRestarting){
-                            ShouldReloadUI = true;
+                        Program.UserConfig.Reload();
+
+                        if (importManager.IsRestarting){
+                            Program.Restart(Arguments.ArgImportCookies);
+                        }
+                        else{
+                            ShouldReloadBrowser = true;
                         }
                     }
                     else{
@@ -165,6 +195,9 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
             if (currentState == State.Import){
                 btnContinue.Text = selectedFlags.HasFlag(ExportFileFlags.Session) ? "Import && Restart" : "Import Profile";
             }
+            else if (currentState == State.Reset){
+                btnContinue.Text = selectedFlags.HasFlag(ExportFileFlags.Session) ? "Restore && Restart" : "Restore Defaults";
+            }
         }
     }
 }

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

@@ -29,20 +29,22 @@
             this.cbLogging = new System.Windows.Forms.CheckBox();
             this.toolTip = new System.Windows.Forms.ToolTip(this.components);
             this.cbDebugUpdates = new System.Windows.Forms.CheckBox();
-            this.labelLocale = new System.Windows.Forms.Label();
             this.comboLocale = new System.Windows.Forms.ComboBox();
-            this.labelDataFolder = new System.Windows.Forms.Label();
             this.tbDataFolder = new System.Windows.Forms.TextBox();
+            this.tbShortcutTarget = new System.Windows.Forms.TextBox();
+            this.labelLocale = new System.Windows.Forms.Label();
+            this.labelDataFolder = new System.Windows.Forms.Label();
+            this.labelShortcutTarget = new System.Windows.Forms.Label();
             this.SuspendLayout();
             // 
             // btnCancel
             // 
             this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnCancel.Location = new System.Drawing.Point(160, 171);
+            this.btnCancel.Location = new System.Drawing.Point(216, 217);
             this.btnCancel.Name = "btnCancel";
             this.btnCancel.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
             this.btnCancel.Size = new System.Drawing.Size(56, 23);
-            this.btnCancel.TabIndex = 7;
+            this.btnCancel.TabIndex = 9;
             this.btnCancel.Text = "Cancel";
             this.btnCancel.UseVisualStyleBackColor = true;
             this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
@@ -50,11 +52,11 @@
             // btnRestart
             // 
             this.btnRestart.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnRestart.Location = new System.Drawing.Point(97, 171);
+            this.btnRestart.Location = new System.Drawing.Point(153, 217);
             this.btnRestart.Name = "btnRestart";
             this.btnRestart.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
             this.btnRestart.Size = new System.Drawing.Size(57, 23);
-            this.btnRestart.TabIndex = 6;
+            this.btnRestart.TabIndex = 8;
             this.btnRestart.Text = "Restart";
             this.btnRestart.UseVisualStyleBackColor = true;
             this.btnRestart.Click += new System.EventHandler(this.btnRestart_Click);
@@ -67,7 +69,7 @@
             this.cbLogging.Size = new System.Drawing.Size(64, 17);
             this.cbLogging.TabIndex = 0;
             this.cbLogging.Text = "Logging";
-            this.toolTip.SetToolTip(this.cbLogging, "Logging JavaScript output into a\r\ndebug.txt file in the data folder.");
+            this.toolTip.SetToolTip(this.cbLogging, "Logging JavaScript output into TD_Console.txt file in the data folder.");
             this.cbLogging.UseVisualStyleBackColor = true;
             // 
             // cbDebugUpdates
@@ -81,6 +83,40 @@
             this.toolTip.SetToolTip(this.cbDebugUpdates, "Allows updating to pre-releases.");
             this.cbDebugUpdates.UseVisualStyleBackColor = true;
             // 
+            // comboLocale
+            // 
+            this.comboLocale.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.comboLocale.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboLocale.FormattingEnabled = true;
+            this.comboLocale.Location = new System.Drawing.Point(15, 83);
+            this.comboLocale.Name = "comboLocale";
+            this.comboLocale.Size = new System.Drawing.Size(257, 21);
+            this.comboLocale.TabIndex = 3;
+            this.toolTip.SetToolTip(this.comboLocale, "Language used for spell checking.");
+            // 
+            // tbDataFolder
+            // 
+            this.tbDataFolder.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.tbDataFolder.Location = new System.Drawing.Point(15, 135);
+            this.tbDataFolder.Name = "tbDataFolder";
+            this.tbDataFolder.Size = new System.Drawing.Size(257, 20);
+            this.tbDataFolder.TabIndex = 5;
+            this.toolTip.SetToolTip(this.tbDataFolder, "Path to the data folder. Must be either an absolute path,\r\nor a simple folder name that will be created in LocalAppData.");
+            // 
+            // tbShortcutTarget
+            // 
+            this.tbShortcutTarget.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.tbShortcutTarget.Cursor = System.Windows.Forms.Cursors.Hand;
+            this.tbShortcutTarget.Location = new System.Drawing.Point(15, 186);
+            this.tbShortcutTarget.Name = "tbShortcutTarget";
+            this.tbShortcutTarget.ReadOnly = true;
+            this.tbShortcutTarget.Size = new System.Drawing.Size(257, 20);
+            this.tbShortcutTarget.TabIndex = 7;
+            this.tbShortcutTarget.Click += new System.EventHandler(this.tbShortcutTarget_Click);
+            // 
             // labelLocale
             // 
             this.labelLocale.AutoSize = true;
@@ -91,16 +127,6 @@
             this.labelLocale.TabIndex = 2;
             this.labelLocale.Text = "Locale";
             // 
-            // comboLocale
-            // 
-            this.comboLocale.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.comboLocale.FormattingEnabled = true;
-            this.comboLocale.Location = new System.Drawing.Point(15, 83);
-            this.comboLocale.Name = "comboLocale";
-            this.comboLocale.Size = new System.Drawing.Size(201, 21);
-            this.comboLocale.TabIndex = 3;
-            // 
             // labelDataFolder
             // 
             this.labelDataFolder.AutoSize = true;
@@ -111,20 +137,23 @@
             this.labelDataFolder.TabIndex = 4;
             this.labelDataFolder.Text = "Data Folder";
             // 
-            // tbDataFolder
+            // labelShortcutTarget
             // 
-            this.tbDataFolder.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbDataFolder.Location = new System.Drawing.Point(15, 135);
-            this.tbDataFolder.Name = "tbDataFolder";
-            this.tbDataFolder.Size = new System.Drawing.Size(201, 20);
-            this.tbDataFolder.TabIndex = 5;
+            this.labelShortcutTarget.AutoSize = true;
+            this.labelShortcutTarget.Location = new System.Drawing.Point(12, 170);
+            this.labelShortcutTarget.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
+            this.labelShortcutTarget.Name = "labelShortcutTarget";
+            this.labelShortcutTarget.Size = new System.Drawing.Size(155, 13);
+            this.labelShortcutTarget.TabIndex = 6;
+            this.labelShortcutTarget.Text = "Shortcut Target (click to select)";
             // 
             // DialogSettingsRestart
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(228, 206);
+            this.ClientSize = new System.Drawing.Size(284, 252);
+            this.Controls.Add(this.tbShortcutTarget);
+            this.Controls.Add(this.labelShortcutTarget);
             this.Controls.Add(this.tbDataFolder);
             this.Controls.Add(this.labelDataFolder);
             this.Controls.Add(this.comboLocale);
@@ -155,5 +184,7 @@
         private System.Windows.Forms.ComboBox comboLocale;
         private System.Windows.Forms.Label labelDataFolder;
         private System.Windows.Forms.TextBox tbDataFolder;
+        private System.Windows.Forms.TextBox tbShortcutTarget;
+        private System.Windows.Forms.Label labelShortcutTarget;
     }
 }

Core/Other/Settings/Dialogs/DialogSettingsRestart.cs

@@ -24,12 +24,26 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
             cbLogging.Checked = currentArgs.HasFlag(Arguments.ArgLogging);
             cbDebugUpdates.Checked = currentArgs.HasFlag(Arguments.ArgDebugUpdates);
             comboLocale.SelectedItem = currentArgs.GetValue(Arguments.ArgLocale, DefaultLocale);
-            tbDataFolder.Text = currentArgs.GetValue(Arguments.ArgDataFolder, string.Empty);
+
+            cbLogging.CheckedChanged += control_Change;
+            cbDebugUpdates.CheckedChanged += control_Change;
+            comboLocale.SelectedValueChanged += control_Change;
+
+            if (Program.IsPortable){
+                tbDataFolder.Text = "Not available in portable version";
+                tbDataFolder.Enabled = false;
+            }
+            else{
+                tbDataFolder.Text = currentArgs.GetValue(Arguments.ArgDataFolder, string.Empty);
+                tbDataFolder.TextChanged += control_Change;
+            }
+
+            control_Change(this, EventArgs.Empty);
 
             Text = Program.BrandName+" Arguments";
         }
 
-        private void btnRestart_Click(object sender, EventArgs e){
+        private void control_Change(object sender, EventArgs e){
             Args = new CommandLineArgs();
             
             if (cbLogging.Checked){
@@ -46,10 +60,21 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
                 Args.SetValue(Arguments.ArgLocale, locale);
             }
 
-            if (!string.IsNullOrWhiteSpace(tbDataFolder.Text)){
+            if (!string.IsNullOrWhiteSpace(tbDataFolder.Text) && tbDataFolder.Enabled){
                 Args.SetValue(Arguments.ArgDataFolder, tbDataFolder.Text);
             }
 
+            tbShortcutTarget.Text = $@"""{Application.ExecutablePath}""{(Args.Count > 0 ? " " : "")}{Args}";
+            tbShortcutTarget.Select(tbShortcutTarget.Text.Length, 0);
+        }
+
+        private void tbShortcutTarget_Click(object sender, EventArgs e){
+            if (tbShortcutTarget.SelectionLength == 0){
+                tbShortcutTarget.SelectAll();
+            }
+        }
+
+        private void btnRestart_Click(object sender, EventArgs e){
             DialogResult = DialogResult.OK;
             Close();
         }

Core/Other/Settings/Export/ExportManager.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using TweetDuck.Configuration;
 using TweetDuck.Data;
 using TweetDuck.Plugins;
 using TweetDuck.Plugins.Enums;
@@ -141,13 +140,6 @@ namespace TweetDuck.Core.Other.Settings.Export{
                     FormMessage.Information("Importing TweetDuck Profile", "Detected missing plugins when importing plugin data:\n"+string.Join("\n", missingPlugins), FormMessage.OK);
                 }
 
-                if (IsRestarting){
-                    Program.Restart(Arguments.ArgImportCookies);
-                }
-                else{
-                    Program.ReloadConfig();
-                }
-
                 return true;
             }catch(Exception e){
                 LastException = e;
@@ -169,6 +161,16 @@ namespace TweetDuck.Core.Other.Settings.Export{
             }
         }
 
+        public static void DeleteCookies(){
+            try{
+                if (File.Exists(CookiesPath)){
+                    File.Delete(CookiesPath);
+                }
+            }catch(Exception e){
+                Program.Reporter.HandleException("Session Reset Error", "Could not remove the cookie file to reset the login session.", true, e);
+            }
+        }
+
         private static IEnumerable<PathInfo> EnumerateFilesRelative(string root){
             return Directory.Exists(root) ? Directory.EnumerateFiles(root, "*.*", SearchOption.AllDirectories).Select(fullPath => new PathInfo{
                 Full = fullPath,
@@ -176,7 +178,7 @@ namespace TweetDuck.Core.Other.Settings.Export{
             }) : Enumerable.Empty<PathInfo>();
         }
 
-        private class PathInfo{
+        private sealed class PathInfo{
             public string Full { get; set; }
             public string Relative { get; set; }
         }

Core/Other/Settings/TabSettingsAdvanced.cs

@@ -7,7 +7,7 @@ using TweetDuck.Core.Other.Settings.Dialogs;
 using TweetDuck.Core.Utils;
 
 namespace TweetDuck.Core.Other.Settings{
-    partial class TabSettingsAdvanced : BaseTabSettings{
+    sealed partial class TabSettingsAdvanced : BaseTabSettings{
         private static SystemConfig SysConfig => Program.SystemConfig;
 
         private readonly Action<string> reinjectBrowserCSS;

Core/Other/Settings/TabSettingsFeedback.Designer.cs

@@ -0,0 +1,134 @@
+namespace TweetDuck.Core.Other.Settings {
+    partial class TabSettingsFeedback {
+        /// <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.panelFeedback = new System.Windows.Forms.Panel();
+            this.labelDataCollectionLink = new System.Windows.Forms.LinkLabel();
+            this.checkDataCollection = new System.Windows.Forms.CheckBox();
+            this.labelDataCollection = new System.Windows.Forms.Label();
+            this.labelFeedback = new System.Windows.Forms.Label();
+            this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+            this.btnSendFeedback = new System.Windows.Forms.Button();
+            this.panelFeedback.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // panelFeedback
+            // 
+            this.panelFeedback.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelFeedback.Controls.Add(this.btnSendFeedback);
+            this.panelFeedback.Controls.Add(this.labelDataCollectionLink);
+            this.panelFeedback.Controls.Add(this.checkDataCollection);
+            this.panelFeedback.Controls.Add(this.labelDataCollection);
+            this.panelFeedback.Location = new System.Drawing.Point(9, 31);
+            this.panelFeedback.Name = "panelFeedback";
+            this.panelFeedback.Size = new System.Drawing.Size(322, 80);
+            this.panelFeedback.TabIndex = 1;
+            // 
+            // labelDataCollectionLink
+            // 
+            this.labelDataCollectionLink.AutoSize = true;
+            this.labelDataCollectionLink.LinkArea = new System.Windows.Forms.LinkArea(1, 10);
+            this.labelDataCollectionLink.LinkBehavior = System.Windows.Forms.LinkBehavior.HoverUnderline;
+            this.labelDataCollectionLink.Location = new System.Drawing.Point(141, 60);
+            this.labelDataCollectionLink.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
+            this.labelDataCollectionLink.Name = "labelDataCollectionLink";
+            this.labelDataCollectionLink.Size = new System.Drawing.Size(66, 17);
+            this.labelDataCollectionLink.TabIndex = 3;
+            this.labelDataCollectionLink.TabStop = true;
+            this.labelDataCollectionLink.Text = "(learn more)";
+            this.labelDataCollectionLink.UseCompatibleTextRendering = true;
+            this.labelDataCollectionLink.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.labelDataCollectionLink_LinkClicked);
+            // 
+            // checkDataCollection
+            // 
+            this.checkDataCollection.AutoSize = true;
+            this.checkDataCollection.Location = new System.Drawing.Point(6, 59);
+            this.checkDataCollection.Margin = new System.Windows.Forms.Padding(6, 5, 0, 3);
+            this.checkDataCollection.Name = "checkDataCollection";
+            this.checkDataCollection.Size = new System.Drawing.Size(135, 17);
+            this.checkDataCollection.TabIndex = 2;
+            this.checkDataCollection.Text = "Send Anonymous Data";
+            this.checkDataCollection.UseVisualStyleBackColor = true;
+            // 
+            // labelDataCollection
+            // 
+            this.labelDataCollection.AutoSize = true;
+            this.labelDataCollection.Location = new System.Drawing.Point(3, 41);
+            this.labelDataCollection.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
+            this.labelDataCollection.Name = "labelDataCollection";
+            this.labelDataCollection.Size = new System.Drawing.Size(79, 13);
+            this.labelDataCollection.TabIndex = 1;
+            this.labelDataCollection.Text = "Data Collection";
+            // 
+            // labelFeedback
+            // 
+            this.labelFeedback.AutoSize = true;
+            this.labelFeedback.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelFeedback.Location = new System.Drawing.Point(6, 8);
+            this.labelFeedback.Margin = new System.Windows.Forms.Padding(0, 2, 0, 0);
+            this.labelFeedback.Name = "labelFeedback";
+            this.labelFeedback.Size = new System.Drawing.Size(80, 20);
+            this.labelFeedback.TabIndex = 0;
+            this.labelFeedback.Text = "Feedback";
+            // 
+            // btnSendFeedback
+            // 
+            this.btnSendFeedback.AutoSize = true;
+            this.btnSendFeedback.Location = new System.Drawing.Point(5, 3);
+            this.btnSendFeedback.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
+            this.btnSendFeedback.Name = "btnSendFeedback";
+            this.btnSendFeedback.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.btnSendFeedback.Size = new System.Drawing.Size(164, 23);
+            this.btnSendFeedback.TabIndex = 0;
+            this.btnSendFeedback.Text = "Send Feedback / Bug Report";
+            this.btnSendFeedback.UseVisualStyleBackColor = true;
+            // 
+            // TabSettingsFeedback
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.panelFeedback);
+            this.Controls.Add(this.labelFeedback);
+            this.Name = "TabSettingsFeedback";
+            this.Size = new System.Drawing.Size(340, 122);
+            this.panelFeedback.ResumeLayout(false);
+            this.panelFeedback.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Panel panelFeedback;
+        private System.Windows.Forms.CheckBox checkDataCollection;
+        private System.Windows.Forms.Label labelDataCollection;
+        private System.Windows.Forms.Label labelFeedback;
+        private System.Windows.Forms.ToolTip toolTip;
+        private System.Windows.Forms.LinkLabel labelDataCollectionLink;
+        private System.Windows.Forms.Button btnSendFeedback;
+    }
+}

Core/Other/Settings/TabSettingsFeedback.cs

@@ -0,0 +1,30 @@
+using System;
+using System.Windows.Forms;
+using TweetDuck.Core.Utils;
+
+namespace TweetDuck.Core.Other.Settings{
+    sealed partial class TabSettingsFeedback : BaseTabSettings{
+        public TabSettingsFeedback(){
+            InitializeComponent();
+            
+            checkDataCollection.Checked = Config.AllowDataCollection;
+        }
+
+        public override void OnReady(){
+            btnSendFeedback.Click += btnSendFeedback_Click;
+            checkDataCollection.CheckedChanged += checkDataCollection_CheckedChanged;
+        }
+
+        private void btnSendFeedback_Click(object sender, EventArgs e){
+            BrowserUtils.OpenExternalBrowserUnsafe("https://github.com/chylex/TweetDuck/issues/new");
+        }
+
+        private void checkDataCollection_CheckedChanged(object sender, EventArgs e){
+            Config.AllowDataCollection = checkDataCollection.Checked;
+        }
+
+        private void labelDataCollectionLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e){
+            BrowserUtils.OpenExternalBrowserUnsafe("https://github.com/chylex/TweetDuck/wiki/Send-anonymous-data");
+        }
+    }
+}

Core/Other/Settings/TabSettingsGeneral.Designer.cs

@@ -25,29 +25,24 @@
         private void InitializeComponent() {
             this.components = new System.ComponentModel.Container();
             this.checkExpandLinks = new System.Windows.Forms.CheckBox();
-            this.comboBoxTrayType = new System.Windows.Forms.ComboBox();
             this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-            this.checkTrayHighlight = new System.Windows.Forms.CheckBox();
             this.checkSpellCheck = new System.Windows.Forms.CheckBox();
             this.checkUpdateNotifications = new System.Windows.Forms.CheckBox();
             this.btnCheckUpdates = new System.Windows.Forms.Button();
             this.labelZoomValue = new System.Windows.Forms.Label();
             this.checkSwitchAccountSelectors = new System.Windows.Forms.CheckBox();
-            this.labelTrayIcon = new System.Windows.Forms.Label();
+            this.checkBestImageQuality = new System.Windows.Forms.CheckBox();
+            this.checkOpenSearchInFirstColumn = new System.Windows.Forms.CheckBox();
             this.trackBarZoom = new System.Windows.Forms.TrackBar();
             this.labelZoom = new System.Windows.Forms.Label();
             this.zoomUpdateTimer = new System.Windows.Forms.Timer(this.components);
             this.labelUI = new System.Windows.Forms.Label();
             this.panelUI = new System.Windows.Forms.Panel();
-            this.labelTray = new System.Windows.Forms.Label();
             this.panelUpdates = new System.Windows.Forms.Panel();
-            this.panelTray = new System.Windows.Forms.Panel();
             this.labelUpdates = new System.Windows.Forms.Label();
-            this.checkBestImageQuality = new System.Windows.Forms.CheckBox();
             ((System.ComponentModel.ISupportInitialize)(this.trackBarZoom)).BeginInit();
             this.panelUI.SuspendLayout();
             this.panelUpdates.SuspendLayout();
-            this.panelTray.SuspendLayout();
             this.SuspendLayout();
             // 
             // checkExpandLinks
@@ -62,37 +57,14 @@
             this.toolTip.SetToolTip(this.checkExpandLinks, "Expands links inside the tweets. If disabled,\r\nthe full links show up in a tooltip instead.");
             this.checkExpandLinks.UseVisualStyleBackColor = true;
             // 
-            // comboBoxTrayType
-            // 
-            this.comboBoxTrayType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBoxTrayType.FormattingEnabled = true;
-            this.comboBoxTrayType.Location = new System.Drawing.Point(5, 5);
-            this.comboBoxTrayType.Margin = new System.Windows.Forms.Padding(5, 5, 3, 3);
-            this.comboBoxTrayType.Name = "comboBoxTrayType";
-            this.comboBoxTrayType.Size = new System.Drawing.Size(144, 21);
-            this.comboBoxTrayType.TabIndex = 0;
-            this.toolTip.SetToolTip(this.comboBoxTrayType, "Changes behavior of the Tray icon.\r\nRight-click the icon for an action menu.");
-            // 
-            // checkTrayHighlight
-            // 
-            this.checkTrayHighlight.AutoSize = true;
-            this.checkTrayHighlight.Location = new System.Drawing.Point(6, 56);
-            this.checkTrayHighlight.Margin = new System.Windows.Forms.Padding(6, 5, 3, 3);
-            this.checkTrayHighlight.Name = "checkTrayHighlight";
-            this.checkTrayHighlight.Size = new System.Drawing.Size(103, 17);
-            this.checkTrayHighlight.TabIndex = 2;
-            this.checkTrayHighlight.Text = "Enable Highlight";
-            this.toolTip.SetToolTip(this.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.");
-            this.checkTrayHighlight.UseVisualStyleBackColor = true;
-            // 
             // checkSpellCheck
             // 
             this.checkSpellCheck.AutoSize = true;
-            this.checkSpellCheck.Location = new System.Drawing.Point(6, 74);
+            this.checkSpellCheck.Location = new System.Drawing.Point(6, 97);
             this.checkSpellCheck.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
             this.checkSpellCheck.Name = "checkSpellCheck";
             this.checkSpellCheck.Size = new System.Drawing.Size(119, 17);
-            this.checkSpellCheck.TabIndex = 3;
+            this.checkSpellCheck.TabIndex = 4;
             this.checkSpellCheck.Text = "Enable Spell Check";
             this.toolTip.SetToolTip(this.checkSpellCheck, "Underlines words that are spelled incorrectly.");
             this.checkSpellCheck.UseVisualStyleBackColor = true;
@@ -123,11 +95,11 @@
             // labelZoomValue
             // 
             this.labelZoomValue.BackColor = System.Drawing.Color.Transparent;
-            this.labelZoomValue.Location = new System.Drawing.Point(141, 123);
+            this.labelZoomValue.Location = new System.Drawing.Point(147, 146);
             this.labelZoomValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelZoomValue.Name = "labelZoomValue";
             this.labelZoomValue.Size = new System.Drawing.Size(38, 13);
-            this.labelZoomValue.TabIndex = 6;
+            this.labelZoomValue.TabIndex = 7;
             this.labelZoomValue.Text = "100%";
             this.labelZoomValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
             this.toolTip.SetToolTip(this.labelZoomValue, "Changes the zoom level.\r\nAlso affects notifications and screenshots.");
@@ -144,39 +116,53 @@
             this.toolTip.SetToolTip(this.checkSwitchAccountSelectors, "When (re)tweeting, click to select a single account or hold Shift to\r\nselect multiple accounts, instead of TweetDeck\'s default behavior.");
             this.checkSwitchAccountSelectors.UseVisualStyleBackColor = true;
             // 
-            // labelTrayIcon
+            // checkBestImageQuality
             // 
-            this.labelTrayIcon.AutoSize = true;
-            this.labelTrayIcon.Location = new System.Drawing.Point(3, 38);
-            this.labelTrayIcon.Margin = new System.Windows.Forms.Padding(3, 9, 3, 0);
-            this.labelTrayIcon.Name = "labelTrayIcon";
-            this.labelTrayIcon.Size = new System.Drawing.Size(52, 13);
-            this.labelTrayIcon.TabIndex = 1;
-            this.labelTrayIcon.Text = "Tray Icon";
+            this.checkBestImageQuality.AutoSize = true;
+            this.checkBestImageQuality.Location = new System.Drawing.Point(6, 74);
+            this.checkBestImageQuality.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
+            this.checkBestImageQuality.Name = "checkBestImageQuality";
+            this.checkBestImageQuality.Size = new System.Drawing.Size(114, 17);
+            this.checkBestImageQuality.TabIndex = 3;
+            this.checkBestImageQuality.Text = "Best Image Quality";
+            this.toolTip.SetToolTip(this.checkBestImageQuality, "When right-clicking a tweet image, the context menu options\r\nwill use links to the original image size (:orig in the URL).");
+            this.checkBestImageQuality.UseVisualStyleBackColor = true;
+            // 
+            // checkOpenSearchInFirstColumn
+            // 
+            this.checkOpenSearchInFirstColumn.AutoSize = true;
+            this.checkOpenSearchInFirstColumn.Location = new System.Drawing.Point(6, 51);
+            this.checkOpenSearchInFirstColumn.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
+            this.checkOpenSearchInFirstColumn.Name = "checkOpenSearchInFirstColumn";
+            this.checkOpenSearchInFirstColumn.Size = new System.Drawing.Size(219, 17);
+            this.checkOpenSearchInFirstColumn.TabIndex = 2;
+            this.checkOpenSearchInFirstColumn.Text = "Add Search Columns Before First Column";
+            this.toolTip.SetToolTip(this.checkOpenSearchInFirstColumn, "By default, TweetDeck adds Search columns at the end.\r\nThis option makes them appear before the first column instead.");
+            this.checkOpenSearchInFirstColumn.UseVisualStyleBackColor = true;
             // 
             // trackBarZoom
             // 
             this.trackBarZoom.AutoSize = false;
             this.trackBarZoom.BackColor = System.Drawing.SystemColors.Control;
             this.trackBarZoom.LargeChange = 25;
-            this.trackBarZoom.Location = new System.Drawing.Point(3, 122);
+            this.trackBarZoom.Location = new System.Drawing.Point(3, 145);
             this.trackBarZoom.Maximum = 200;
             this.trackBarZoom.Minimum = 50;
             this.trackBarZoom.Name = "trackBarZoom";
             this.trackBarZoom.Size = new System.Drawing.Size(148, 30);
             this.trackBarZoom.SmallChange = 5;
-            this.trackBarZoom.TabIndex = 5;
+            this.trackBarZoom.TabIndex = 6;
             this.trackBarZoom.TickFrequency = 25;
             this.trackBarZoom.Value = 100;
             // 
             // labelZoom
             // 
             this.labelZoom.AutoSize = true;
-            this.labelZoom.Location = new System.Drawing.Point(3, 106);
+            this.labelZoom.Location = new System.Drawing.Point(3, 129);
             this.labelZoom.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelZoom.Name = "labelZoom";
             this.labelZoom.Size = new System.Drawing.Size(34, 13);
-            this.labelZoom.TabIndex = 4;
+            this.labelZoom.TabIndex = 5;
             this.labelZoom.Text = "Zoom";
             // 
             // zoomUpdateTimer
@@ -199,94 +185,56 @@
             // 
             this.panelUI.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelUI.Controls.Add(this.checkOpenSearchInFirstColumn);
             this.panelUI.Controls.Add(this.checkBestImageQuality);
             this.panelUI.Controls.Add(this.checkExpandLinks);
             this.panelUI.Controls.Add(this.checkSwitchAccountSelectors);
             this.panelUI.Controls.Add(this.checkSpellCheck);
             this.panelUI.Controls.Add(this.labelZoom);
-            this.panelUI.Controls.Add(this.labelZoomValue);
             this.panelUI.Controls.Add(this.trackBarZoom);
+            this.panelUI.Controls.Add(this.labelZoomValue);
             this.panelUI.Location = new System.Drawing.Point(9, 31);
             this.panelUI.Name = "panelUI";
-            this.panelUI.Size = new System.Drawing.Size(322, 157);
+            this.panelUI.Size = new System.Drawing.Size(322, 179);
             this.panelUI.TabIndex = 1;
             // 
-            // labelTray
-            // 
-            this.labelTray.AutoSize = true;
-            this.labelTray.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelTray.Location = new System.Drawing.Point(6, 212);
-            this.labelTray.Margin = new System.Windows.Forms.Padding(0, 21, 0, 0);
-            this.labelTray.Name = "labelTray";
-            this.labelTray.Size = new System.Drawing.Size(96, 20);
-            this.labelTray.TabIndex = 2;
-            this.labelTray.Text = "System Tray";
-            // 
             // panelUpdates
             // 
             this.panelUpdates.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.panelUpdates.Controls.Add(this.checkUpdateNotifications);
             this.panelUpdates.Controls.Add(this.btnCheckUpdates);
-            this.panelUpdates.Location = new System.Drawing.Point(9, 358);
+            this.panelUpdates.Location = new System.Drawing.Point(9, 257);
             this.panelUpdates.Name = "panelUpdates";
             this.panelUpdates.Size = new System.Drawing.Size(322, 55);
-            this.panelUpdates.TabIndex = 5;
-            // 
-            // panelTray
-            // 
-            this.panelTray.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.panelTray.Controls.Add(this.checkTrayHighlight);
-            this.panelTray.Controls.Add(this.comboBoxTrayType);
-            this.panelTray.Controls.Add(this.labelTrayIcon);
-            this.panelTray.Location = new System.Drawing.Point(9, 235);
-            this.panelTray.Name = "panelTray";
-            this.panelTray.Size = new System.Drawing.Size(322, 76);
-            this.panelTray.TabIndex = 3;
+            this.panelUpdates.TabIndex = 3;
             // 
             // labelUpdates
             // 
             this.labelUpdates.AutoSize = true;
             this.labelUpdates.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelUpdates.Location = new System.Drawing.Point(6, 335);
+            this.labelUpdates.Location = new System.Drawing.Point(6, 234);
             this.labelUpdates.Margin = new System.Windows.Forms.Padding(0, 21, 0, 0);
             this.labelUpdates.Name = "labelUpdates";
             this.labelUpdates.Size = new System.Drawing.Size(70, 20);
-            this.labelUpdates.TabIndex = 4;
+            this.labelUpdates.TabIndex = 2;
             this.labelUpdates.Text = "Updates";
             // 
-            // checkBestImageQuality
-            // 
-            this.checkBestImageQuality.AutoSize = true;
-            this.checkBestImageQuality.Location = new System.Drawing.Point(6, 51);
-            this.checkBestImageQuality.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
-            this.checkBestImageQuality.Name = "checkBestImageQuality";
-            this.checkBestImageQuality.Size = new System.Drawing.Size(114, 17);
-            this.checkBestImageQuality.TabIndex = 2;
-            this.checkBestImageQuality.Text = "Best Image Quality";
-            this.toolTip.SetToolTip(this.checkBestImageQuality, "When right-clicking a tweet image, the context menu options\r\nwill use links to the original image size (:orig in the URL).");
-            this.checkBestImageQuality.UseVisualStyleBackColor = true;
-            // 
             // TabSettingsGeneral
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.labelUpdates);
-            this.Controls.Add(this.panelTray);
             this.Controls.Add(this.panelUpdates);
-            this.Controls.Add(this.labelTray);
             this.Controls.Add(this.panelUI);
             this.Controls.Add(this.labelUI);
             this.Name = "TabSettingsGeneral";
-            this.Size = new System.Drawing.Size(340, 422);
+            this.Size = new System.Drawing.Size(340, 322);
             ((System.ComponentModel.ISupportInitialize)(this.trackBarZoom)).EndInit();
             this.panelUI.ResumeLayout(false);
             this.panelUI.PerformLayout();
             this.panelUpdates.ResumeLayout(false);
             this.panelUpdates.PerformLayout();
-            this.panelTray.ResumeLayout(false);
-            this.panelTray.PerformLayout();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -295,10 +243,7 @@
         #endregion
 
         private System.Windows.Forms.CheckBox checkExpandLinks;
-        private System.Windows.Forms.ComboBox comboBoxTrayType;
         private System.Windows.Forms.ToolTip toolTip;
-        private System.Windows.Forms.Label labelTrayIcon;
-        private System.Windows.Forms.CheckBox checkTrayHighlight;
         private System.Windows.Forms.CheckBox checkSpellCheck;
         private System.Windows.Forms.CheckBox checkUpdateNotifications;
         private System.Windows.Forms.Button btnCheckUpdates;
@@ -309,10 +254,9 @@
         private System.Windows.Forms.CheckBox checkSwitchAccountSelectors;
         private System.Windows.Forms.Label labelUI;
         private System.Windows.Forms.Panel panelUI;
-        private System.Windows.Forms.Label labelTray;
         private System.Windows.Forms.Panel panelUpdates;
-        private System.Windows.Forms.Panel panelTray;
         private System.Windows.Forms.Label labelUpdates;
         private System.Windows.Forms.CheckBox checkBestImageQuality;
+        private System.Windows.Forms.CheckBox checkOpenSearchInFirstColumn;
     }
 }

Core/Other/Settings/TabSettingsGeneral.cs

@@ -1,10 +1,9 @@
 using System;
 using TweetDuck.Core.Controls;
 using TweetDuck.Updates;
-using TweetDuck.Updates.Events;
 
 namespace TweetDuck.Core.Other.Settings{
-    partial class TabSettingsGeneral : BaseTabSettings{
+    sealed partial class TabSettingsGeneral : BaseTabSettings{
         private readonly UpdateHandler updates;
         private int updateCheckEventId = -1;
 
@@ -15,22 +14,15 @@ namespace TweetDuck.Core.Other.Settings{
             this.updates.CheckFinished += updates_CheckFinished;
             Disposed += (sender, args) => this.updates.CheckFinished -= updates_CheckFinished;
             
-            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);
-            
             toolTip.SetToolTip(trackBarZoom, toolTip.GetToolTip(labelZoomValue));
             trackBarZoom.SetValueSafe(Config.ZoomLevel);
             labelZoomValue.Text = trackBarZoom.Value+"%";
 
             checkExpandLinks.Checked = Config.ExpandLinksOnHover;
             checkSwitchAccountSelectors.Checked = Config.SwitchAccountSelectors;
+            checkOpenSearchInFirstColumn.Checked = Config.OpenSearchInFirstColumn;
             checkBestImageQuality.Checked = Config.BestImageQuality;
             checkSpellCheck.Checked = Config.EnableSpellCheck;
-            checkTrayHighlight.Checked = Config.EnableTrayHighlight;
 
             checkUpdateNotifications.Checked = Config.EnableUpdateCheck;
         }
@@ -38,13 +30,11 @@ namespace TweetDuck.Core.Other.Settings{
         public override void OnReady(){
             checkExpandLinks.CheckedChanged += checkExpandLinks_CheckedChanged;
             checkSwitchAccountSelectors.CheckedChanged += checkSwitchAccountSelectors_CheckedChanged;
+            checkOpenSearchInFirstColumn.CheckedChanged += checkOpenSearchInFirstColumn_CheckedChanged;
             checkBestImageQuality.CheckedChanged += checkBestImageQuality_CheckedChanged;
             checkSpellCheck.CheckedChanged += checkSpellCheck_CheckedChanged;
             trackBarZoom.ValueChanged += trackBarZoom_ValueChanged;
 
-            comboBoxTrayType.SelectedIndexChanged += comboBoxTrayType_SelectedIndexChanged;
-            checkTrayHighlight.CheckedChanged += checkTrayHighlight_CheckedChanged;
-
             checkUpdateNotifications.CheckedChanged += checkUpdateNotifications_CheckedChanged;
             btnCheckUpdates.Click += btnCheckUpdates_Click;
         }
@@ -61,6 +51,10 @@ namespace TweetDuck.Core.Other.Settings{
             Config.SwitchAccountSelectors = checkSwitchAccountSelectors.Checked;
         }
 
+        private void checkOpenSearchInFirstColumn_CheckedChanged(object sender, EventArgs e){
+            Config.OpenSearchInFirstColumn = checkOpenSearchInFirstColumn.Checked;
+        }
+
         private void checkBestImageQuality_CheckedChanged(object sender, EventArgs e){
             Config.BestImageQuality = checkBestImageQuality.Checked;
         }
@@ -78,36 +72,23 @@ namespace TweetDuck.Core.Other.Settings{
             }
         }
 
-        private void comboBoxTrayType_SelectedIndexChanged(object sender, EventArgs e){
-            Config.TrayBehavior = (TrayIcon.Behavior)comboBoxTrayType.SelectedIndex;
-        }
-
-        private void checkTrayHighlight_CheckedChanged(object sender, EventArgs e){
-            Config.EnableTrayHighlight = checkTrayHighlight.Checked;
-        }
-
         private void checkUpdateNotifications_CheckedChanged(object sender, EventArgs e){
             Config.EnableUpdateCheck = checkUpdateNotifications.Checked;
         }
 
         private void btnCheckUpdates_Click(object sender, EventArgs e){
-            updateCheckEventId = updates.Check(true);
+            Config.DismissedUpdate = null;
 
-            if (updateCheckEventId == -1){
-                FormMessage.Warning("Unsupported System", "Sorry, your system is no longer supported.", FormMessage.OK);
-            }
-            else{
-                btnCheckUpdates.Enabled = false;
-                updates.DismissUpdate(string.Empty);
-            }
+            btnCheckUpdates.Enabled = false;
+            updateCheckEventId = updates.Check(true);
         }
 
-        private void updates_CheckFinished(object sender, UpdateCheckEventArgs e){
+        private void updates_CheckFinished(object sender, UpdateEventArgs e){
             this.InvokeAsyncSafe(() => {
                 if (e.EventId == updateCheckEventId){
                     btnCheckUpdates.Enabled = true;
 
-                    if (!e.UpdateAvailable){
+                    if (!e.IsUpdateAvailable){
                         FormMessage.Information("No Updates Available", "Your version of TweetDuck is up to date.", FormMessage.OK);
                     }
                 }

Core/Other/Settings/TabSettingsNotifications.Designer.cs

@@ -79,7 +79,7 @@
             this.labelEdgeDistanceValue.Location = new System.Drawing.Point(147, 129);
             this.labelEdgeDistanceValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelEdgeDistanceValue.Name = "labelEdgeDistanceValue";
-            this.labelEdgeDistanceValue.Size = new System.Drawing.Size(34, 13);
+            this.labelEdgeDistanceValue.Size = new System.Drawing.Size(40, 13);
             this.labelEdgeDistanceValue.TabIndex = 9;
             this.labelEdgeDistanceValue.Text = "0 px";
             this.labelEdgeDistanceValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
@@ -253,7 +253,7 @@
             this.labelDurationValue.Location = new System.Drawing.Point(147, 77);
             this.labelDurationValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelDurationValue.Name = "labelDurationValue";
-            this.labelDurationValue.Size = new System.Drawing.Size(48, 13);
+            this.labelDurationValue.Size = new System.Drawing.Size(52, 13);
             this.labelDurationValue.TabIndex = 4;
             this.labelDurationValue.Text = "0 ms/c";
             this.labelDurationValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
@@ -406,7 +406,7 @@
             this.labelScrollSpeedValue.Location = new System.Drawing.Point(147, 53);
             this.labelScrollSpeedValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelScrollSpeedValue.Name = "labelScrollSpeedValue";
-            this.labelScrollSpeedValue.Size = new System.Drawing.Size(34, 13);
+            this.labelScrollSpeedValue.Size = new System.Drawing.Size(38, 13);
             this.labelScrollSpeedValue.TabIndex = 4;
             this.labelScrollSpeedValue.Text = "100%";
             this.labelScrollSpeedValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
@@ -450,7 +450,6 @@
             // 
             this.panelLocation.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.panelLocation.Controls.Add(this.labelEdgeDistanceValue);
             this.panelLocation.Controls.Add(this.radioLocTL);
             this.panelLocation.Controls.Add(this.labelDisplay);
             this.panelLocation.Controls.Add(this.trackBarEdgeDistance);
@@ -460,6 +459,7 @@
             this.panelLocation.Controls.Add(this.radioLocBL);
             this.panelLocation.Controls.Add(this.radioLocCustom);
             this.panelLocation.Controls.Add(this.radioLocBR);
+            this.panelLocation.Controls.Add(this.labelEdgeDistanceValue);
             this.panelLocation.Location = new System.Drawing.Point(9, 418);
             this.panelLocation.Name = "panelLocation";
             this.panelLocation.Size = new System.Drawing.Size(322, 165);

Core/Other/Settings/TabSettingsNotifications.cs

@@ -4,7 +4,7 @@ using TweetDuck.Core.Controls;
 using TweetDuck.Core.Notification;
 
 namespace TweetDuck.Core.Other.Settings{
-    partial class TabSettingsNotifications : BaseTabSettings{
+    sealed partial class TabSettingsNotifications : BaseTabSettings{
         private static readonly int[] IdlePauseSeconds = { 0, 30, 60, 120, 300 };
 
         private readonly FormNotificationMain notification;

Core/Other/Settings/TabSettingsSounds.Designer.cs

@@ -25,15 +25,40 @@
         private void InitializeComponent() {
             this.components = new System.ComponentModel.Container();
             this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+            this.tbCustomSound = new System.Windows.Forms.TextBox();
+            this.labelVolumeValue = new System.Windows.Forms.Label();
             this.btnPlaySound = new System.Windows.Forms.Button();
             this.btnResetSound = new System.Windows.Forms.Button();
             this.btnBrowseSound = new System.Windows.Forms.Button();
-            this.tbCustomSound = new System.Windows.Forms.TextBox();
             this.labelSoundNotification = new System.Windows.Forms.Label();
             this.panelSoundNotification = new System.Windows.Forms.Panel();
+            this.labelVolume = new System.Windows.Forms.Label();
+            this.trackBarVolume = new System.Windows.Forms.TrackBar();
             this.panelSoundNotification.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.trackBarVolume)).BeginInit();
             this.SuspendLayout();
             // 
+            // tbCustomSound
+            // 
+            this.tbCustomSound.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.tbCustomSound.Location = new System.Drawing.Point(3, 3);
+            this.tbCustomSound.Name = "tbCustomSound";
+            this.tbCustomSound.Size = new System.Drawing.Size(316, 20);
+            this.tbCustomSound.TabIndex = 0;
+            this.toolTip.SetToolTip(this.tbCustomSound, "When empty, the default TweetDeck sound notification is used.");
+            // 
+            // labelVolumeValue
+            // 
+            this.labelVolumeValue.BackColor = System.Drawing.Color.Transparent;
+            this.labelVolumeValue.Location = new System.Drawing.Point(147, 84);
+            this.labelVolumeValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
+            this.labelVolumeValue.Name = "labelVolumeValue";
+            this.labelVolumeValue.Size = new System.Drawing.Size(38, 13);
+            this.labelVolumeValue.TabIndex = 6;
+            this.labelVolumeValue.Text = "100%";
+            this.labelVolumeValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            // 
             // btnPlaySound
             // 
             this.btnPlaySound.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@@ -69,16 +94,6 @@
             this.btnBrowseSound.Text = "Browse...";
             this.btnBrowseSound.UseVisualStyleBackColor = true;
             // 
-            // tbCustomSound
-            // 
-            this.tbCustomSound.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.tbCustomSound.Location = new System.Drawing.Point(3, 3);
-            this.tbCustomSound.Name = "tbCustomSound";
-            this.tbCustomSound.Size = new System.Drawing.Size(316, 20);
-            this.tbCustomSound.TabIndex = 0;
-            this.toolTip.SetToolTip(this.tbCustomSound, "When empty, the default TweetDeck sound notification is used.");
-            // 
             // labelSoundNotification
             // 
             this.labelSoundNotification.AutoSize = true;
@@ -94,15 +109,42 @@
             // 
             this.panelSoundNotification.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelSoundNotification.Controls.Add(this.labelVolume);
+            this.panelSoundNotification.Controls.Add(this.trackBarVolume);
             this.panelSoundNotification.Controls.Add(this.btnPlaySound);
             this.panelSoundNotification.Controls.Add(this.tbCustomSound);
             this.panelSoundNotification.Controls.Add(this.btnResetSound);
             this.panelSoundNotification.Controls.Add(this.btnBrowseSound);
+            this.panelSoundNotification.Controls.Add(this.labelVolumeValue);
             this.panelSoundNotification.Location = new System.Drawing.Point(9, 31);
             this.panelSoundNotification.Name = "panelSoundNotification";
-            this.panelSoundNotification.Size = new System.Drawing.Size(322, 56);
+            this.panelSoundNotification.Size = new System.Drawing.Size(322, 119);
             this.panelSoundNotification.TabIndex = 2;
             // 
+            // labelVolume
+            // 
+            this.labelVolume.AutoSize = true;
+            this.labelVolume.Location = new System.Drawing.Point(3, 67);
+            this.labelVolume.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
+            this.labelVolume.Name = "labelVolume";
+            this.labelVolume.Size = new System.Drawing.Size(42, 13);
+            this.labelVolume.TabIndex = 4;
+            this.labelVolume.Text = "Volume";
+            // 
+            // trackBarVolume
+            // 
+            this.trackBarVolume.AutoSize = false;
+            this.trackBarVolume.BackColor = System.Drawing.SystemColors.Control;
+            this.trackBarVolume.Location = new System.Drawing.Point(3, 83);
+            this.trackBarVolume.Maximum = 100;
+            this.trackBarVolume.Name = "trackBarVolume";
+            this.trackBarVolume.Size = new System.Drawing.Size(148, 30);
+            this.trackBarVolume.SmallChange = 1;
+            this.trackBarVolume.TabIndex = 5;
+            this.trackBarVolume.TickFrequency = 10;
+            this.trackBarVolume.Value = 100;
+            this.trackBarVolume.ValueChanged += new System.EventHandler(this.trackBarVolume_ValueChanged);
+            // 
             // TabSettingsSounds
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -110,9 +152,10 @@
             this.Controls.Add(this.panelSoundNotification);
             this.Controls.Add(this.labelSoundNotification);
             this.Name = "TabSettingsSounds";
-            this.Size = new System.Drawing.Size(340, 97);
+            this.Size = new System.Drawing.Size(340, 160);
             this.panelSoundNotification.ResumeLayout(false);
             this.panelSoundNotification.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.trackBarVolume)).EndInit();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -127,5 +170,8 @@
         private System.Windows.Forms.Button btnPlaySound;
         private System.Windows.Forms.Label labelSoundNotification;
         private System.Windows.Forms.Panel panelSoundNotification;
+        private System.Windows.Forms.Label labelVolume;
+        private System.Windows.Forms.Label labelVolumeValue;
+        private System.Windows.Forms.TrackBar trackBarVolume;
     }
 }

Core/Other/Settings/TabSettingsSounds.cs

@@ -2,21 +2,29 @@
 using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
+using TweetDuck.Core.Controls;
 using TweetDuck.Core.Notification;
 using TweetLib.Audio;
 
 namespace TweetDuck.Core.Other.Settings{
-    partial class TabSettingsSounds : BaseTabSettings{
+    sealed partial class TabSettingsSounds : BaseTabSettings{
         private readonly SoundNotification soundNotification;
+        private readonly bool supportsChangingVolume;
 
         public TabSettingsSounds(){
             InitializeComponent();
 
             soundNotification = new SoundNotification();
             soundNotification.PlaybackError += sound_PlaybackError;
+            
+            supportsChangingVolume = soundNotification.SetVolume(Config.NotificationSoundVolume);
+
+            trackBarVolume.Enabled = supportsChangingVolume && !string.IsNullOrEmpty(Config.NotificationSoundPath);
+            trackBarVolume.SetValueSafe(Config.NotificationSoundVolume);
+            labelVolumeValue.Text = trackBarVolume.Value+"%";
 
             tbCustomSound.Text = Config.NotificationSoundPath;
-            tbCustomSound_TextChanged(tbCustomSound, new EventArgs());
+            tbCustomSound_TextChanged(tbCustomSound, EventArgs.Empty);
 
             Disposed += (sender, args) => soundNotification.Dispose();
         }
@@ -37,6 +45,7 @@ namespace TweetDuck.Core.Other.Settings{
             tbCustomSound.ForeColor = isEmpty || File.Exists(tbCustomSound.Text) ? SystemColors.WindowText : Color.Red;
             btnPlaySound.Enabled = !isEmpty;
             btnResetSound.Enabled = !isEmpty;
+            trackBarVolume.Enabled = supportsChangingVolume && !isEmpty;
         }
 
         private void btnPlaySound_Click(object sender, EventArgs e){
@@ -63,5 +72,11 @@ namespace TweetDuck.Core.Other.Settings{
         private void btnResetSound_Click(object sender, EventArgs e){
             tbCustomSound.Text = string.Empty;
         }
+
+        private void trackBarVolume_ValueChanged(object sender, EventArgs e){
+            Config.NotificationSoundVolume = trackBarVolume.Value;
+            soundNotification.SetVolume(Config.NotificationSoundVolume);
+            labelVolumeValue.Text = Config.NotificationSoundVolume+"%";
+        }
     }
 }

Core/Other/Settings/TabSettingsTray.Designer.cs

@@ -0,0 +1,116 @@
+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.panelTray = new System.Windows.Forms.Panel();
+            this.checkTrayHighlight = new System.Windows.Forms.CheckBox();
+            this.comboBoxTrayType = new System.Windows.Forms.ComboBox();
+            this.labelTrayIcon = new System.Windows.Forms.Label();
+            this.labelTray = new System.Windows.Forms.Label();
+            this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+            this.panelTray.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // panelTray
+            // 
+            this.panelTray.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelTray.Controls.Add(this.checkTrayHighlight);
+            this.panelTray.Controls.Add(this.comboBoxTrayType);
+            this.panelTray.Controls.Add(this.labelTrayIcon);
+            this.panelTray.Location = new System.Drawing.Point(9, 31);
+            this.panelTray.Name = "panelTray";
+            this.panelTray.Size = new System.Drawing.Size(322, 76);
+            this.panelTray.TabIndex = 1;
+            // 
+            // checkTrayHighlight
+            // 
+            this.checkTrayHighlight.AutoSize = true;
+            this.checkTrayHighlight.Location = new System.Drawing.Point(6, 56);
+            this.checkTrayHighlight.Margin = new System.Windows.Forms.Padding(6, 5, 3, 3);
+            this.checkTrayHighlight.Name = "checkTrayHighlight";
+            this.checkTrayHighlight.Size = new System.Drawing.Size(103, 17);
+            this.checkTrayHighlight.TabIndex = 2;
+            this.checkTrayHighlight.Text = "Enable Highlight";
+            this.toolTip.SetToolTip(this.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.");
+            this.checkTrayHighlight.UseVisualStyleBackColor = true;
+            // 
+            // comboBoxTrayType
+            // 
+            this.comboBoxTrayType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxTrayType.FormattingEnabled = true;
+            this.comboBoxTrayType.Location = new System.Drawing.Point(5, 5);
+            this.comboBoxTrayType.Margin = new System.Windows.Forms.Padding(5, 5, 3, 3);
+            this.comboBoxTrayType.Name = "comboBoxTrayType";
+            this.comboBoxTrayType.Size = new System.Drawing.Size(144, 21);
+            this.comboBoxTrayType.TabIndex = 0;
+            this.toolTip.SetToolTip(this.comboBoxTrayType, "Changes behavior of the Tray icon.\r\nRight-click the icon for an action menu.");
+            // 
+            // labelTrayIcon
+            // 
+            this.labelTrayIcon.AutoSize = true;
+            this.labelTrayIcon.Location = new System.Drawing.Point(3, 38);
+            this.labelTrayIcon.Margin = new System.Windows.Forms.Padding(3, 9, 3, 0);
+            this.labelTrayIcon.Name = "labelTrayIcon";
+            this.labelTrayIcon.Size = new System.Drawing.Size(52, 13);
+            this.labelTrayIcon.TabIndex = 1;
+            this.labelTrayIcon.Text = "Tray Icon";
+            // 
+            // labelTray
+            // 
+            this.labelTray.AutoSize = true;
+            this.labelTray.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelTray.Location = new System.Drawing.Point(6, 8);
+            this.labelTray.Margin = new System.Windows.Forms.Padding(0, 2, 0, 0);
+            this.labelTray.Name = "labelTray";
+            this.labelTray.Size = new System.Drawing.Size(96, 20);
+            this.labelTray.TabIndex = 0;
+            this.labelTray.Text = "System Tray";
+            // 
+            // TabSettingsTray
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.panelTray);
+            this.Controls.Add(this.labelTray);
+            this.Name = "TabSettingsTray";
+            this.Size = new System.Drawing.Size(340, 119);
+            this.panelTray.ResumeLayout(false);
+            this.panelTray.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Panel panelTray;
+        private System.Windows.Forms.CheckBox checkTrayHighlight;
+        private System.Windows.Forms.ComboBox comboBoxTrayType;
+        private System.Windows.Forms.Label labelTrayIcon;
+        private System.Windows.Forms.Label labelTray;
+        private System.Windows.Forms.ToolTip toolTip;
+    }
+}

Core/Other/Settings/TabSettingsTray.cs

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

Core/TrayIcon.cs

@@ -3,7 +3,7 @@ using System.ComponentModel;
 using System.Windows.Forms;
 
 namespace TweetDuck.Core{
-    partial class TrayIcon : Component{
+    sealed partial class TrayIcon : Component{
         public enum Behavior{ // keep order
             Disabled, DisplayOnly, MinimizeToTray, CloseToTray, Combined
         }

Core/Utils/BrowserUtils.cs

@@ -5,6 +5,7 @@ using System.Diagnostics;
 using System.IO;
 using System.Net;
 using System.Windows.Forms;
+using CefSharp.WinForms;
 using TweetDuck.Core.Other;
 
 namespace TweetDuck.Core.Utils{
@@ -42,23 +43,46 @@ namespace TweetDuck.Core.Utils{
             }
         }
 
-        public static bool IsValidUrl(string url){
+        public static ChromiumWebBrowser AsControl(this IWebBrowser browserControl){
+            return (ChromiumWebBrowser)browserControl;
+        }
+
+        private const string TwitterTrackingUrl = "t.co";
+
+        public enum UrlCheckResult{
+            Invalid, Tracking, Fine
+        }
+
+        public static UrlCheckResult CheckUrl(string url){
             if (Uri.TryCreate(url, UriKind.Absolute, out Uri uri)){
                 string scheme = uri.Scheme;
-                return scheme == Uri.UriSchemeHttp || scheme == Uri.UriSchemeHttps || scheme == Uri.UriSchemeFtp || scheme == Uri.UriSchemeMailto;
+
+                if (scheme == Uri.UriSchemeHttps || scheme == Uri.UriSchemeHttp || scheme == Uri.UriSchemeFtp || scheme == Uri.UriSchemeMailto){
+                    return uri.Host == TwitterTrackingUrl ? UrlCheckResult.Tracking : UrlCheckResult.Fine;
+                }
             }
 
-            return false;
+            return UrlCheckResult.Invalid;
         }
 
         public static void OpenExternalBrowser(string url){
             if (string.IsNullOrWhiteSpace(url))return;
 
-            if (IsValidUrl(url)){
-                OpenExternalBrowserUnsafe(url);
-            }
-            else{
-                FormMessage.Warning("Blocked URL", "A potentially malicious URL was blocked from opening:\n"+url, FormMessage.OK);
+            switch(CheckUrl(url)){
+                case UrlCheckResult.Fine:
+                    OpenExternalBrowserUnsafe(url);
+                    break;
+
+                case UrlCheckResult.Tracking:
+                    if (FormMessage.Warning("Blocked URL", "TweetDuck has blocked a tracking url due to privacy concerns. Do you want to visit it anyway?\n"+url, FormMessage.Yes, FormMessage.No)){
+                        OpenExternalBrowserUnsafe(url);
+                    }
+
+                    break;
+
+                case UrlCheckResult.Invalid:
+                    FormMessage.Warning("Blocked URL", "A potentially malicious URL was blocked from opening:\n"+url, FormMessage.OK);
+                    break;
             }
         }
 

Core/Utils/NativeMethods.cs

@@ -16,7 +16,6 @@ namespace TweetDuck.Core.Utils{
         public const int GWL_STYLE = -16;
 
         public const int SB_HORZ = 0;
-        public const int BCM_SETSHIELD = 0x160C;
 
         public const int WM_MOUSE_LL = 14;
         public const int WM_MOUSEWHEEL = 0x020A;

Core/Utils/TwitterUtils.cs

@@ -14,7 +14,7 @@ namespace TweetDuck.Core.Utils{
         public static readonly Color BackgroundColor = Color.FromArgb(28, 99, 153);
         public const string BackgroundColorFix = "let e=document.createElement('style');document.head.appendChild(e);e.innerHTML='body::before{background:#1c6399!important}'";
         
-        private static readonly Lazy<Regex> RegexAccountLazy = new Lazy<Regex>(() => new Regex(@"^https?://twitter\.com/([^/]+)/?$", RegexOptions.Compiled), false);
+        private static readonly Lazy<Regex> RegexAccountLazy = new Lazy<Regex>(() => new Regex(@"^https?://twitter\.com/(?!signup$|tos$|privacy$)([^/]+)/?$", RegexOptions.Compiled), false);
         public static Regex RegexAccount => RegexAccountLazy.Value;
 
         public static readonly string[] DictionaryWords = {
@@ -33,14 +33,14 @@ namespace TweetDuck.Core.Utils{
             return frame.Url.Contains("//twitter.com/");
         }
 
-        private static string ExtractImageBaseLink(string url){
+        private static string ExtractMediaBaseLink(string url){
             int dot = url.LastIndexOf('/');
             return dot == -1 ? url : StringUtils.ExtractBefore(url, ':', dot);
         }
 
-        public static string GetImageLink(string url, ImageQuality quality){
+        public static string GetMediaLink(string url, ImageQuality quality){
             if (quality == ImageQuality.Orig){
-                string result = ExtractImageBaseLink(url);
+                string result = ExtractMediaBaseLink(url);
 
                 if (result != url || url.Contains("//pbs.twimg.com/media/")){
                     result += ":orig";
@@ -62,10 +62,10 @@ namespace TweetDuck.Core.Utils{
                 return;
             }
 
-            string firstImageLink = GetImageLink(urls[0], quality);
+            string firstImageLink = GetMediaLink(urls[0], quality);
             int qualityIndex = firstImageLink.IndexOf(':', firstImageLink.LastIndexOf('/'));
 
-            string file = BrowserUtils.GetFileNameFromUrl(ExtractImageBaseLink(firstImageLink));
+            string file = BrowserUtils.GetFileNameFromUrl(ExtractMediaBaseLink(firstImageLink));
             string ext = Path.GetExtension(file); // includes dot
 
             string[] fileNameParts = qualityIndex == -1 ? new string[]{
@@ -96,11 +96,30 @@ namespace TweetDuck.Core.Utils{
                         string pathExt = Path.GetExtension(dialog.FileName);
 
                         for(int index = 0; index < urls.Length; index++){
-                            BrowserUtils.DownloadFileAsync(GetImageLink(urls[index], quality), $"{pathBase} {index+1}{pathExt}", null, OnFailure);
+                            BrowserUtils.DownloadFileAsync(GetMediaLink(urls[index], quality), $"{pathBase} {index+1}{pathExt}", null, OnFailure);
                         }
                     }
                 }
             }
         }
+
+        public static void DownloadVideo(string url){
+            string filename = BrowserUtils.GetFileNameFromUrl(url);
+            string ext = Path.GetExtension(filename);
+
+            using(SaveFileDialog dialog = new SaveFileDialog{
+                AutoUpgradeEnabled = true,
+                OverwritePrompt = true,
+                Title = "Save video",
+                FileName = filename,
+                Filter = "Video"+(string.IsNullOrEmpty(ext) ? " (unknown)|*.*" : $" (*{ext})|*{ext}")
+            }){
+                if (dialog.ShowDialog() == DialogResult.OK){
+                    BrowserUtils.DownloadFileAsync(url, dialog.FileName, null, ex => {
+                        FormMessage.Error("Image Download", "An error occurred while downloading the image: "+ex.Message, FormMessage.OK);
+                    });
+                }
+            }
+        }
     }
 }

Data/CombinedFileStream.cs

@@ -91,7 +91,7 @@ namespace TweetDuck.Data{
             stream.Dispose();
         }
 
-        public class Entry{
+        public sealed class Entry{
             public string Identifier { get; }
 
             public string KeyName{

Data/Serialization/FileSerializer.cs

@@ -90,12 +90,12 @@ namespace TweetDuck.Data.Serialization{
                 HandleUnknownProperties?.Invoke(obj, unknownProperties);
 
                 if (unknownProperties.Count > 0){
-                    throw new SerializationException($"Invalid file format, unknown properties: {string.Join(", ", unknownProperties.Keys)}+");
+                    throw new SerializationException($"Invalid file format, unknown properties: {string.Join(", ", unknownProperties.Keys)}");
                 }
             }
         }
 
-        private class BasicTypeConverter : ITypeConverter{
+        private sealed class BasicTypeConverter : ITypeConverter{
             bool ITypeConverter.TryWriteType(Type type, object value, out string converted){
                 switch(Type.GetTypeCode(type)){
                     case TypeCode.Boolean:

Data/WindowState.cs

@@ -1,12 +1,10 @@
-using System;
-using System.Drawing;
+using System.Drawing;
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Utils;
 using TweetDuck.Data.Serialization;
 
 namespace TweetDuck.Data{
-    [Serializable] // TODO remove attribute with UserConfigLegacy
     sealed class WindowState{
         private Rectangle rect;
         private bool isMaximized;

Plugins/Controls/PluginControl.cs

@@ -8,7 +8,7 @@ using TweetDuck.Core.Utils;
 using TweetDuck.Plugins.Enums;
 
 namespace TweetDuck.Plugins.Controls{
-    partial class PluginControl : UserControl{
+    sealed partial class PluginControl : UserControl{
         private readonly PluginManager pluginManager;
         private readonly Plugin plugin;
 

Plugins/Events/PluginChangedStateEventArgs.cs

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

Plugins/Events/PluginErrorEventArgs.cs

@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 
 namespace TweetDuck.Plugins.Events{
-    class PluginErrorEventArgs : EventArgs{
+    sealed class PluginErrorEventArgs : EventArgs{
         public bool HasErrors => Errors.Count > 0;
 
-        public IList<string> Errors;
+        public IList<string> Errors { get; }
 
         public PluginErrorEventArgs(IList<string> errors){
             this.Errors = errors;

Plugins/Plugin.cs

@@ -7,6 +7,9 @@ using TweetDuck.Plugins.Enums;
 
 namespace TweetDuck.Plugins{
     sealed class Plugin{
+        private static readonly Version AppVersion = new Version(Program.VersionTag);
+        private const string VersionWildcard = "*";
+
         public string Identifier { get; }
         public PluginGroup Group { get; }
         public PluginEnvironment Environments { get; private set; }
@@ -50,7 +53,7 @@ namespace TweetDuck.Plugins{
             { "WEBSITE", "" },
             { "CONFIGFILE", "" },
             { "CONFIGDEFAULT", "" },
-            { "REQUIRES", "*" }
+            { "REQUIRES", VersionWildcard }
         };
 
         private bool? canRun;
@@ -209,7 +212,7 @@ namespace TweetDuck.Plugins{
                 return false;
             }
 
-            if (plugin.RequiredVersion.Length == 0 || !(plugin.RequiredVersion.Equals("*") || System.Version.TryParse(plugin.RequiredVersion, out Version _))){
+            if (plugin.RequiredVersion.Length == 0 || !(plugin.RequiredVersion == VersionWildcard || System.Version.TryParse(plugin.RequiredVersion, out Version _))){
                 error = "Plugin contains invalid version: "+plugin.RequiredVersion;
                 return false;
             }
@@ -221,7 +224,7 @@ namespace TweetDuck.Plugins{
         }
 
         private static bool CheckRequiredVersion(string requires){
-            return requires.Equals("*", StringComparison.Ordinal) || Program.Version >= new Version(requires);
+            return requires == VersionWildcard || AppVersion >= new Version(requires);
         }
     }
 }

Plugins/PluginConfig.cs

@@ -8,22 +8,24 @@ namespace TweetDuck.Plugins{
     sealed class PluginConfig{
         public event EventHandler<PluginChangedStateEventArgs> InternalPluginChangedState; // should only be accessed from PluginManager
 
-        public IEnumerable<string> DisabledPlugins => Disabled;
-        public bool AnyDisabled => Disabled.Count > 0;
+        public IEnumerable<string> DisabledPlugins => disabled;
+        public bool AnyDisabled => disabled.Count > 0;
 
-        private readonly HashSet<string> Disabled = new HashSet<string>{
+        private static readonly string[] DefaultDisabled = {
             "official/clear-columns",
             "official/reply-account"
         };
 
+        private readonly HashSet<string> disabled = new HashSet<string>();
+
         public void SetEnabled(Plugin plugin, bool enabled){
-            if ((enabled && Disabled.Remove(plugin.Identifier)) || (!enabled && Disabled.Add(plugin.Identifier))){
+            if ((enabled && disabled.Remove(plugin.Identifier)) || (!enabled && disabled.Add(plugin.Identifier))){
                 InternalPluginChangedState?.Invoke(this, new PluginChangedStateEventArgs(plugin, enabled));
             }
         }
 
         public bool IsEnabled(Plugin plugin){
-            return !Disabled.Contains(plugin.Identifier);
+            return !disabled.Contains(plugin.Identifier);
         }
 
         public void Load(string file){
@@ -32,14 +34,20 @@ namespace TweetDuck.Plugins{
                     string line = reader.ReadLine();
 
                     if (line == "#Disabled"){
-                        Disabled.Clear();
+                        disabled.Clear();
 
                         while((line = reader.ReadLine()) != null){
-                            Disabled.Add(line);
+                            disabled.Add(line);
                         }
                     }
                 }
             }catch(FileNotFoundException){
+                disabled.Clear();
+                
+                foreach(string identifier in DefaultDisabled){
+                    disabled.Add(identifier);
+                }
+
                 Save(file);
             }catch(DirectoryNotFoundException){
             }catch(Exception e){
@@ -52,8 +60,8 @@ namespace TweetDuck.Plugins{
                 using(StreamWriter writer = new StreamWriter(new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.None), Encoding.UTF8)){
                     writer.WriteLine("#Disabled");
 
-                    foreach(string disabled in Disabled){
-                        writer.WriteLine(disabled);
+                    foreach(string identifier in disabled){
+                        writer.WriteLine(identifier);
                     }
                 }
             }catch(Exception e){

Plugins/PluginManager.cs

@@ -45,14 +45,7 @@ namespace TweetDuck.Plugins{
             this.Bridge = new PluginBridge(this);
 
             Config.Load(configPath);
-            
             Config.InternalPluginChangedState += Config_InternalPluginChangedState;
-            Program.UserConfigReplaced += Program_UserConfigReplaced;
-        }
-
-        private void Program_UserConfigReplaced(object sender, EventArgs e){
-            Config.Load(configPath);
-            Reload();
         }
 
         private void Config_InternalPluginChangedState(object sender, PluginChangedStateEventArgs e){
@@ -83,6 +76,8 @@ namespace TweetDuck.Plugins{
         }
 
         public void Reload(){
+            Config.Load(configPath);
+
             plugins.Clear();
             tokens.Clear();
 

Program.cs

@@ -21,10 +21,8 @@ namespace TweetDuck{
         public const string BrandName = "TweetDuck";
         public const string Website = "https://tweetduck.chylex.com";
 
-        public const string VersionTag = "1.8.6";
-        public const string VersionFull = "1.8.6";
+        public const string VersionTag = "1.10.1";
 
-        public static readonly Version Version = new Version(VersionTag);
         public static readonly bool IsPortable = File.Exists("makeportable");
 
         public static readonly string ProgramPath = AppDomain.CurrentDomain.BaseDirectory;
@@ -48,14 +46,12 @@ namespace TweetDuck{
 
         private static readonly LockManager LockManager = new LockManager(Path.Combine(StoragePath, ".lock"));
         private static bool HasCleanedUp;
-        
+
         public static UserConfig UserConfig { get; private set; }
         public static SystemConfig SystemConfig { get; private set; }
         public static Reporter Reporter { get; }
         public static CultureInfo Culture { get; }
 
-        public static event EventHandler UserConfigReplaced;
-
         static Program(){
             Culture = CultureInfo.CurrentCulture;
             Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture;
@@ -118,12 +114,15 @@ namespace TweetDuck{
                 }
             }
             
+            UserConfig = UserConfig.Load(UserConfigFilePath);
             SystemConfig = SystemConfig.Load(SystemConfigFilePath);
-            ReloadConfig();
 
             if (Arguments.HasFlag(Arguments.ArgImportCookies)){
                 ExportManager.ImportCookies();
             }
+            else if (Arguments.HasFlag(Arguments.ArgDeleteCookies)){
+                ExportManager.DeleteCookies();
+            }
 
             if (Arguments.HasFlag(Arguments.ArgUpdated)){
                 WindowsUtils.TryDeleteFolderWhenAble(InstallerPath, 8000);
@@ -190,11 +189,6 @@ namespace TweetDuck{
             }
         }
 
-        public static void ReloadConfig(){
-            UserConfig = UserConfig.Load(UserConfigFilePath);
-            UserConfigReplaced?.Invoke(UserConfig, new EventArgs());
-        }
-
         public static void ResetConfig(){
             try{
                 File.Delete(UserConfigFilePath);
@@ -203,8 +197,8 @@ namespace TweetDuck{
                 Reporter.HandleException("Configuration Reset Error", "Could not delete configuration files to reset the options.", true, e);
                 return;
             }
-
-            ReloadConfig();
+            
+            UserConfig.Reload();
         }
 
         public static void Restart(params string[] extraArgs){

Properties/AssemblyInfo.cs

@@ -34,8 +34,8 @@ using TweetDuck;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion(Program.VersionFull)]
-[assembly: AssemblyFileVersion(Program.VersionFull)]
+[assembly: AssemblyVersion(Program.VersionTag)]
+[assembly: AssemblyFileVersion(Program.VersionTag)]
 
 [assembly: NeutralResourcesLanguage("en")]
 

README.md

@@ -1,11 +1,64 @@
+# Support
+
+[Follow TweetDuck on Twitter](https://twitter.com/TryTweetDuck)  |  [Support via PayPal](https://paypal.me/chylex)  |  [Support via Patreon](https://www.patreon.com/chylex)
+
+<a target='_blank' rel='nofollow' href='https://app.codesponsor.io/link/2W76v7hRmUe7NfaeUKq9K8Wq/chylex/TweetDuck'>
+  <img alt='Sponsor' width='888' height='68' src='https://app.codesponsor.io/embed/2W76v7hRmUe7NfaeUKq9K8Wq/chylex/TweetDuck.svg' />
+</a>
+
 # Build Instructions
 
-The program was built using Visual Studio 2017. After opening the solution, make sure you have **CefSharp.WinForms** and **Microsoft.VC120.CRT.JetBrains** included - if not, download them using NuGet.
+### Setup
+
+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 – 4.6 development tools
+* **Desktop development with C++**
+  * VC++ 2017 v141 toolset
+
+After opening the solution, download the following NuGet packages by right-clicking on the solution and selecting **Restore NuGet Packages**, or manually running these commands in the **Package Manager Console**:
 ```
 PM> Install-Package CefSharp.WinForms -Version 57.0.0
 PM> Install-Package Microsoft.VC120.CRT.JetBrains
 ```
 
-When building the `Release` configuration, the folder will only contain files intended for distribution (no debug symbols or other unnecessary files). You may package the files yourself, or use `bld/RUN BUILD.bat` to generate installer files using Inno Setup (make sure the Inno Setup binaries are on your PATH).
+### Debug
 
-Built files are available in **bin/x86**, installer files are generated in **bld/Output**. If you decide to release a custom version publicly, please make it clear that it is not the original TweetDuck. 
+It is recommended to create a separate data folder for debugging, otherwise you will not be able to run TweetDuck while debugging the solution.
+
+To do that, open **TweetDuck Properties**, click the **Debug** tab, make sure your **Configuration** is set to `Active (Debug)` (or just `Debug`), and insert this into the **Command line arguments** field:
+```
+-datafolder TweetDuckDebug
+```
+
+### Build
+
+To make a release build of TweetDuck, open **Batch Build**, tick all `Release` configurations except for the `UnitTest` project (otherwise the build will fail), and click **Rebuild**. Check the status bar to make sure it says **Rebuild All succeeded**; if not, open the **Output** view and see which part of the build failed.
+
+After the build succeeds, the **bin/x86/Release** folder will contain files intended for distribution (no debug symbols or other unnecessary files). You may package these files yourself, or see the [Installers](#Installers) section for automated installer generation.
+
+If you decide to release a custom version publicly, please make it clear that it is not an official release of TweetDuck.
+
+### Installers
+
+TweetDuck uses **Inno Setup** to automate the creation of installers. 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 for the change to take place.
+
+Now you can generate installers after a build by running **bld/RUN BUILD.bat**. Note that despite the name, this will only package the files, you still need to run the [build](#Build) in Visual Studio!
+
+After the window closes, three installers will be generated inside the **bld/Output** folder:
+* **TweetDuck.exe**
+  * This is the main installer that creates entries in the Start Menu & Programs and Features, and an optional desktop icon
+* **TweetDuck.Update.exe**
+  * This is a lightweight update installer that only contains the most important files that usually change across releases
+  * It will automatically download and apply the full installer if the user's current version of CEF does not match (the download link is in `gen_upd.iss` and points to this repository by default)
+* **TweetDuck.Portable.exe**
+  * This is a portable installer that does not need administrator privileges
+  * It automatically creates a `makeportable` file in the program folder, which forces TweetDuck to run in portable mode
+
+Note: There is a small chance you will see a resource error when running `RUN BUILD.bat`. If that happens, close the console window (which will terminate all Inno Setup processes and leave corrupted installer files in the output folder), and run it again.
+
+### Code Notes
+
+There are many references to the official TweetDuck website and this repository in the code and installers, so if you plan to release your own version, make sure to search for `tweetduck.chylex.com` and `github.com` in the whole repository and replace them appropriately.

Resources/Guide/index.html

@@ -0,0 +1,404 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>TweetDuck - Guide</title>
+    
+    <meta charset="utf-8">
+    <meta name="robots" content="index,follow">
+    <meta name="author" content="chylex">
+    <meta name="description" content="TweetDuck guide">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    
+    <link rel="icon" href="img/icon.ico">
+    <link rel="stylesheet" href="style.css" type="text/css">
+    
+    <script type="text/javascript" src="script.js" async></script>
+  </head>
+  <body>
+    <div id="guide">
+      <section>
+
+        <article>
+          <h2>General</h2>
+          
+          <details>
+            <summary id="main-menu">How to open the main menu</summary>
+            <div>
+              <p>The main menu gives you access to the following items:</p>
+              <img src="img/app-menu.png" alt="">
+              <p>There are two ways to open the main menu:</p>
+              <ul>
+                <li>Click <em>Settings</em> in the left panel, then select <em>TweetDuck</em></li>
+                <li><em>Right-click anywhere</em> and you will either see the listed options, or a <em>TweetDuck</em> entry that contains these options</li>
+              </ul>
+              <img src="img/settings-dropdown.png" alt="">
+            </div>
+          </details>
+          
+          <details>
+            <summary id="customize-theme">How to customize the theme and layout</summary>
+            <div>
+              <ol>
+                <li>Click <em>Settings</em> in the left panel</li>
+                <li>Continue to <em>Edit layout &amp; design</em></li>
+                <li>Now you can customize many aspects of the website; note that unlike the default TweetDeck settings, the column width and font size can be configured here in much greater detail</li>
+              </ol>
+              <img src="img/settings-editdesign.png" alt="">
+              <p>This is done using an official plugin called <em>Edit layout &amp; design</em>, which is enabled by default. If the plugin is disabled, you can still access the default TweetDeck settings:</p>
+              <ol>
+                <li>Click <em>Settings</em> on the bottom left</li>
+                <li>Continue to <em>Settings</em> (again)</li>
+                <li>Here you can customize the theme, column width, and font size</li>
+              </ol>
+              <img src="img/settings-dropdown.png" alt="">
+            </div>
+          </details>
+          
+          <details>
+            <summary id="emoji">How to add emoji to tweets</summary>
+            <div>
+              <p>When writing a new tweet, click the heart icon to open an emoji picker. If you're writing a reply, click the <em>Popout</em> icon to bring the reply into the New Tweet panel.</p>
+              <p>Then you can immediately type into the <em>Search</em> field, which accepts keywords separated by space. Pressing <em>Enter</em> in the search field (when not empty) will insert the first result into your tweet. Pressing <em>Escape</em> closes the emoji picker.</p>
+              <p>You can also use your mouse to change the skin tone, scroll through the emoji, and click on the emoji to insert them.</p>
+              <p>Typing <em>:emoji_name:</em> in the New Tweet panel will automatically search for an emoji using those keywords. If a single emoji is found, it will be inserted into the tweet (press <em>Backspace</em> or <em>Escape</em> to revert it). If multiple emojis are found, it will open the emoji picker where you can refine the search, or press <em>Escape</em> to go back.</p>
+              <p>Emoji are provided by an official plugin called <em>Emoji keyboard</em>, which is enabled by default. The heart icon will not show if the plugin is disabled.</p>
+              <img src="img/new-tweet-emoji.png" alt="">
+            </div>
+          </details>
+          
+          <details>
+            <summary id="templates">How to use tweet templates</summary>
+            <div>
+              <p>To create a simple template to use when writing a new tweet or reply:</p>
+              <ol>
+                <li>Click <em>Manage templates</em> in the New Tweet panel; if you're writing a reply, click the <em>Popout</em> icon first to bring the reply into the large panel</li>
+                <li>Click <em>New template</em> on the bottom right</li>
+                <li>Fill in the template name and contents</li>
+                <li>Click <em>Confirm</em> to create the template</li>
+              </ol>
+              <p>After you create a template, it will be added to the list. There are two icons next to each entry:</p>
+              <ul>
+                <li>Click the <em>pencil icon to edit</em> the template</li>
+                <li>Click the <em>cross icon to delete</em> the template</li>
+              </ul>
+              <p>To use the template, <em>click the template name</em> to replace your current tweet text with the template, or click while holding <em>Shift</em> to append the template to your tweet instead. You can use the Shift+click functionality to quickly chain multiple templates.</p>
+              <img src="img/new-tweet-template-basic.png" alt="">
+              <p>When writing a template, you can use special <em>tokens</em> listed in the <em>Advanced</em> section. Here is an example of one of the tokens:</p>
+              <img src="img/new-tweet-template-advanced.png" alt="">
+            </div>
+          </details>
+          
+          <details>
+            <summary id="upload-from-clipboard">How to upload images from clipboard</summary>
+            <div>
+              <p>When writing a tweet/reply, press <em>Ctrl+V</em> to upload an image from clipboard. You can use this to quickly paste a selection from an image editor such as Paint, or after copying an image in your browser.</p>
+              <p>Make sure you're in the tweet input field before you press Ctrl+V, otherwise the keyboard shortcut won't trigger.</p>
+              <p>Note that this will only work when your clipboard contains the image itself; it will not work if you copy a file or URL.</p>
+            </div>
+          </details>
+        </article>
+        
+        <article>
+          <h2>Columns</h2>
+          
+          <details>
+            <summary id="copy-tweet-links">How to copy links to tweets</summary>
+            <div>
+              <p>When you right-click anywhere inside a tweet, you will be given these options:</p>
+              <ul>
+                <li>Open tweet in browser</li>
+                <li><em>Copy tweet address</em></li>
+                <li>Screenshot tweet to clipboard</li>
+              </ul>
+              <p>If the tweet contains a quote, you will also be able to directly open the quote or copy its address.</p>
+              <p>Note that these options will not appear when you right-click a private message.</p>
+            </div>
+          </details>
+          
+          <details>
+            <summary id="download-media">How to download images and videos</summary>
+            <div>
+              <p>When you right-click an image or a video thumbnail with a purple play button, you will be given these options:</p>
+              <ul>
+                <li>Open image/video in browser</li>
+                <li>Copy image/video address</li>
+                <li><em>Save image/video as...</em></li>
+              </ul>
+              <p>TweetDuck will attempt to fetch the highest quality image when you click any of these options. You can disable that by going to the <em>main menu</em>, selecting <em>Options</em>, and then unchecking <em>Best Image Quality</em>.</p>
+              <p>Whenever possible, the username and quality are included in the filename by default, for convenience. After you select a folder and click Save, the image/video will be downloaded in the background. There is no notification for when the download finishes, but you will be notified if it fails.</p>
+            </div>
+          </details>
+          
+          <details>
+            <summary id="screenshot-tweets">How to take screenshots of individual tweets</summary>
+            <div>
+              <p>When you right-click anywhere inside a tweet, you will be given these options:</p>
+              <ul>
+                <li>Open tweet in browser</li>
+                <li>Copy tweet address</li>
+                <li><em>Screenshot tweet to clipboard</em></li>
+              </ul>
+              <p>Taking a screenshot may take several seconds, especially if it contains large images or previews. After taking a screenshot, you can paste it into an image editor such as Paint.</p>
+              <p>Note that these options will not appear when you right-click a private message.</p>
+            </div>
+          </details>
+          
+          <details>
+            <summary id="clear-columns">How to clear and restore column contents</summary>
+            <div>
+              <p>TweetDeck lets you clear a column, which can help keep things organized by hiding tweets you have already read. To clear a column, click the <em>slider icon</em> on top of the column, and then click the <em>Clear</em> button.</p>
+              <p>If you need to revert this decision and restore a column, normally you would need to delete and re-create it, but in TweetDuck you can simply hold Shift which turns the Clear button into a <em>Restore</em> button.</p>
+              <img src="img/column-clear-preferences.png" alt="">
+              <p>If you clear columns frequently, you can enable an official plugin that lets you clear columns much quicker:</p>
+              <ol>
+                <li>Open the <em>main menu</em>, and select <em>Plugins</em> to open the list of available plugins</li>
+                <li>Find an entry that says <em>Clear columns</em>, it will be somewhere near the bottom as the plugin is disabled by default</li>
+                <li>Click <em>Enable</em> on the right side to enable the plugin and reload the browser</li>
+              </ol>
+              <p>Now you can clear...</p>
+              <ul>
+                <li>...a single column by clicking the <em>droplet icon</em> on top of each column</li>
+                <li>...a single column by holding the <em>1-9 number key</em> and pressing <em>Delete</em></li>
+                <li>...all columns by clicking <em>Clear columns</em> in the left panel</li>
+                <li>...all columns by pressing <em>Alt+Delete</em></li>
+              </ul>
+              <img src="img/column-clear-header.png" alt="">
+              <p>As mentioned before, hold Shift with any of these to restore the columns instead. Note that some keyboard layouts require using the Shift key when pressing number keys; if that is the case for you, please use the numpad or mouse instead.</p>
+            </div>
+          </details>
+        </article>
+        
+        <article>
+          <h2>Notifications</h2>
+          
+          <details>
+            <summary id="enable-notifications">How to enable desktop or sound notifications</summary>
+            <div>
+              <p>New columns have disabled notifications by default. To enable them, click the <em>slider icon</em> on top of the column, and expand the <em>Preferences</em> section.</p>
+              <p>Now you can toggle either, or both of the notification options:</p>
+              <img src="img/column-preferences.png" alt="">
+            </div>
+          </details>
+          
+          <details>
+            <summary id="move-resize-notifications">How to move or resize desktop notifications</summary>
+            <div>
+              <p>Open the <em>main menu</em>, select <em>Options</em>, and then click the <em>Notifications</em> tab. Here, you can customize many aspects of desktop notifications.</p>
+              <p>Scroll down to the <em>Location</em> section where you can customize where the notification shows up. You can either pick one of the 4 corners of your screen and the distance from the corner, or select <em>Custom</em> and then you'll be able to freely move the example notification window.</p>
+              <img src="img/options-notifications-location.png" alt="">
+              <p>Scroll down to the <em>Size</em> section to customize the size of the notification window. By default, TweetDuck sets the size based on your font size setting, the zoom level you can customize in the General tab, and your system DPI. If you pick <em>Custom</em>, you will be able to freely resize the example notification window.</p>
+              <img src="img/options-notifications-size.png" alt="">
+              <p>Note that moving and resizing the notification only works while you're inside the Options dialog, that is to prevent accidental clicks messing up your settings.</p>
+            </div>
+          </details>
+          
+          <details>
+            <summary id="sound-notifications">How to customize sound notifications</summary>
+            <div>
+              <p>Open the <em>main menu</em>, select <em>Options</em>, and then click the <em>Sounds</em> tab. Here, you can pick a sound file that will be used instead of the default TweetDeck sound notification.</p>
+              <p>Keep in mind that you're only linking to the sound file, so make sure not to delete the file afterwards, otherwise TweetDuck won't find it anymore.</p>
+              <img src="img/options-sounds.png" alt="">
+              <p>If you're unable to select MP3 files or other common audio file types, please ensure that you have Windows Media Player installed on your system, otherwise you will only be able to select basic WAV files.</p>
+            </div>
+          </details>
+          
+          <details>
+            <summary id="mute-notifications">How to temporarily mute all notifications</summary>
+            <div>
+              <p>There are two ways you can mute/unmute notifications:</p>
+              <ul>
+                <li>Open the <em>main menu</em> and click <em>Mute notifications</em></li>
+                <li>If you've enabled the <em>tray icon</em>, right-click it and then click <em>Mute notifications</em></li>
+              </ul>
+              <p>The option persists across restarts &ndash; if you mute notifications and then restart TweetDuck, don't forget to unmute the notifications again.</p>
+              <p>Unmuting notifications will display all missed desktop notifications (unless TweetDuck was restarted in the meantime).</p>
+            </div>
+          </details>
+        </article>
+        
+      </section>
+      <section>
+       
+        <article>
+          <h2>Options</h2>
+          
+          <details>
+            <summary id="configure-tweetduck">How to configure TweetDuck</summary>
+            <div>
+              <p>Open the <em>main menu</em> and select <em>Options</em>. Here you can configure various parts of TweetDuck; the dialog is split into several tabs:</p>
+              <ul>
+                <li><em>General</em> tab for user interface, zoom, and update options</li>
+                <li><em>System Tray</em> tab to enable and configure the tray icon</li>
+                <li><em>Notifications</em> tab to configure desktop notifications</li>
+                <li><em>Sounds</em> tab to set a custom sound notification</li>
+                <li><em>Advanced</em> tab for highly technical options</li>
+              </ul>
+              <p>You can move your cursor over most options to display a <em>tooltip with a detailed explanation</em> of what that option does.</p>
+            </div>
+          </details>
+          
+          <details>
+            <summary id="manage-plugins">How to view and manage plugins</summary>
+            <div>
+              <p>TweetDuck has several offical plugins that extend the website and notifications with new functionality.</p>
+              <p>Open the <em>main menu</em> and select <em>Plugins</em> to open the plugin list. Here you can see what each plugin does, and enable/disable them individually. </p>
+              <p>If you want to install a custom plugin, click <em>Open Plugin Folder</em>. A plugin is a folder that contains a <em>.meta</em> file and several others, make sure you copy and paste the folder itself into the opened plugin folder. To verify that you installed it correctly, click <em>Reload All</em> (which also reloads the website) and the plugin should appear.</p>
+              <p>Please, be careful when installing new plugins, and ensure that you get them from trustworthy sources. If you're unsure about a plugin, feel free to <a href="https://github.com/chylex/TweetDuck/issues/new" rel="nofollow">create an issue</a> and upload the plugin there (<a href="https://github.com" rel="nofollow">GitHub</a> account required).</p>
+            </div>
+          </details>
+          
+          <details>
+            <summary id="manage-profile">How to backup your profile or move it to another computer</summary>
+            <div>
+              <ol>
+                <li>Open the <em>main menu</em>, select <em>Options</em>, and click <em>Manage Options</em> on the bottom left</li>
+                <li>Select <em>Export profile</em> and proceed with <em>Next</em></li>
+                <li>Select items you want to save in your profile (note that <em>Plugin Data</em> includes data from official plugins, such as those that let you customize the website or create tweet templates)</li>
+                <li>Click <em>Export Profile</em></li>
+              </ol>
+              <img src="img/options-manage.png" alt="" style="margin-right:6px">
+              <img src="img/options-manage-export.png" alt="">
+              <p>You can save your profile into a cloud storage (Dropbox, Google Drive, etc.) or an external drive, for example. When you want to restore it, follow the same steps but select <em>Import profile</em> and then select the file instead.</p>
+              <p>When importing a profile, you will be again able to pick which items you want to restore. You can for example export a full profile including your login session, but then only import program options and plugin data if you want to login to a different account.</p>
+            </div>
+          </details>
+          
+          <details>
+            <summary id="restore-options">How to restore default options</summary>
+            <div>
+              <ol>
+                <li>Open the <em>main menu</em>, select <em>Options</em>, and click <em>Manage Options</em> on the bottom left</li>
+                <li>Select <em>Restore defaults</em> and proceed with <em>Next</em></li>
+                <li>Select items you want reset (note that <em>Plugin Data</em> includes data from official plugins, such as those that let you customize the website or create tweet templates)</li>
+                <li>Click <em>Restore Defaults</em></li>
+              </ol>
+              <img src="img/options-manage.png" alt="" style="margin-right:6px">
+              <img src="img/options-manage-reset.png" alt="">
+            </div>
+          </details>
+        </article>
+        
+        <article>
+          <h2>Efficiency</h2>
+          
+          <details>
+            <summary id="keyboard-shortcuts">How to use keyboard shortcuts</summary>
+            <div>
+              <ol>
+                <li>Click <em>Settings</em> in the left panel</li>
+                <li>Continue to <em>Keyboard shortcuts</em></li>
+                <li>Here you can see most available keyboard shortcuts you can use in the browser window</li>
+              </ol>
+              <img src="img/settings-dropdown.png" alt="">
+              <p>You can also often hold Ctrl or Shift to trigger alternative actions:</p>
+              <ul>
+                <li>When <em>selecting accounts</em>, hold <em>Shift</em> to select multiple accounts (can be configured in the Options)</li>
+                <li>When <em>clearing columns</em>, hold <em>Shift</em> to restore the column instead</li>
+                <li>When <em>clicking video thumbnails</em>, hold <em>Ctrl</em> to open them in your browser</li>
+              </ul>
+              <p>Finally, if you click into a desktop notification window, you can use these keyboard shortcuts:</p>
+              <ul>
+                <li><em>Enter</em> to skip the current notification</li>
+                <li><em>Escape</em> to close the window (skips all notifications in the queue)</li>
+                <li><em>Space</em> to pause/unpause the timer</li>
+              </ul>
+            </div>
+          </details>
+          
+          <details>
+            <summary id="extra-mouse-buttons">How to use the forward / back mouse buttons</summary>
+            <div>
+              <p>If you have a mouse that supports the forward and back buttons, you can use them in both the browser and a desktop notification. All you need to do is move the cursor over the window (even if it's not focused), and press one of the buttons.</p>
+              <p>In the browser:</p>
+              <ul>
+                <li>Press <em>forward</em> over a <em>tweet to open it in detail view</em> (unlike clicking, this will not trigger links or media thumbnails)</li>
+                <li>Press <em>back</em> anywhere to <em>close modal dialogs</em> or the <em>New Tweet panel</em>, or over a <em>column to return back from detail view</em> (if there are no dialogs or panels open, pressing the button outside a column will trigger it for all columns at once)</li>
+              </ul>
+              <p>In the desktop notification:</p>
+              <ul>
+                <li>Press <em>forward</em> to skip the current notification</li>
+                <li>Press <em>back</em> to close the window (skips all notifications in the queue)</li>
+              </ul>
+            </div>
+          </details>
+          
+          <details>
+            <summary id="pin-new-tweet">How to keep the New Tweet panel open</summary>
+            <div>
+              <p>Open the New Tweet panel, and click the <em>pin icon</em> on top. When the pin points to the left, the panel will stay open after tweeting or restarting TweetDuck.</p>
+              <img src="img/new-tweet-pin.png" alt="">
+            </div>
+          </details>
+          
+          <details>
+            <summary id="popout-replies">How to instantly popout replies</summary>
+            <div>
+              <p><em>Middle-click the reply icon</em> to instantly open your reply in the New Tweet panel.</p>
+              <p>Middle-clicks are usually done by pressing your mouse wheel as if it was a button. When using a laptop touchpad or certain mice, the ways of triggering a middle click vary.</p>
+            </div>
+          </details>
+          
+          <details>
+            <summary id="reply-account">How to change which account will be pre-selected for replies</summary>
+            <div>
+              <p>By default, TweetDeck pre-selects the account mentioned in the column header. The ability to change this is provided by an official plugin which is disabled by default, as it's a bit more difficult to setup, but it can be very powerful. To enable the plugin:</p>
+              <ol>
+                <li>Open the <em>main menu</em> and select <em>Plugins</em></li>
+                <li>Find an entry that says <em>Custom reply account</em>, it will be somewhere near the bottom as the plugin is disabled by default</li>
+                <li>Click <em>Enable</em> on the right side to enable the plugin</li>
+              </ol>
+              <p>After you enable the plugin, it will use your preferred account for all replies by default. If that's your intention, you can simply enable the plugin and leave it, otherwise continue reading:</p>
+              <ol>
+                <li>Click <em>Configure</em> next to the plugin to open a folder with the configuration file
+                <li>Open <em>configuration.js</em> in a text editor that can edit and save JavaScript or any pure text files, therefore office suits or WordPad are not suitable; if you don't have any specific editor, use Notepad.</li>
+                <li>The configuration file includes very detailed instructions &ndash; you can use one of the <em>presets</em>, a <em>specific account</em> for all replies, or use JavaScript to <em>fully customize</em> the reply behavior</li>
+              </ol>
+              <p>After editing the configuration, return back to Plugins and click <em>Reload All</em> on the bottom left. Now you can close Plugins and test if replies work the way you want.</p>
+              <p>Note that this will not affect the Messages column, that one will always pre-select the account which received the private message.</p>
+            </div>
+          </details>
+        </article>
+        
+        <article>
+          <h2>Advanced</h2>
+          
+          <details>
+            <summary id="dev-tools">How to open Chrome Dev Tools</summary>
+            <div>
+              <ol>
+                <li>Open the <em>main menu</em>, select <em>Options</em>, and click the <em>Advanced</em> tab</li>
+                <li>Click <em>Open Program Folder</em></li>
+                <li>Download <a href="https://github.com/chylex/TweetDuck/raw/master/bld/Resources/devtools_resources.pak" rel="nofollow">devtools_resources.pak</a> and place it into the opened folder</li>
+                <li>Click <em>Restart the Program</em></li>
+                <li>Now, open the <em>main menu</em> again and you should see <em>Open dev tools</em>; you can also right-click inside a notification and see the same option (make sure to pause the notification first by clicking Freeze in the context menu)</li>
+              </ol>
+            </div>
+          </details>
+          
+          <details>
+            <summary id="custom-css">How to customize styles using CSS</summary>
+            <div>
+              <ol>
+                <li>Open the <em>main menu</em>, select <em>Options</em>, and click the <em>Advanced</em> tab</li>
+                <li>Click <em>Edit CSS</em></li>
+              </ol>
+              <p>Now you can write custom CSS into the <em>Browser</em> and <em>Notification</em> sections.</p>
+              <p>Note that the Browser section will immediately take effect as you type. You can also still access the browser and Dev Tools, as the dialog does not block the browser window.</p>
+              <p>Basic knowledge of HTML and CSS is recommended. Mozilla Development Network has a huge library of resources on both <a href="https://developer.mozilla.org/en-US/Learn/Getting_started_with_the_web/HTML_basics" rel="nofollow">HTML</a> and <a href="https://developer.mozilla.org/en-US/Learn/Getting_started_with_the_web/CSS_basics" rel="nofollow">CSS</a>.</p>
+            </div>
+          </details>
+          
+          <details>
+            <summary id="plugin-development">How to develop plugins</summary>
+            <div>
+              <p>Before creating a plugin, you should have at least basic knowledge of <a href="https://developer.mozilla.org/en-US/docs/Learn/Getting_started_with_the_web" rel="nofollow">web development</a> (namely HTML, CSS, JavaScript), and several JS libraries TweetDeck uses, such as <a href="https://learn.jquery.com" rel="nofollow">jQuery 2</a>, <a href="https://mustache.github.io" rel="nofollow">Mustache</a>, <a href="https://github.com/ded/klass" rel="nofollow">klass</a>, and <a href="https://flightjs.github.io/" rel="nofollow">Flight</a>.</p>
+              <p>Working with the TweetDeck source code involves a lot of reverse-engineering. You can visit <a href="https://github.com/DeckHack/discoveries" rel="nofollow">DeckHack</a> which is working to document its source code, and view <a href="https://github.com/chylex/TweetDuck/tree/master/Resources/Scripts" rel="nofollow">TweetDuck sources</a> which includes all scripts and official plugins.</p>
+              <p>Once you're ready to start creating your own plugins, visit the official <a href="https://github.com/chylex/TweetDuck/wiki/Plugins%EA%9E%89-1.-The-Basics" rel="nofollow">plugin development documentation</a> which will explain the structure of a plugin, and show you all TweetDuck-specific functionality you cannot normally use in browsers.</p>
+            </div>
+          </details>
+        </article>
+
+      </section>
+    </div>
+  </body>
+</html>

Resources/Guide/script.js

@@ -0,0 +1,84 @@
+var init = function(){
+  if (!("open" in document.getElementsByTagName("details")[0])){
+    var elements = document.getElementsByTagName("details");
+    
+    var onClick = function(e){
+      var summary = e.target;
+      var parent = e.target.parentElement;
+      var contents = e.target.nextElementSibling;
+      
+      if (parent.hasAttribute("open")){
+        parent.removeAttribute("open");
+        summary.setAttribute("aria-expanded", "false");
+        contents.setAttribute("aria-hidden", "true");
+        contents.style.display = "none";
+      }
+      else{
+        parent.setAttribute("open", "");
+        summary.setAttribute("aria-expanded", "true");
+        contents.setAttribute("aria-hidden", "false");
+        contents.style.display = "block";
+      }
+    };
+    
+    var onKey = function(e){
+      if (e.keyCode === 13 || e.keyCode === 32){
+        onClick(e);
+      }
+    };
+    
+    for(var index = 0; index < elements.length; index++){
+      var ele = elements[index];
+      
+      if (ele.childElementCount === 2){
+        var summary = ele.children[0];
+        var contents = ele.children[1];
+        
+        ele.style.display = "block";
+        ele.setAttribute("role", "group");
+        
+        summary.setAttribute("role", "button");
+        summary.setAttribute("aria-expanded", "false");
+        summary.setAttribute("tabindex", 0);
+        summary.addEventListener("click", onClick);
+        summary.addEventListener("keydown", onKey);
+        
+        contents.setAttribute("aria-hidden", "true");
+        contents.style.display = "none";
+      }
+    }
+  }
+  else if ("WebkitAppearance" in document.documentElement.style){
+    var elements = document.getElementsByTagName("summary");
+    
+    var onMouseDown = function(e){
+      e.target.classList.add("webkit-workaround");
+    };
+    
+    var onMouseUp = function(e){
+      e.target.classList.remove("webkit-workaround");
+      e.target.blur();
+    };
+    
+    for(var index = 0; index < elements.length; index++){
+      elements[index].addEventListener("mousedown", onMouseDown);
+      elements[index].addEventListener("mouseup", onMouseUp);
+    }
+  }
+  
+  if (location.hash.length > 1){
+    var element = document.getElementById(location.hash.substring(1));
+    
+    if (element && element.tagName === "SUMMARY"){
+      element.click();
+      element.scrollIntoView(true);
+    }
+  }
+};
+
+if (document.readyState !== "loading"){
+  init();
+}
+else{
+  document.addEventListener("DOMContentLoaded", init);
+}

Resources/Guide/style.css

@@ -0,0 +1,132 @@
+body {
+  margin: 0;
+  font-family: "HelveticaNeue", "Helvetica Neue", Helvetica, Arial, Verdana, sans-serif;
+  background-color: #222;
+  color: #ddd;
+  overflow-y: scroll;
+}
+
+#guide {
+  width: 100%;
+  max-width: 1440px;
+  margin: 0 auto;
+  display: flex;
+  flex-wrap: wrap;
+  align-self: stretch;
+}
+
+#guide section {
+  flex: 1 1 0;
+  margin: 0 24px;
+  min-width: 360px;
+  display: flex;
+  flex-direction: column;
+}
+
+@media(max-width: 408px) {
+  #guide section {
+    min-width: calc(100vw - 48px);
+  }
+}
+
+#guide h2 {
+  margin: 20px 0 10px;
+  font-size: 32px;
+  cursor: default;
+}
+
+#guide details {
+  transition: background-color 0.2s ease;
+}
+
+#guide details[open] {
+  background-color: rgba(255, 255, 255, 0.05);
+}
+
+#guide summary {
+  display: inline-block;
+  margin: 0 0 11px;
+  padding: 4px 10px;
+  font-size: 19px;
+  font-weight: bold;
+  color: #afdfff;
+  cursor: pointer;
+  opacity: 0.8;
+  transition: opacity 0.15s ease;
+}
+
+#guide summary::-webkit-details-marker {
+  display: none;
+}
+
+#guide summary.webkit-workaround {
+  outline: none;
+}
+
+#guide summary::before {
+  content: "▶";
+  display: inline-block;
+  font-size: 13px;
+  vertical-align: top;
+  margin-right: 6px;
+  padding-top: 2px;
+  transform-origin: 35% 50%;
+  transition: transform 0.1s ease;
+}
+
+#guide summary:hover, #guide details[open] summary {
+  opacity: 1;
+}
+
+#guide details[open] summary::before {
+  transform: rotateZ(90deg) translate(0.5px, -3px);
+}
+
+#guide details > div {
+  margin-bottom: 22px;
+  padding: 0 25px 20px;
+  font-size: 17px;
+}
+
+#guide details > div > *:first-child {
+  margin-top: 0;
+}
+
+#guide details > div > *:last-child {
+  margin-bottom: 0;
+}
+
+em {
+  color: #f8d88b;
+  font-style: normal;
+}
+
+a {
+  color: #8bc6f8;
+  opacity: 0.85;
+}
+
+a:hover {
+  opacity: 1;
+}
+
+p, li {
+  line-height: 130%;
+}
+
+ul {
+  padding-left: 26px;
+}
+
+ol {
+  padding-left: 18px;
+}
+
+li {
+  margin-bottom: 6px;
+}
+
+img {
+  border: 2px groove rgba(255, 255, 255, 0.6);
+  max-width: 100%;
+}

Resources/Plugins/clear-columns/browser.js

@@ -53,9 +53,7 @@ enabled(){
   };
   
   this.eventKeyDown = function(e){
-    if (!(document.activeElement === null || document.activeElement === document.body)){
-      return;
-    }
+    return if !(document.activeElement === null || document.activeElement === document.body);
     
     updateShiftState(e.shiftKey);
     

Resources/Plugins/edit-design/.meta

@@ -8,10 +8,10 @@ Edit layout & design
 chylex
 
 [version]
-1.1.2
+1.1.4
 
 [website]
 https://tweetduck.chylex.com
 
 [requires]
-1.7
+1.10.2

Resources/Plugins/edit-design/browser.js

@@ -102,23 +102,21 @@ enabled(){
   
   // settings click event
   this.onSettingsMenuClickedEvent = () => {
-    if (this.htmlModal === null || this.config === null){
-      return;
-    }
+    return if this.htmlModal === null || this.config === null;
     
     setTimeout(() => {
       let menu = $(".js-dropdown-content").children("ul").first();
-      if (menu.length === 0)return;
+      return if menu.length === 0;
       
-      let itemTD = menu.children("[data-std]").first();
-      if (itemTD.length === 0)return;
+      let itemTD = menu.children("[data-tweetduck]").first();
+      return if itemTD.length === 0;
       
       if (!itemTD.prev().hasClass("drp-h-divider")){
         itemTD.before('<li class="drp-h-divider"></li>');
       }
       
       let itemEditDesign = $('<li class="is-selectable"><a href="#" data-action>Edit layout &amp; design</a></li>');
-      itemTD.after(itemEditDesign);
+      itemEditDesign.insertAfter(itemTD);
       
       itemEditDesign.on("click", "a", this.openEditDesignDialog);
       
@@ -333,20 +331,25 @@ 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(".txt-base-smallest:not(.icon), .txt-base-largest:not(.icon) { 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 }");
     
+    let notificationScrollbarColor = null;
+    
     if (this.config.themeColorTweaks){
       switch(TD.settings.getTheme()){
         case "dark":
           this.css.insert(".app-content, .app-columns-container { background-color: #444448 }");
           this.css.insert(".column-drag-handle { opacity: 0.5 }");
           this.css.insert(".column-drag-handle:hover { opacity: 1 }");
+          this.css.insert(".scroll-styled-v:not(.scroll-alt)::-webkit-scrollbar-thumb, .scroll-styled-h:not(.scroll-alt)::-webkit-scrollbar-thumb { background-color: #666 }");
+          notificationScrollbarColor = "666";
           break;
 
         case "light":
-          this.css.insert(".scroll-styled-v::-webkit-scrollbar-thumb, .scroll-styled-h::-webkit-scrollbar-thumb { background-color: #d2d6da }");
+          this.css.insert(".scroll-styled-v:not(.scroll-alt)::-webkit-scrollbar-thumb, .scroll-styled-h:not(.scroll-alt)::-webkit-scrollbar-thumb { background-color: #d2d6da }");
           this.css.insert(".app-columns-container.scroll-styled-h::-webkit-scrollbar-thumb:not(:hover) { background-color: #a5aeb5 }");
+          notificationScrollbarColor = "a5aeb5";
           break;
       }
     }
@@ -462,6 +465,9 @@ enabled(){
 .drawer .btn .icon, .app-header .btn .icon { line-height: 1em !important }
 .column-header .column-type-icon { bottom: 26px !important }
 .is-options-open .column-type-icon { bottom: 25px !important }
+
+.tweet-action-item .icon-favorite-toggle { font-size: 16px !important; }
+.tweet-action-item .heartsprite { top: -260% !important; left: -260% !important; transform: scale(0.4, 0.39) translateY(0.5px) !important; }
 .tweet-footer { margin-top: 6px !important }`;
       
       document.head.appendChild(this.icons);
@@ -501,7 +507,7 @@ enabled(){
     
     $TDP.injectIntoNotificationsBefore(this.$token, "css", "</head>", `
 <style type='text/css'>
-.txt-base-smallest:not(.icon), .txt-base-largest:not(.icon) { font-size: ${this.config.fontSize} !important }
+html[data-td-font] { font-size: ${this.config.fontSize} !important }
 .avatar { border-radius: ${this.config.avatarRadius}% !important }
 
 ${this.config.revertIcons ? `
@@ -513,6 +519,10 @@ ${this.config.revertIcons ? `
 .icon-user-filled:before{content:"\\f035";font-family:tweetdeckold}
 .icon-user-dd:before{content:"\\f01a";font-family:tweetdeckold}
 ` : ``}
+
+${notificationScrollbarColor ? `
+.scroll-styled-v::-webkit-scrollbar-thumb, .scroll-styled-h::-webkit-scrollbar-thumb { background-color: #${notificationScrollbarColor} }
+` : ``}
 </style>`);
   };
   

Resources/Plugins/emoji-keyboard/.meta

@@ -9,7 +9,7 @@ Emoji keyboard
 chylex
 
 [version]
-1.3
+1.4
 
 [website]
 https://tweetduck.chylex.com

Resources/Plugins/emoji-keyboard/browser.js

@@ -45,13 +45,6 @@ enabled(){
   this.css.insert(".emoji-keyboard-skintones .sel { border: 2px solid rgba(0, 0, 0, 0.35); box-shadow: 0 0 2px 0 rgba(255, 255, 255, 0.65), 0 0 1px 0 rgba(255, 255, 255, 0.4) inset }");
   this.css.insert(".emoji-keyboard-skintones :hover { border: 2px solid rgba(0, 0, 0, 0.25); box-shadow: 0 0 1px 0 rgba(255, 255, 255, 0.65), 0 0 1px 0 rgba(255, 255, 255, 0.25) inset }");
   
-  this.css.insert("#emoji-keyboard-tweet-input { padding: 0 !important; line-height: 18px }");
-  this.css.insert("#emoji-keyboard-tweet-input img { padding: 0.1em !important; width: 1em; height: 1em; vertical-align: -0.25em }");
-  this.css.insert("#emoji-keyboard-tweet-input:empty::before { content: \"What's happening?\"; display: inline-block; color: #ced8de }");
-  
-  this.css.insert(".js-docked-compose .compose-text-container.td-emoji-keyboard-swap .js-compose-text { position: absolute; z-index: -9999; left: 0; opacity: 0 }");
-  this.css.insert(".compose-text-container:not(.td-emoji-keyboard-swap) #emoji-keyboard-tweet-input { display: none; }");
-  
   this.css.insert(".js-compose-text { font-family: \"Twitter Color Emoji\", Helvetica, Arial, Verdana, sans-serif; }");
   
   // layout
@@ -72,6 +65,9 @@ enabled(){
   this.currentKeyboard = null;
   this.currentSpanner = null;
   
+  var wasSearchFocused = false;
+  var lastEmojiKeyword, lastEmojiPosition, lastEmojiLength;
+  
   var hideKeyboard = (refocus) => {
     $(this.currentKeyboard).remove();
     this.currentKeyboard = null;
@@ -86,18 +82,19 @@ enabled(){
     $(".emoji-keyboard-popup-btn").removeClass("is-selected");
     
     if (refocus){
-      if ($(".compose-text-container", ".js-docked-compose").hasClass("td-emoji-keyboard-swap")){
-        $("#emoji-keyboard-tweet-input").focus();
-      }
-      else{
-        $(".js-compose-text", ".js-docked-compose").focus();
+      this.composeInput.focus();
+      
+      if (lastEmojiKeyword && lastEmojiPosition === 0){
+        document.execCommand("insertText", false, lastEmojiKeyword);
       }
     }
+    
+    lastEmojiKeyword = null;
   };
   
   var generateEmojiHTML = skinTone => {
     let index = 0;
-    let html = [ "<p style='font-size:13px;color:#444;margin:4px;text-align:center'>Please, note that most emoji will not show up properly in the text box above, but they will display in the tweet.</p>" ];
+    let html = [ "<p style='font-size:13px;color:#444;margin:4px;text-align:center'>Please, note that some emoji may not show up correctly in the text box above, but they will display in the tweet.</p>" ];
     
     for(let array of [ this.emojiData1, this.emojiData2[skinTone], this.emojiData3 ]){
       for(let emoji of array){
@@ -193,16 +190,36 @@ enabled(){
     var searchInput = search.children[0];
     searchInput.focus();
     
+    wasSearchFocused = false;
+    
     searchInput.addEventListener("input", function(e){
       me.currentKeywords = e.target.value.split(" ").filter(kw => kw.length > 0).map(kw => kw.toLowerCase());
       updateFilters();
+      
+      wasSearchFocused = $(this).val().length > 0;
       e.stopPropagation();
     });
     
-    searchInput.addEventListener("focus", function(){
+    searchInput.addEventListener("keydown", function(e){
+      if (e.keyCode === 13 && $(this).val().length){ // enter
+        let ele = $(".emoji-keyboard-list").children("img").filter(":visible").first();
+        
+        if (ele.length > 0){
+          insertEmoji(ele[0].getAttribute("src"), ele[0].getAttribute("alt"));
+        }
+        
+        e.preventDefault();
+      }
+    });
+    
+    searchInput.addEventListener("click", function(){
       $(this).select();
     });
     
+    searchInput.addEventListener("focus", function(){
+      wasSearchFocused = true;
+    });
+    
     this.currentKeyboard = outer;
     selectSkinTone(this.selectedSkinTone);
     
@@ -218,39 +235,26 @@ enabled(){
     return button.offset().top+button.outerHeight()+me.composePanelScroller.scrollTop()+8;
   };
   
-  var focusWithCaretAtEnd = () => {
-    let range = document.createRange();
-    range.selectNodeContents(me.composeInputNew[0]);
-    range.collapse(false);
-    
-    let sel = window.getSelection();
-    sel.removeAllRanges();
-    sel.addRange(range);
-  };
-  
   var insertEmoji = (src, alt) => {
-    if (this.ENABLE_CUSTOM_KEYBOARD){
-      replaceEditor(true);
+    let input = this.composeInput;
 
-      if (!hasSelectionInEditor()){
-        focusWithCaretAtEnd();
-      }
+    let val = input.val();
+    let posStart = input[0].selectionStart;
+    let posEnd = input[0].selectionEnd;
 
-      document.execCommand("insertHTML", false, `<img src="${src}" alt="${alt}">`);
+    input.val(val.slice(0, posStart)+alt+val.slice(posEnd));
+    input.trigger("change");
+
+    input[0].selectionStart = posStart+alt.length;
+    input[0].selectionEnd = posStart+alt.length;
+    
+    lastEmojiKeyword = null;
+    
+    if (wasSearchFocused){
+      $(".emoji-keyboard-search").children("input").focus();
     }
     else{
-      let input = $(".js-compose-text", ".js-docked-compose");
-      
-      let val = input.val();
-      let posStart = input[0].selectionStart;
-      let posEnd = input[0].selectionEnd;
-      
-      input.val(val.slice(0, posStart)+alt+val.slice(posEnd));
-      input.trigger("change");
       input.focus();
-      
-      input[0].selectionStart = posStart+alt.length;
-      input[0].selectionEnd = posStart+alt.length;
     }
   };
   
@@ -258,8 +262,8 @@ enabled(){
   
   this.emojiKeyboardButtonClickEvent = function(e){
     if (me.currentKeyboard){
-      hideKeyboard();
       $(this).blur();
+      hideKeyboard(true);
     }
     else{
       me.generateKeyboard($(this).offset().left, getKeyboardTop());
@@ -275,6 +279,96 @@ enabled(){
     }
   };
   
+  this.composeInputKeyDownEvent = function(e){
+    if (lastEmojiKeyword && (e.keyCode === 8 || e.keyCode === 27)){ // backspace, escape
+      let ele = $(this)[0];
+      
+      if (ele.selectionStart === lastEmojiPosition){
+        ele.selectionStart -= lastEmojiLength; // selects the emoji
+        document.execCommand("insertText", false, lastEmojiKeyword);
+
+        e.preventDefault();
+        e.stopPropagation();
+      }
+      
+      lastEmojiKeyword = null;
+    }
+  };
+  
+  this.composeInputKeyPressEvent = function(e){
+    if (String.fromCharCode(e.which) === ':'){
+      let ele = $(this);
+      let val = ele.val();
+      
+      let firstColon = val.lastIndexOf(':', ele[0].selectionStart);
+      return if firstColon === -1;
+      
+      let search = val.substring(firstColon+1, ele[0].selectionStart);
+      return if !/^[a-z_]+$/i.test(search);
+      
+      let keywords = search.split("_").filter(kw => kw.length > 0).map(kw => kw.toLowerCase());
+      return if keywords.length === 0;
+      
+      let foundName = me.emojiNames.filter(name => keywords.every(kw => name.includes(kw)));
+      
+      if (foundName.length === 0){
+        return;
+      }
+      
+      lastEmojiKeyword = `:${search}:`;
+      lastEmojiPosition = lastEmojiLength = 0;
+      
+      if (foundName.length === 1){
+        let foundIndex = me.emojiNames.indexOf(foundName[0]);
+        let foundEmoji;
+        
+        for(let array of [ me.emojiData1, me.emojiData2[me.selectedSkinTone], me.emojiData3 ]){
+          let realArray = array.filter(ele => ele !== "___");
+          
+          if (foundIndex >= realArray.length){
+            foundIndex -= realArray.length;
+          }
+          else{
+            foundEmoji = realArray[foundIndex];
+            break;
+          }
+        }
+        
+        if (foundEmoji){
+          e.preventDefault();
+          
+          ele.val(val.substring(0, firstColon)+foundEmoji+val.substring(ele[0].selectionStart));
+          ele[0].selectionEnd = ele[0].selectionStart = firstColon+foundEmoji.length;
+          ele.trigger("change");
+          ele.focus();
+          
+          lastEmojiPosition = firstColon+foundEmoji.length;
+          lastEmojiLength = foundEmoji.length;
+        }
+      }
+      else if (foundName.length > 1){
+        e.preventDefault();
+        ele.val(val.substring(0, firstColon)+val.substring(ele[0].selectionStart));
+        ele[0].selectionEnd = ele[0].selectionStart = firstColon;
+        ele.trigger("change");
+        
+        if (!me.currentKeyboard){
+          $(".emoji-keyboard-popup-btn").click();
+        }
+        
+        $(".emoji-keyboard-search").children("input").focus().val("");
+        document.execCommand("insertText", false, keywords.join(" "));
+      }
+    }
+    else{
+      lastEmojiKeyword = null;
+    }
+  };
+  
+  this.composeInputFocusEvent = function(e){
+    wasSearchFocused = false;
+  };
+  
   this.composerSendingEvent = function(e){
     hideKeyboard();
   };
@@ -297,152 +391,11 @@ enabled(){
       me.currentKeyboard.style.top = getKeyboardTop()+"px";
     }
   };
-  
-  // new editor event handlers
-  
-  var prevOldInputVal = "";
-  var isEditorActive = false;
-  
-  var hasSelectionInEditor = function(){
-    let sel = window.getSelection();
-    return sel.anchorNode && $(sel.anchorNode).closest("#emoji-keyboard-tweet-input").length;
-  };
-  
-  var migrateEditorText = function(){
-    let selStart = me.composeInputOrig[0].selectionStart;
-    let selEnd = me.composeInputOrig[0].selectionEnd;
-    
-    let val = me.composeInputOrig.val();
-    let splitStart = val.substring(0, selStart).split("\n");
-    let splitEnd = val.substring(0, selEnd).split("\n");
-
-    me.composeInputNew.text(val);
-    me.composeInputNew.html(me.composeInputNew.text().replace(/^(.*?)$/gm, "<div>$1</div>").replace(/<div><\/div>/g, "<div><br></div>"));
-    
-    let sel = window.getSelection();
-    let range = document.createRange();
-    
-    if (me.composeInputNew[0].children.length === 0){
-      focusWithCaretAtEnd();
-    }
-    else{
-      me.composeInputNew.focus();
-      range.setStart(me.composeInputNew[0].children[splitStart.length-1].firstChild, splitStart.length > 1 ? selStart-val.lastIndexOf("\n", selStart)-1 : selStart);
-      range.setEnd(me.composeInputNew[0].children[splitEnd.length-1].firstChild, splitEnd.length > 1 ? selEnd-val.lastIndexOf("\n", selEnd)-1 : selEnd);
-    }
-    
-    sel.removeAllRanges();
-    sel.addRange(range);
-  };
-  
-  var replaceEditor = function(useCustom){
-    if (useCustom && !isEditorActive){
-      isEditorActive = true;
-    }
-    else if (!useCustom && isEditorActive){
-      isEditorActive = false;
-    }
-    else return;
-    
-    $(".compose-text-container", ".js-docked-compose").toggleClass("td-emoji-keyboard-swap", isEditorActive);
-    
-    if (isEditorActive){
-      migrateEditorText();
-    }
-    else{
-      me.composeInputOrig.focus();
-    }
-  };
-  
-  this.composeOldInputFocusEvent = function(){
-    if (!isEditorActive){
-      return;
-    }
-    
-    let val = $(this).val();
-    
-    if (val.length === 0){
-      replaceEditor(false);
-    }
-    else if (val != prevOldInputVal){
-      setTimeout(migrateEditorText, 1);
-    }
-    else{
-      focusWithCaretAtEnd();
-    }
-    
-    prevOldInputVal = val;
-  };
-  
-  var allowedShortcuts = [ 65 /* A */, 67 /* C */, 86 /* V */, 89 /* Y */, 90 /* Z */ ];
-  
-  this.composeInputKeyEvent = function(e){
-    if (e.type === "keydown" && (e.ctrlKey || e.metaKey)){
-      if (e.keyCode === 13){ // enter
-        $(".js-send-button", ".js-docked-compose").click();
-      }
-      else if (e.keyCode >= 48 && !allowedShortcuts.includes(e.keyCode)){
-        e.preventDefault();
-        return;
-      }
-    }
-    
-    if (e.keyCode !== 27){ // escape
-      e.stopPropagation();
-    }
-  };
-  
-  this.composeInputUpdateEvent = function(){
-    let clone = $(this).clone();
-    
-    clone.children("div").each(function(){
-      let ele = $(this)[0];
-      ele.outerHTML = "\n"+ele.innerHTML;
-    });
-    
-    clone.children("img").each(function(){
-      let ele = $(this)[0];
-      ele.outerHTML = ele.getAttribute("alt");
-    });
-    
-    me.composeInputOrig.val(prevOldInputVal = clone.text());
-    me.composeInputOrig.trigger("change");
-    
-    if (prevOldInputVal.length === 0){
-      replaceEditor(false);
-    }
-    
-    /* TODO if (!emoji.length){
-      let sel = window.getSelection();
-      let selStart = -1, selEnd = -1;
-      
-      if ($(sel.anchorNode).closest("#emoji-keyboard-tweet-input").length && sel.rangeCount === 1){
-        let range = sel.getRangeAt(0);
-        // TODO figure out offset
-      }
-      
-      replaceEditor(false);
-      me.composeInputOrig.focus();
-      
-      if (selStart !== -1){
-        me.composeInputOrig[0].selectionStart = selStart;
-        me.composeInputOrig[0].selectionEnd = selEnd;
-      }
-    }*/
-  };
-  
-  this.composeInputPasteEvent = function(e){ // contenteditable with <img alt> handles copying just fine
-    e.preventDefault();
-    
-    let text = e.originalEvent.clipboardData.getData("text/plain");
-    text && document.execCommand("insertText", false, text);
-  };
-  
-  // TODO handle @ and hashtags
 }
 
 ready(){
   this.composeDrawer = $("[data-drawer='compose']");
+  this.composeInput = $(".js-compose-text", ".js-docked-compose");
   
   this.composePanelScroller = $(".js-compose-scroller", ".js-docked-compose").first().children().first();
   this.composePanelScroller.on("scroll", this.composerScrollEvent);
@@ -451,21 +404,11 @@ ready(){
   $(document).on("click", this.documentClickEvent);
   $(document).on("keydown", this.documentKeyEvent);
   $(document).on("uiComposeImageAdded", this.uploadFilesEvent);
+  this.composeInput.on("keydown", this.composeInputKeyDownEvent);
+  this.composeInput.on("keypress", this.composeInputKeyPressEvent);
+  this.composeInput.on("focus", this.composeInputFocusEvent);
   this.composeDrawer.on("uiComposeTweetSending", this.composerSendingEvent);
   
-  // Editor
-  
-  this.composeInputOrig = $(".js-compose-text", ".js-docked-compose").first();
-  this.composeInputNew = $('<div id="emoji-keyboard-tweet-input" contenteditable="true" class="compose-text txt-size--14 scroll-v scroll-styled-v scroll-styled-h scroll-alt td-detect-image-paste"></div>').insertAfter(this.composeInputOrig);
-  
-  if (this.ENABLE_CUSTOM_KEYBOARD){
-    this.composeInputOrig.on("focus", this.composeOldInputFocusEvent);
-
-    this.composeInputNew.on("keydown keypress keyup", this.composeInputKeyEvent);
-    this.composeInputNew.on("input", this.composeInputUpdateEvent);
-    this.composeInputNew.on("paste", this.composeInputPasteEvent);
-  }
-  
   // HTML generation
   
   var convUnicode = function(codePt){
@@ -579,9 +522,6 @@ disabled(){
     $(this.currentSpanner).remove();
   }
   
-  this.composeInputNew.remove();
-  
-  this.composeInputOrig.off("focus", this.composeOldInputFocusEvent);
   this.composePanelScroller.off("scroll", this.composerScrollEvent);
   
   $(".emoji-keyboard-popup-btn").off("click", this.emojiKeyboardButtonClickEvent);
@@ -590,6 +530,9 @@ disabled(){
   $(document).off("click", this.documentClickEvent);
   $(document).off("keydown", this.documentKeyEvent);
   $(document).off("uiComposeImageAdded", this.uploadFilesEvent);
+  this.composeInput.off("keydown", this.composeInputKeyDownEvent);
+  this.composeInput.off("keypress", this.composeInputKeyPressEvent);
+  this.composeInput.off("focus", this.composeInputFocusEvent);
   this.composeDrawer.off("uiComposeTweetSending", this.composerSendingEvent);
   
   TD.mustaches["compose/docked_compose.mustache"] = this.prevComposeMustache;

Resources/Plugins/reply-account/.meta

@@ -8,7 +8,7 @@ Custom reply account
 chylex
 
 [version]
-1.2.1
+1.2.3
 
 [website]
 https://tweetduck.chylex.com
@@ -20,4 +20,4 @@ configuration.js
 configuration.default.js
 
 [requires]
-1.3.3
+1.8

Resources/Plugins/reply-account/browser.js

@@ -6,9 +6,7 @@ enabled(){
   this.lastSelectedAccount = null;
   
   this.uiComposeTweetEvent = (e, data) => {
-    if (data.type !== "reply" || data.popFromInline || !("element" in data)){
-      return;
-    }
+    return if data.type !== "reply" || data.popFromInline || !("element" in data);
     
     var query;
     
@@ -19,7 +17,7 @@ enabled(){
           return;
         }
         
-        var section = data.element.closest("section.column");
+        var section = data.element.closest("section.js-column");
         
         var column = TD.controller.columnManager.get(section.attr("data-column"));
         var header = $(".column-title", section);
@@ -37,7 +35,7 @@ enabled(){
         }
         
         try{
-          query = configuration.customSelector(column.getColumnType(), columnTitle, columnAccount, column);
+          query = configuration.customSelector(column.getColumnType(), columnTitle, columnAccount, column, section.hasClass("column-temp"));
         }catch(e){
           $TD.alert("warning", "Plugin reply-account has invalid configuration: customSelector threw an error: "+e.message);
           return;
@@ -83,9 +81,7 @@ enabled(){
         break;
       
       case "#last":
-        if (this.lastSelectedAccount === null){
-          return;
-        }
+        return if this.lastSelectedAccount === null;
         
         identifier = this.lastSelectedAccount;
         break;

Resources/Plugins/reply-account/configuration.default.js

@@ -1,12 +1,4 @@
 {
-  /*
-   * WARNING
-   * -------
-   *
-   * Make sure you are editing 'configuration.js' and not the default configuration file, as the default one will be replaced with each update.
-   *
-   */
-  
   /*
    * Simple way of configuring the plugin
    * ------------------------------------
@@ -29,11 +21,14 @@
    * This assumes a basic knowledge of JavaScript and jQuery.
    *
    * 1. Set value of 'useAdvancedSelector' to true
-   * 2. Uncomment the 'customSelector' function, and replace the example code with your desired behavior
+   * 2. Replace the example code in 'customSelector' function with your desired behavior
    *
    * The 'customSelector' function should return a string in one of the formats supported by 'defaultAccount'.
    * If it returns anything else (for example, false or undefined), it falls back to 'defaultAccount' behavior.
    *
+   * When writing a custom function, you can install Dev Tools to access the browser console:
+   *   https://tweetduck.chylex.com/guide/#dev-tools
+   *
    *
    * The 'type' parameter is TweetDeck column type. Here is the full list of column types, note that some are
    * unused and have misleading names (for example, Home columns are 'col_timeline' instead of 'col_home'):
@@ -54,28 +49,33 @@
    * contain other text (for example, the Scheduled column contains the string 'All accounts').
    *
    *
-   * The 'column' parameter is a TweetDeck column object. If you want to see all properties of the object,
-   * run the following code in your browser console, which will return an array containing all of your
-   * current column objects in order:
+   * The 'column' parameter is a TweetDeck column object. If you want to see the object structure,
+   * run the following code in the console for an array containing all of your column objects:
    *   TD.controller.columnManager.getAllOrdered()
    *
+   *
+   * The 'isTemporary' parameter is true if the column is not attached to the main column list,
+   * for example when clicking on a profile and viewing their tweets in a modal dialog.
+   *
    */
   
   useAdvancedSelector: false,
   
-  /*customSelector: function(type, title, account, column){
+  customSelector: function(type, title, account, column, isTemporary){
+    console.info(arguments); // Prints all arguments into the console
+    
     if (type === "col_search" && title === "TweetDuck"){
       // This is a search column that looks for 'TweetDuck' in the tweets,
       // search columns are normally linked to the preferred account
-      // so this forces the @TryTweetDuck account to be used instead.
+      // so this forces the @TryTweetDuck account to be used instead
       return "@TryTweetDuck";
     }
     else if (type === "col_timeline" && account === "@chylexcz"){
       // This is a Home column of my test account @chylexcz,
-      // but I want to reply to tweets from my official account.
+      // but I want to reply to tweets from my official account
       return "@chylexmc";
     }
     
     // otherwise returns 'undefined' which falls back to 'defaultAccount' behavior
-  }*/
+  }
 }

Resources/Plugins/templates/browser.js

@@ -177,7 +177,7 @@ enabled(){
   
   var useTemplate = (contents, append) => {
     let ele = $(".js-compose-text");
-    if (ele.length === 0)return;
+    return if ele.length === 0;
     
     let value = append ? ele.val()+contents : contents;
     let prevLength = value.length;

Resources/PostBuild.ps1

@@ -3,10 +3,31 @@ $ErrorActionPreference = "Stop"
 
 Set-Location $dir
 
-ForEach($file in Get-ChildItem -Include *.js, *.html -Recurse){
-  $lines = Get-Content -Path $file.FullName
-  $lines = ($lines | % { $_.TrimStart() }) -Replace '^(.*?)((?<=^|[;{}()] )//\s.*)?$', '$1'
+function Rewrite-File{
+  [CmdletBinding()]
+  Param([Parameter(Mandatory = $True, ValueFromPipeline = $True)][array] $lines, [Parameter(Mandatory = $True, Position = 1)] $file)
+  
   $lines | Where { $_ -ne '' } | Set-Content -Path $file.FullName
-
   Write-Host "Processed" $file.FullName.Substring($dir.Length)
 }
+
+ForEach($file in Get-ChildItem -Include *.js -Exclude configuration.default.js -Recurse){
+  $lines = Get-Content -Path $file.FullName
+  $lines = $lines | % { $_.TrimStart() }
+  $lines = $lines -Replace '^(.*?)((?<=^|[;{}()])\s?//(?:\s.*|$))?$', '$1'
+  $lines = $lines -Replace '(?<!\w)return(\s.*?)? if (.*?);', 'if ($2)return$1;'
+  ,$lines | Rewrite-File $file
+}
+
+ForEach($file in Get-ChildItem -Include *.css -Recurse){
+  $lines = Get-Content -Path $file.FullName
+  $lines = $lines -Replace '\s*/\*.*?\*/', ''
+  $lines = $lines -Replace '^\s+(.+):\s?(.+?)(?:\s?(!important))?;$', '$1:$2$3;'
+  $lines = $lines -Replace '^(\S.*?) {$', '$1{'
+  @(($lines | Where { $_ -ne '' }) -Join ' ') | Rewrite-File $file
+}
+
+ForEach($file in Get-ChildItem -Include *.html -Recurse){
+  $lines = Get-Content -Path $file.FullName
+  ,($lines | % { $_.TrimStart() }) | Rewrite-File $file
+}

Resources/ScriptLoader.cs

@@ -1,5 +1,4 @@
 using CefSharp;
-using CefSharp.WinForms;
 using System;
 using System.IO;
 using System.Text;
@@ -21,28 +20,16 @@ namespace TweetDuck.Resources{
             }
         }
 
-        public static void ExecuteFile(ChromiumWebBrowser browser, string file){
-            ExecuteScript(browser, LoadResource(file), GetRootIdentifier(file));
-        }
-
         public static void ExecuteFile(IFrame frame, string file){
             ExecuteScript(frame, LoadResource(file), GetRootIdentifier(file));
         }
 
-        public static void ExecuteScript(ChromiumWebBrowser browser, string script, string identifier){
-            if (script == null)return;
-
-            using(IFrame frame = browser.GetMainFrame()){
+        public static void ExecuteScript(IFrame frame, string script, string identifier){
+            if (script != null){
                 frame.ExecuteJavaScriptAsync(script, UrlPrefix+identifier, 1);
             }
         }
 
-        public static void ExecuteScript(IFrame frame, string script, string identifier){
-            if (script == null)return;
-
-            frame.ExecuteJavaScriptAsync(script, UrlPrefix+identifier, 1);
-        }
-
         public static string GetRootIdentifier(string file){
             return "root:"+Path.GetFileNameWithoutExtension(file);
         }

Resources/Scripts/code.js

@@ -14,6 +14,11 @@
   //
   var onAppReady = [];
   
+  //
+  // Variable: DOM HTML element.
+  //
+  var doc = document.documentElement;
+  
   //
   // Variable: DOM object containing the main app element.
   //
@@ -112,9 +117,7 @@
     };
     
     let checkTweetCache = (set, id) => {
-      if (set.has(id)){
-        return true;
-      }
+      return true if set.has(id);
       
       if (set.size > 50){
         set.clear();
@@ -130,19 +133,17 @@
     
     return function(column, tweet){
       if (tweet instanceof TD.services.TwitterConversation || tweet instanceof TD.services.TwitterConversationMessageEvent){
-        if (checkTweetCache(recentMessages, tweet.id)){
-          return;
-        }
+        return if checkTweetCache(recentMessages, tweet.id);
       }
-      else if (checkTweetCache(recentTweets, tweet.id)){
-        return;
+      else{
+        return if checkTweetCache(recentTweets, tweet.id);
       }
       
       startRecentTweetTimer();
       
       if (column.model.getHasNotification()){
         let sensitive = (tweet.getRelatedTweet() && tweet.getRelatedTweet().possiblySensitive || (tweet.quotedTweet && tweet.quotedTweet.possiblySensitive));
-        let previews = $TDX.notificationMediaPreviews && !sensitive;
+        let previews = $TDX.notificationMediaPreviews && (!sensitive || TD.settings.getDisplaySensitiveMedia());
         
         let html = $(tweet.render({
           withFooter: false,
@@ -200,10 +201,12 @@
         
         let source = tweet.getRelatedTweet();
         let duration = source ? source.text.length+(source.quotedTweet ? source.quotedTweet.text.length : 0) : tweet.text.length;
+        
+        let chirpId = source ? source.id : "";
         let tweetUrl = source ? source.getChirpURL() : "";
         let quoteUrl = source && source.quotedTweet ? source.quotedTweet.getChirpURL() : "";
 
-        $TD.onTweetPopup(columnTypes[column.getColumnType()] || "", html.html(), duration, tweetUrl, quoteUrl);
+        $TD.onTweetPopup(column.model.privateState.apiid, chirpId, columnTypes[column.getColumnType()] || "", html.html(), duration, tweetUrl, quoteUrl);
       }
 
       if (column.model.getHasSound()){
@@ -213,47 +216,109 @@
   })();
   
   //
-  // Function: Retrieves the tags to be put into <head> for notification HTML code.
+  // Function: Shows tweet detail, used in notification context menu.
   //
-  var getNotificationHeadContents = function(){
-    let tags = [];
+  (function(){
+    var showTweetDetailInternal = function(column, chirp){
+      TD.ui.updates.showDetailView(column, chirp, column.findChirp(chirp) || chirp);
+      TD.controller.columnManager.showColumn(column.model.privateState.key);
+
+      $(document).trigger("uiGridClearSelection");
+    };
     
-    $(document.head).children("link[rel='stylesheet']:not([title]),link[title='"+TD.settings.getTheme()+"'],meta[charset],meta[http-equiv]").each(function(){
-      tags.push($(this)[0].outerHTML);
+    window.TDGF_showTweetDetail = function(columnId, chirpId, fallbackUrl){
+      if (!TD.ready){
+        onAppReady.push(function(){
+          window.TDGF_showTweetDetail(columnId, chirpId, fallbackUrl);
+        });
+        
+        return;
+      }
+      
+      let column = TD.controller.columnManager.getByApiid(columnId);
+      
+      if (!column){
+        if (confirm("error|The column which contained the tweet no longer exists. Would you like to open the tweet in your browser instead?")){
+          $TD.openBrowser(fallbackUrl);
+        }
+        
+        return;
+      }
+      
+      let chirp = column.findMostInterestingChirp(chirpId);
+      
+      if (chirp){
+        showTweetDetailInternal(column, chirp);
+      }
+      else{
+        TD.controller.clients.getPreferredClient().show(chirpId, function(chirp){
+          showTweetDetailInternal(column, chirp);
+        }, function(){
+          if (confirm("error|Could not retrieve the requested tweet. Would you like to open the tweet in your browser instead?")){
+            $TD.openBrowser(fallbackUrl);
+          }
+        });
+      }
+    };
+  })();
+  
+  //
+  // Block: Hook into settings object to detect when the settings change, and update html attributes and notification layout.
+  //
+  (function(){
+    let refreshSettings = function(){      
+      let fontSizeName = TD.settings.getFontSize();
+      let themeName = TD.settings.getTheme();
+      
+      let tags = [
+        `<html class='os-windows ${(doc.getAttribute("class").match(/txt-\S+/) || [ "txt-size--14" ])[0]}' data-td-font='${fontSizeName}' data-td-theme='${themeName}'><head>`
+      ];
+      
+      $(document.head).children("link[rel='stylesheet']:not([title]),link[title='"+themeName+"'],meta[charset],meta[http-equiv]").each(function(){
+        tags.push($(this)[0].outerHTML);
+      });
+      
+      tags.push("<style type='text/css'>");
+      tags.push("body { background: "+getClassStyleProperty("column", "background-color")+" }"); // set background color
+      tags.push("a[data-full-url] { word-break: break-all }"); // break long urls
+      tags.push(".media-item, .media-preview { border-radius: 1px !important }"); // square-ify media
+      tags.push(".quoted-tweet { border-radius: 0 !important }"); // square-ify quoted tweets
+      tags.push(".activity-header { align-items: center !important; margin-bottom: 4px }"); // tweak alignment of avatar and text in notifications
+      tags.push(".activity-header .tweet-timestamp { line-height: unset }"); // fix timestamp position in notifications
+      
+      if (fontSizeName === "smallest"){
+        tags.push(".badge-verified:before { width: 13px !important; height: 13px !important; background-position: -223px -98px !important }"); // fix cut off badge icon
+      }
+      
+      tags.push("</style>");
+      
+      doc.setAttribute("data-td-font", fontSizeName);
+      doc.setAttribute("data-td-theme", themeName);
+      $TD.loadNotificationLayout(fontSizeName, tags.join(""));
+    };
+    
+    TD.settings.setFontSize = appendToFunction(TD.settings.setFontSize, function(name){
+      setTimeout(refreshSettings, 0);
     });
-    
-    tags.push("<style type='text/css'>");
-    tags.push("body { background: "+getClassStyleProperty("column", "background-color")+" }"); // set background color
-    tags.push("a[data-full-url] { word-break: break-all }"); // break long urls
-    tags.push(".txt-base-smallest .badge-verified:before { height: 13px !important }"); // fix cut off badge icon
-    tags.push(".activity-header { align-items: center !important; margin-bottom: 4px }"); // tweak alignment of avatar and text in notifications
-    tags.push(".activity-header .tweet-timestamp { line-height: unset }"); // fix timestamp position in notifications
-    tags.push("</style>");
-    
-    return tags.join("");
-  };
+
+    TD.settings.setTheme = appendToFunction(TD.settings.setTheme, function(name){
+      setTimeout(refreshSettings, 0);
+    });
+
+    onAppReady.push(refreshSettings);
+  })();
   
   //
-  // Block: Hook into settings object to detect when the settings change.
+  // Block: Fix OS name.
   //
-  TD.settings.setFontSize = appendToFunction(TD.settings.setFontSize, function(name){
-    $TD.loadFontSizeClass(name);
-  });
-  
-  TD.settings.setTheme = appendToFunction(TD.settings.setTheme, function(name){
-    document.documentElement.setAttribute("data-td-theme", name);
+  if (ensurePropertyExists(TD, "util", "getOSName")){
+    TD.util.getOSName = function(){
+      return "windows";
+    };
     
-    setTimeout(function(){
-      $TD.loadNotificationHeadContents(getNotificationHeadContents());
-    }, 0);
-  });
-  
-  onAppReady.push(function(){
-    document.documentElement.setAttribute("data-td-theme", TD.settings.getTheme());
-    
-    $TD.loadFontSizeClass(TD.settings.getFontSize());
-    $TD.loadNotificationHeadContents(getNotificationHeadContents());
-  });
+    doc.classList.remove("os-");
+    doc.classList.add("os-windows");
+  }
   
   //
   // Block: Enable popup notifications.
@@ -281,11 +346,10 @@
     $("[data-action='settings-menu']").click(function(){
       setTimeout(function(){
         let menu = $(".js-dropdown-content").children("ul").first();
-        if (menu.length === 0)return;
+        return if menu.length === 0;
         
-        menu.children(".drp-h-divider").last().before('<li class="is-selectable" data-std><a href="#" data-action="tweetduck">TweetDuck</a></li>');
-        
-        let button = menu.children("[data-std]");
+        let button = $('<li class="is-selectable" data-tweetduck><a href="#" data-action>TweetDuck</a></li>');
+        button.insertBefore(menu.children(".drp-h-divider").last());
 
         button.on("click", "a", function(){
           $TD.openContextMenu();
@@ -304,32 +368,19 @@
   // Block: Expand shortened links on hover or display tooltip.
   //
   (function(){
-    var cutStart = function(str, search){
-      return str.startsWith(search) ? str.substr(search.length) : str;
-    };
-    
     var prevMouseX = -1, prevMouseY = -1;
     var tooltipTimer, tooltipDisplayed;
     
-    $(document.body).delegate("a[data-full-url]", "mouseenter mouseleave mousemove", function(e){
-      var me = $(this);
-
-      if (e.type === "mouseenter"){
+    $(document.body).delegate("a[data-full-url]", {
+      mouseenter: function(){
+        let me = $(this);
         let text = me.text();
-        
-        if (text.charCodeAt(text.length-1) !== 8230){ // horizontal ellipsis
-          return;
-        }
+        return if text.charCodeAt(text.length-1) !== 8230; // horizontal ellipsis
         
         if ($TDX.expandLinksOnHover){
           tooltipTimer = window.setTimeout(function(){
-            let expanded = me.attr("data-full-url");
-            expanded = cutStart(expanded, "https://");
-            expanded = cutStart(expanded, "http://");
-            expanded = cutStart(expanded, "www.");
-
             me.attr("td-prev-text", text);
-            me.text(expanded);
+            me.text(me.attr("data-full-url").replace(/^https?:\/\/(www\.)?/, ""));
           }, 200);
         }
         else{
@@ -338,14 +389,13 @@
             tooltipDisplayed = true;
           }, 400);
         }
-      }
-      else if (e.type === "mouseleave"){
-        if ($TDX.expandLinksOnHover){
-          let prevText = me.attr("td-prev-text");
-
-          if (prevText){
-            me.text(prevText);
-          }
+      },
+      
+      mouseleave: function(){
+        let me = $(this);
+        
+        if (me[0].hasAttribute("td-prev-text")){
+          me.text(me.attr("td-prev-text"));
         }
         
         window.clearTimeout(tooltipTimer);
@@ -354,10 +404,11 @@
           tooltipDisplayed = false;
           $TD.displayTooltip(null, false);
         }
-      }
-      else if (e.type === "mousemove"){
+      },
+      
+      mousemove: function(e){
         if (tooltipDisplayed && (prevMouseX !== e.clientX || prevMouseY !== e.clientY)){
-          $TD.displayTooltip(me.attr("data-full-url"), false);
+          $TD.displayTooltip($(this).attr("data-full-url"), false);
           prevMouseX = e.clientX;
           prevMouseY = e.clientY;
         }
@@ -366,33 +417,79 @@
   })();
   
   //
-  // Block: Allow bypassing of t.co and include media previews in context menus.
+  // Block: Bypass t.co when clicking links and media.
   //
-  $(document.body).delegate("a", "contextmenu", function(){
-    $TD.setLastRightClickedLink($(this).attr("data-full-url") || "");
+  $(document.body).delegate("a[data-full-url]", "click auxclick", function(e){
+    if (e.button === 0 || e.button === 1){ // event.which seems to be borked in auxclick
+      $TD.openBrowser($(this).attr("data-full-url"));
+      e.preventDefault();
+    }
   });
   
-  $(document.body).delegate("a.js-media-image-link", "contextmenu", function(){
+  if (ensurePropertyExists(TD, "services", "TwitterUser", "prototype", "fromJSONObject")){
+    let prevFunc = TD.services.TwitterUser.prototype.fromJSONObject;
+    
+    TD.services.TwitterUser.prototype.fromJSONObject = function(){
+      let obj = prevFunc.apply(this, arguments);
+      let e = arguments[0].entities;
+      
+      if (e && e.url && e.url.urls && e.url.urls.length && e.url.urls[0].expanded_url){
+        obj.url = e.url.urls[0].expanded_url;
+      }
+      
+      return obj;
+    };
+  }
+  
+  if (ensurePropertyExists(TD, "services", "TwitterMedia", "prototype", "fromMediaEntity")){
+    let prevFunc = TD.services.TwitterMedia.prototype.fromMediaEntity;
+    
+    TD.services.TwitterMedia.prototype.fromMediaEntity = function(){
+      let obj = prevFunc.apply(this, arguments);
+      let e = arguments[0];
+      
+      if (e.expanded_url){
+        if (obj.url === obj.shortUrl){
+          obj.shortUrl = e.expanded_url;
+        }
+        
+        obj.url = e.expanded_url;
+      }
+      
+      return obj;
+    };
+  }
+  
+  //
+  // Block: Include additional information in context menus.
+  //
+  $(document.body).delegate("a", "contextmenu", function(){
     let me = $(this)[0];
     
-    if (me.firstElementChild){
-      $TD.setLastRightClickedImage(me.firstElementChild.getAttribute("src"));
+    if (me.classList.contains("js-media-image-link") && highlightedTweetObj){
+      let media = (highlightedTweetObj.quotedTweet || highlightedTweetObj).getMedia().find(media => media.mediaId === me.getAttribute("data-media-entity-id"));
+      
+      if ((media.isVideo && media.service === "twitter") || media.isAnimatedGif){
+        $TD.setLastRightClickInfo("video", media.chooseVideoVariant().url);
+      }
+      else{
+        $TD.setLastRightClickInfo("image", media.large());
+      }
+    }
+    else if (me.classList.contains("js-gif-play")){
+      $TD.setLastRightClickInfo("video", $(this).closest(".js-media-gif-container").find("video").attr("src"));
     }
     else{
-      $TD.setLastRightClickedImage(me.style.backgroundImage.replace(/url\(['"]?(.*?)['"]?\)/, "$1"));
+      $TD.setLastRightClickInfo("link", me.getAttribute("data-full-url"));
     }
   });
   
   //
   // Block: Hook into the notification sound effect.
   //
-  (function(){
-    let soundEle = document.getElementById("update-sound");
-    
-    soundEle.play = prependToFunction(soundEle.play, function(){
-      return $TDX.muteNotifications || $TDX.hasCustomNotificationSound;
-    });
-  })();
+  HTMLAudioElement.prototype.play = prependToFunction(HTMLAudioElement.prototype.play, function(){
+    return $TDX.muteNotifications || $TDX.hasCustomNotificationSound;
+  });
   
   //
   // Block: Update highlighted column and tweet for context menu and other functionality.
@@ -406,53 +503,54 @@
       return !!highlightedColumnObj;
     };
     
-    var updateHighlightedTweet = function(ele, obj, link, embeddedLink, author, imageList){
+    var updateHighlightedTweet = function(ele, obj, tweetUrl, quoteUrl, authors, imageList){
       highlightedTweetEle = ele;
       highlightedTweetObj = obj;
       
-      if (lastTweet !== link){
-        $TD.setLastHighlightedTweet(link, embeddedLink, author, imageList);
-        lastTweet = link;
+      if (lastTweet !== tweetUrl){
+        $TD.setLastHighlightedTweet(tweetUrl, quoteUrl, authors, imageList);
+        lastTweet = tweetUrl;
       }
     };
     
-    app.delegate("section.js-column", "mouseenter mouseleave", function(e){
-      if (e.type === "mouseenter"){
+    var processMedia = function(chirp){
+      return chirp.getMedia().filter(item => !item.isAnimatedGif).map(item => item.entity.media_url_https+":small").join(";");
+    };
+    
+    app.delegate("section.js-column", {
+      mouseenter: function(){
         if (!highlightedColumnObj){
           updateHighlightedColumn($(this));
         }
-      }
-      else if (e.type === "mouseleave"){
+      },
+      
+      mouseleave: function(){
         updateHighlightedColumn(null);
       }
     });
     
-    app.delegate("article.js-stream-item", "mouseenter mouseleave", function(e){
-      if (e.type === "mouseenter"){
+    app.delegate("article.js-stream-item", {
+      mouseenter: function(){
         let me = $(this);
-        
-        if (!me[0].hasAttribute("data-account-key") || (!highlightedColumnObj && !updateHighlightedColumn(me.closest("section.js-column")))){
-          return;
-        }
+        return if !me[0].hasAttribute("data-account-key") || (!highlightedColumnObj && !updateHighlightedColumn(me.closest("section.js-column")));
         
         let tweet = highlightedColumnObj.findChirp(me.attr("data-tweet-id")) || highlightedColumnObj.findChirp(me.attr("data-key"));
+        return if !tweet;
         
-        if (tweet){
-          if (tweet.chirpType === TD.services.ChirpBase.TWEET){
-            let link = tweet.getChirpURL();
-            let embedded = tweet.quotedTweet ? tweet.quotedTweet.getChirpURL() : "";
-            let username = tweet.getMainUser().screenName;
-            let images = tweet.hasImage() ? tweet.getMedia().filter(item => !item.isAnimatedGif).map(item => item.entity.media_url_https+":small").join(";") : "";
-            // TODO maybe handle embedded images too?
-            
-            updateHighlightedTweet(me, tweet, link || "", embedded || "", username, images);
-          }
-          else{
-            updateHighlightedTweet(me, tweet, "", "", "", "");
-          }
+        if (tweet.chirpType === TD.services.ChirpBase.TWEET){
+          let tweetUrl = tweet.getChirpURL();
+          let quoteUrl = tweet.quotedTweet ? tweet.quotedTweet.getChirpURL() : "";
+          let authors = tweet.quotedTweet ? [ tweet.getMainUser().screenName, tweet.quotedTweet.getMainUser().screenName ].join(";") : tweet.getMainUser().screenName;
+          let imageList = tweet.quotedTweet && tweet.quotedTweet.hasImage() ? processMedia(tweet.quotedTweet) : tweet.hasImage() ? processMedia(tweet) : "";
+          
+          updateHighlightedTweet(me, tweet, tweetUrl || "", quoteUrl || "", authors, imageList);
         }
-      }
-      else if (e.type === "mouseleave"){
+        else{
+          updateHighlightedTweet(me, tweet, "", "", "", "");
+        }
+      },
+      
+      mouseleave: function(){
         updateHighlightedTweet(null, null, "", "", "", "");
       }
     });
@@ -500,7 +598,7 @@
           setImportantProperty(selectedTweet.find(".js-media-preview-container"), "margin-bottom", "4px");
           selectedTweet.find(".js-translate-call-to-action").first().remove();
           selectedTweet.find(".js-tweet").first().nextAll().remove();
-          selectedTweet.find("footer").last().prevUntil(":not(.txt-mute.txt-small)").addBack().remove(); // footer, date, location
+          selectedTweet.find("footer").last().prevUntil(":not(.txt-mute)").addBack().remove(); // footer, date, location
         }
         else{
           setImportantProperty(selectedTweet.find(".js-media-preview-container"), "margin-bottom", "10px");
@@ -509,6 +607,7 @@
         
         if (isReply){
           selectedTweet.find(".is-conversation").removeClass("is-conversation");
+          selectedTweet.find(".thread").remove();
         }
         
         selectedTweet.find(".js-poll-link").remove();
@@ -538,9 +637,7 @@
       for(let item of e.originalEvent.clipboardData.items){
         if (item.type.startsWith("image/")){
           if (!$(this).closest(".rpl").find(".js-reply-popout").click().length){ // popout direct messages
-            if ($(".js-add-image-button").is(".is-disabled")){ // tweetdeck does not check upload count properly
-              return;
-            }
+            return if $(".js-add-image-button").is(".is-disabled"); // tweetdeck does not check upload count properly
           }
           
           uploader.addFilesToUpload([ item.getAsFile() ]);
@@ -597,6 +694,46 @@
     };
   })();
   
+  //
+  // Block: Allow drag & drop behavior for dropping links on columns to open their detail view.
+  //
+  (function(){
+    let tweetRegex = /^https?:\/\/twitter\.com\/[A-Za-z0-9_]+\/status\/(\d+)\/?$/;
+    let isDraggingValid = false;
+    
+    window.TDGF_onGlobalDragStart = function(type, data){
+      isDraggingValid = (type === "link" || type === "text") && tweetRegex.test(data);
+    };
+    
+    app.delegate("section.js-column", {
+      dragover: function(e){
+        e.originalEvent.dataTransfer.dropEffect = isDraggingValid ? "move" : "none";
+        e.preventDefault();
+        e.stopPropagation();
+      },
+      
+      drop: function(e){
+        let match = tweetRegex.exec(e.originalEvent.dataTransfer.getData("URL"));
+        
+        if (match.length === 2){
+          let column = TD.controller.columnManager.get($(this).attr("data-column"));
+          
+          if (column){
+            TD.controller.clients.getPreferredClient().show(match[1], function(chirp){
+              TD.ui.updates.showDetailView(column, chirp, column.findChirp(chirp) || chirp);
+              $(document).trigger("uiGridClearSelection");
+            }, function(){
+              alert("error|Could not retrieve the requested tweet.");
+            });
+          }
+        }
+        
+        e.preventDefault();
+        e.stopPropagation();
+      }
+    });
+  })();
+  
   //
   // Block: Fix scheduled tweets not showing up sometimes.
   //
@@ -639,9 +776,7 @@
       }
     });
     
-    if (!ensurePropertyExists(TD, "vo", "Column", "prototype", "clear")){
-      return;
-    }
+    return if !ensurePropertyExists(TD, "vo", "Column", "prototype", "clear");
     
     TD.vo.Column.prototype.clear = prependToFunction(TD.vo.Column.prototype.clear, function(){
       window.setTimeout(resetActiveFocus, 0); // unfocuses the Clear button, otherwise it steals keyboard input
@@ -668,9 +803,7 @@
     
     $(".js-drawer[data-drawer='compose']").delegate(".js-account-list > .js-account-item", "click", onAccountClick);
     
-    if (!ensurePropertyExists(TD, "components", "AccountSelector", "prototype", "refreshPostingAccounts")){
-      return;
-    }
+    return if !ensurePropertyExists(TD, "components", "AccountSelector", "prototype", "refreshPostingAccounts");
     
     TD.components.AccountSelector.prototype.refreshPostingAccounts = appendToFunction(TD.components.AccountSelector.prototype.refreshPostingAccounts, function(){
       if (!this.$node.attr("td-account-selector-hook")){
@@ -681,11 +814,13 @@
   });
   
   //
-  // Block: Make middle click on tweet reply icon open the compose drawer.
+  // Block: Make middle click on tweet reply icon open the compose drawer. Only works for non-temporary columns.
   //
-  app.delegate(".js-reply-action", "mousedown", function(e){
+  app.delegate(".js-reply-action", "auxclick", function(e){
     if (e.which === 2){
-      if ($("[data-drawer='compose']").hasClass("is-hidden")){
+      let column = $(this).closest(".js-column");
+      
+      if (column && column.hasClass("column") && $("[data-drawer='compose']").hasClass("is-hidden")){
         $(document).trigger("uiDrawerShowDrawer", {
           drawer: "compose",
           withAnimation: true
@@ -711,73 +846,24 @@
   // Block: Inject custom CSS and layout into the page.
   //
   (function(){
-    let styleOfficial = document.createElement("style");
-    document.head.appendChild(styleOfficial);
-    
-    let addRule = (rule) => {
-      styleOfficial.sheet.insertRule(rule, 0);
+    var createStyle = function(id, styles){
+      let ele = document.createElement("style");
+      ele.id = id;
+      ele.innerText = styles;
+      document.head.appendChild(ele);
     };
     
-    addRule("a[data-full-url] { word-break: break-all; }"); // break long urls
-    addRule(".keyboard-shortcut-list { vertical-align: top; }"); // fix keyboard navigation alignment
-    addRule(".account-inline .username { vertical-align: 10%; }"); // move usernames a bit higher
-    addRule(".character-count-compose { width: 40px !important; }"); // fix strangely wide character count element
-    addRule(".is-video a:not([href*='youtu']) .icon-bg-dot, .is-gif .icon-bg-dot { color: #9f51cf; }"); // change play icon on mp4s
-    
-    addRule(".column-nav-link .attribution { position: absolute; }"); // fix cut off account names
-    addRule(".txt-base-smallest .sprite-verified-mini { width: 13px !important; height: 13px !important; background-position: -223px -99px !important; }"); // fix cut off badge icon when zoomed in
-    
-    addRule(".btn, .mdl, .mdl-content, .app-search-fake, .app-search-input, .popover, .lst-modal, .media-item, .media-preview, .tooltip-inner { border-radius: 1px !important; }"); // square-ify buttons, inputs, dialogs, menus, media previews
-    addRule(".compose-text-container, .dropdown-menu, .list-item-last, .quoted-tweet { border-radius: 0 !important; }"); // square-ify dropdowns, quoted tweets, and account selectors
-    addRule(".prf-header { border-radius: 0; }"); // fix user account header border
-    
-    addRule(".accs li, .accs img { border-radius: 0 !important; }"); // square-ify retweet account selector
-    addRule(".accs-header { padding-left: 0 !important; }"); // fix retweet account selector heading
-    
-    addRule(".scroll-styled-v::-webkit-scrollbar-thumb, .scroll-styled-h::-webkit-scrollbar-thumb, .antiscroll-scrollbar { border-radius: 0; }"); // square-ify scroll bars
-    addRule(".antiscroll-scrollbar-vertical { margin-top: 0; }"); // square-ify scroll bars
-    addRule(".antiscroll-scrollbar-horizontal { margin-left: 0; }"); // square-ify scroll bars
-    addRule(".scroll-styled-v:not(.antiscroll-inner)::-webkit-scrollbar { width: 8px; }"); // square-ify scroll bars
-    addRule(".scroll-styled-h:not(.antiscroll-inner)::-webkit-scrollbar { height: 8px; }"); // square-ify scroll bars
-    addRule(".app-columns-container::-webkit-scrollbar { height: 9px !important; }"); // square-ify scroll bars
-    
-    addRule(".is-condensed .app-header-inner { padding-top: 10px !important; }"); // add extra padding to menu buttons when condensed
-    addRule(".is-condensed .btn-compose { padding: 8px !important; }"); // fix compose button icon when condensed
-    addRule(".app-header:not(.is-condensed) .nav-user-info { padding: 0 5px; }"); // add padding to user info
-    
-    addRule(".app-title { display: none; }"); // hide TweetDeck logo
-    addRule(".nav-user-info { bottom: 10px !important; }"); // move user info
-    addRule(".app-navigator { bottom: 50px !important; }"); // move navigation
-    addRule(".column-navigator-overflow { bottom: 192px !important; }"); // move column list
-    addRule(".app-navigator .tooltip { display: none !important; }"); // hide broken tooltips in the menu
-    
-    addRule(".column .column-header { height: 49px !important; }"); // fix one pixel space below column header
-    addRule(".column:not(.is-options-open) .column-header { border-bottom: none; }"); // fix one pixel space below column header
-    addRule(".is-options-open .column-type-icon { bottom: 27px; }"); // fix one pixel space below column header
-    
-    addRule(".activity-header { align-items: center !important; margin-bottom: 4px; }"); // tweak alignment of avatar and text in notifications
-    addRule(".activity-header .tweet-timestamp { line-height: unset; }"); // fix timestamp position in notifications
-    addRule(".account-bio.padding-t--5 { padding-top: 2px !important; }"); // decrease padding on follow notifications
-    
-    addRule("html[data-td-theme='light'] .stream-item:not(:hover) .js-user-actions-menu { color: #000; border-color: #000; opacity: 0.25; }"); // make follow notification button nicer
-    addRule("html[data-td-theme='dark'] .stream-item:not(:hover) .js-user-actions-menu { color: #fff; border-color: #fff; opacity: 0.25; }"); // make follow notification button nicer
-    
-    addRule(".app-columns-container::-webkit-scrollbar-track { border-left: 0; }"); // remove weird border in the column container scrollbar
-    addRule(".app-columns-container { bottom: 0 !important; }"); // move column container scrollbar to bottom to fit updated style
-    
-    addRule(".js-column-header .column-header-link { padding: 0; }"); // fix column header tooltip hover box
-    addRule(".js-column-header .column-header-link .icon { padding: 9px 4px; width: calc(1em + 8px); height: 100%; box-sizing: border-box; }"); // fix column header tooltip hover box
-    
-    addRule("#td-compose-drawer-pin { margin: 17px 4px 0 0; transition: transform 0.1s ease; fill: #fff; float: right; cursor: pointer; }"); // replace 'stay open' checkbox with a pin icon
-    addRule(".js-docked-compose footer { display: none; }"); // replace 'stay open' checkbox with a pin icon
-    addRule(".compose-content { bottom: 0 !important; }"); // replace 'stay open' checkbox with a pin icon
-    addRule(".js-docked-compose .js-drawer-close { margin: 20px 0 0 !important; }"); // fix close drawer button because twitter is fucking incompetent
+    window.TDGF_injectBrowserCSS = function(styles){
+      if (!document.getElementById("tweetduck-browser-css")){
+        createStyle("tweetduck-browser-css", styles);
+      }
+    };
     
     window.TDGF_reinjectCustomCSS = function(styles){
       $("#tweetduck-custom-css").remove();
       
       if (styles && styles.length){
-        $(document.head).append("<style type='text/css' id='tweetduck-custom-css'>"+styles+"</style>");
+        createStyle("tweetduck-custom-css", styles);
       }
     };
   })();
@@ -812,19 +898,38 @@
       $TD.playVideo(url);
     };
     
-    app.delegate(".js-gif-play", "click", function(e){
-      let src = !e.ctrlKey && $(this).closest(".js-media-gif-container").find("video").attr("src");
+    var getVideoTweetLink = function(obj){
+      let parent = obj.closest(".js-tweet").first();
+      let link = (parent.hasClass("tweet-detail") ? parent.find("a[rel='url']") : parent.find("time").first().children("a")).first();
+      return link.attr("href");
+    }
+    
+    app.delegate(".js-gif-play", {
+      click: function(e){
+        let src = !e.ctrlKey && $(this).closest(".js-media-gif-container").find("video").attr("src");
+        
+        if (src){
+          playVideo(src);
+        }
+        else{
+          $TD.openBrowser(getVideoTweetLink($(this)));
+        }
+        
+        e.stopPropagation();
+      },
       
-      if (src){
-        playVideo(src);
-      }
-      else{
-        let parent = $(e.target).closest(".js-tweet").first();
-        let link = (parent.hasClass("tweet-detail") ? parent.find("a[rel='url']") : parent.find("time").first().children("a")).first();
-        $TD.openBrowser(link.attr("href"));
-      }
+      mousedown: function(e){
+        if (e.button === 1){
+          e.preventDefault();
+        }
+      },
       
-      e.stopPropagation();
+      mouseup: function(e){
+        if (e.button === 1){
+          $TD.openBrowser(getVideoTweetLink($(this)));
+          e.preventDefault();
+        }
+      }
     });
     
     TD.mustaches["status/media_thumb.mustache"] = TD.mustaches["status/media_thumb.mustache"].replace("is-gif", "is-gif is-paused");
@@ -839,7 +944,7 @@
     TD.components.MediaGallery.prototype._loadTweet = appendToFunction(TD.components.MediaGallery.prototype._loadTweet, function(){
       let media = this.chirp.getMedia().find(media => media.mediaId === this.clickedMediaEntityId);
 
-      if (media && media.isVideo && media.service !== "youtube"){
+      if (media && media.isVideo && media.service === "twitter"){
         playVideo(media.chooseVideoVariant().url);
         cancelModal = true;
       }
@@ -899,6 +1004,28 @@
     }
   });
   
+  //
+  // Block: Make temporary search column appear as the first one and clear the input box.
+  //
+  $(document).on("uiSearchNoTemporaryColumn", function(e, data){
+    if (data.query && data.searchScope !== "users" && !data.columnKey){
+      if ($TDX.openSearchInFirstColumn){
+        let order = TD.controller.columnManager._columnOrder;
+        
+        if (order.length > 1){
+          let columnKey = order[order.length-1];
+          
+          order.splice(order.length-1, 1);
+          order.splice(1, 0, columnKey);
+          TD.controller.columnManager.move(columnKey, "left");
+        }
+      }
+      
+      $(".js-app-search-input").val("");
+      $(".js-perform-search").blur();
+    }
+  });
+  
   //
   // Block: Fix DM reply input box not getting focused after opening a conversation.
   //
@@ -923,6 +1050,44 @@
     };
   }
   
+  //
+  // Block: Detect and notify about connection issues.
+  //
+  (function(){
+    let onConnectionError = function(){
+      return if $("#tweetduck-conn-issues").length;
+      
+      let ele = $(`
+<div id="tweetduck-conn-issues" class="Layer NotificationListLayer">
+  <ul class="NotificationList">
+    <li class="Notification Notification--red" style="height:63px;">
+      <div class="Notification-inner">
+        <div class="Notification-icon"><span class="Icon Icon--medium Icon--circleError"></span></div>
+        <div class="Notification-content"><div class="Notification-body">Experiencing connection issues</div></div>
+        <button type="button" class="Notification-closeButton" aria-label="Close"><span class="Icon Icon--smallest Icon--close" aria-hidden="true"></span></button>
+      </div>
+    </li>
+  </ul>
+</div>
+`).appendTo(document.body);
+
+      ele.find("button").click(function(){
+        ele.fadeOut(200);
+      });
+    };
+    
+    let onConnectionFine = function(){
+      let ele = $("#tweetduck-conn-issues");
+      
+      ele.fadeOut(200, function(){
+        ele.remove();
+      });
+    };
+    
+    window.addEventListener("offline", onConnectionError);
+    window.addEventListener("online", onConnectionFine);
+  })();
+  
   //
   // Block: Custom reload function with memory cleanup.
   //
@@ -937,35 +1102,34 @@
     });
   };
   
-  window.TDGF_tryRunCleanup = function(){
-    // all textareas are empty
-    if ($("textarea").is(function(){
-      return $(this).val().length > 0;
-    })){
-      return false;
-    }
+  (function(){
+    var lastActivity = Date.now();
     
-    // no modals are visible
-    if ($("#open-modal").is(":visible") || !$(".js-modals-container").is(":empty")){
-      return false;
-    }
+    $(document).click(function(e){
+      lastActivity = Date.now();
+    });
     
-    // all columns are in a default state
-    if ($("section.js-column").is(".is-shifted-1,.is-shifted-2")){
-      return false;
-    }
-    
-    // all columns are scrolled to top
-    if ($(".js-column-scroller").is(function(){
-      return $(this).scrollTop() > 0;
-    })){
-      return false;
-    }
-    
-    // cleanup
-    window.TDGF_reload();
-    return true;
-  };
+    window.TDGF_tryRunCleanup = function(){
+      // no recent activity
+      return false if Date.now()-lastActivity < 15e3;
+      
+      // no modals are visible
+      return false if $(".js-modal").is(":visible") || !$(".js-modals-container").is(":empty");
+
+      // all columns are in a default state
+      return false if $("section.js-column").is(".is-shifted-1,.is-shifted-2");
+
+      // all textareas are empty
+      return false if Array.prototype.some.call(document.getElementsByTagName("textarea"), ele => ele.value.length > 0);
+
+      // all columns are scrolled to top
+      return false if Array.prototype.some.call(document.getElementsByClassName("js-column-scroller"), ele => ele.scrollTop > 0);
+
+      // cleanup
+      window.TDGF_reload();
+      return true;
+    };
+  })();
   
   if (window.TD_SESSION && window.TD_SESSION.gc){
     var state;