Release 1.14.2

Closes #220

Configuration/Arguments.cs

@@ -6,6 +6,7 @@ namespace TweetDuck.Configuration{
         // public args
         public const string ArgDataFolder = "-datafolder";
         public const string ArgLogging = "-log";
+        public const string ArgIgnoreGDPR = "-nogdpr";
 
         // internal args
         public const string ArgRestart = "-restart";

Configuration/UserConfig.cs

@@ -39,7 +39,7 @@ namespace TweetDuck.Configuration{
         public bool AllowDataCollection { get; set; } = false;
 
         public WindowState BrowserWindow { get; set; } = new WindowState();
-        public WindowState PluginsWindow { get; set; } = new WindowState();
+        public Size PluginsWindowSize    { get; set; } = Size.Empty;
 
         public bool ExpandLinksOnHover        { get; set; } = true;
         public bool OpenSearchInFirstColumn   { get; set; } = true;

Core/Controls/LabelVertical.cs

@@ -7,7 +7,7 @@ namespace TweetDuck.Core.Controls{
         public int LineHeight { get; set; }
 
         protected override void OnPaint(PaintEventArgs e){
-            int y = (int)Math.Floor((ClientRectangle.Height-Text.Length*LineHeight)/2F)-2; // 2 = random
+            int y = (int)Math.Floor((ClientRectangle.Height-Text.Length*LineHeight)/2F)-1;
 
             using(Brush brush = new SolidBrush(ForeColor)){
                 foreach(char chr in Text){

Core/FormBrowser.cs

@@ -56,7 +56,7 @@ namespace TweetDuck.Core{
         private VideoPlayer videoPlayer;
         private AnalyticsManager analytics;
 
-        public FormBrowser(UpdaterSettings updaterSettings){
+        public FormBrowser(){
             InitializeComponent();
 
             Text = Program.BrandName;
@@ -97,7 +97,7 @@ namespace TweetDuck.Core{
 
             UpdateTrayIcon();
 
-            this.updates = new UpdateHandler(browser, updaterSettings);
+            this.updates = new UpdateHandler(browser, Program.InstallerPath);
             this.updates.CheckFinished += updates_CheckFinished;
             this.updates.UpdateAccepted += updates_UpdateAccepted;
             this.updates.UpdateDismissed += updates_UpdateDismissed;
@@ -237,25 +237,24 @@ namespace TweetDuck.Core{
         }
 
         private void updates_CheckFinished(object sender, UpdateCheckEventArgs e){
-            this.InvokeAsyncSafe(() => {
+            e.Result.Handle(update => {
-                e.Result.Handle(update => {
+                string tag = update.VersionTag;
-                    if (!update.IsUpdateDismissed){
+
-                        if (update.IsUpdateNew){
+                if (tag != Program.VersionTag && tag != Config.DismissedUpdate){
-                            browser.ShowUpdateNotification(update.VersionTag, update.ReleaseNotes);
+                    updates.PrepareUpdate(update);
-                        }
+                    browser.ShowUpdateNotification(tag, update.ReleaseNotes);
-                        else{
+                }
-                            updates.StartTimer();
+                else{
-                        }
+                    updates.StartTimer();
-                    }
+                }
-                }, ex => {
+            }, ex => {
-                    if (!ignoreUpdateCheckError){
+                if (!ignoreUpdateCheckError){
-                        Program.Reporter.HandleException("Update Check Error", "An error occurred while checking for updates.", true, ex);
+                    Program.Reporter.HandleException("Update Check Error", "An error occurred while checking for updates.", true, ex);
-                        updates.StartTimer();
+                    updates.StartTimer();
-                    }
+                }
-                });
-                
-                ignoreUpdateCheckError = true;
             });
+
+            ignoreUpdateCheckError = true;
         }
 
         private void updates_UpdateAccepted(object sender, UpdateEventArgs e){

Core/Handling/ContextMenuBase.cs

@@ -28,6 +28,7 @@ namespace TweetDuck.Core.Handling{
         private const CefMenuCommand MenuSaveMedia       = (CefMenuCommand)26506;
         private const CefMenuCommand MenuSaveTweetImages = (CefMenuCommand)26507;
         private const CefMenuCommand MenuSearchInBrowser = (CefMenuCommand)26508;
+        private const CefMenuCommand MenuReadApplyROT13  = (CefMenuCommand)26509;
         private const CefMenuCommand MenuOpenDevTools    = (CefMenuCommand)26599;
         
         protected ContextInfo.LinkInfo LastLink { get; private set; }
@@ -57,6 +58,8 @@ namespace TweetDuck.Core.Handling{
             if (parameters.TypeFlags.HasFlag(ContextMenuType.Selection) && !parameters.TypeFlags.HasFlag(ContextMenuType.Editable)){
                 model.AddItem(MenuSearchInBrowser, "Search in browser");
                 model.AddSeparator();
+                model.AddItem(MenuReadApplyROT13, "Apply ROT13");
+                model.AddSeparator();
             }
 
             bool hasTweetImage = LastLink.IsImage;
@@ -126,7 +129,7 @@ namespace TweetDuck.Core.Handling{
                     SetClipboardText(control, TwitterUtils.GetMediaLink(LastLink.GetMediaSource(parameters), ImageQuality));
                     break;
 
-                case MenuViewImage:
+                case MenuViewImage: {
                     void ViewImage(string path){
                         string ext = Path.GetExtension(path);
 
@@ -141,37 +144,59 @@ namespace TweetDuck.Core.Handling{
                     string url = LastLink.GetMediaSource(parameters);
                     string file = Path.Combine(BrowserCache.CacheFolder, TwitterUtils.GetImageFileName(url) ?? Path.GetRandomFileName());
 
-                    if (File.Exists(file)){
+                    control.InvokeAsyncSafe(() => {
-                        ViewImage(file);
+                        if (File.Exists(file)){
-                    }
-                    else{
-                        control.InvokeAsyncSafe(analytics.AnalyticsFile.ViewedImages.Trigger);
-
-                        BrowserUtils.DownloadFileAsync(TwitterUtils.GetMediaLink(url, ImageQuality), file, () => {
                             ViewImage(file);
-                        }, ex => {
+                        }
-                            FormMessage.Error("Image Download", "An error occurred while downloading the image: "+ex.Message, FormMessage.OK);
+                        else{
-                        });
+                            analytics.AnalyticsFile.ViewedImages.Trigger();
-                    }
+
+                            BrowserUtils.DownloadFileAsync(TwitterUtils.GetMediaLink(url, ImageQuality), file, () => {
+                                ViewImage(file);
+                            }, ex => {
+                                FormMessage.Error("Image Download", "An error occurred while downloading the image: "+ex.Message, FormMessage.OK);
+                            });
+                        }
+                    });
+                    
+                    break;
+                }
+
+                case MenuSaveMedia: {
+                    bool isVideo = LastLink.IsVideo;
+                    string url = LastLink.GetMediaSource(parameters);
+                    string username = LastChirp.Authors.LastOrDefault();
+                    
+                    control.InvokeAsyncSafe(() => {
+                        if (isVideo){
+                            TwitterUtils.DownloadVideo(url, username);
+                            analytics.AnalyticsFile.DownloadedVideos.Trigger();
+                        }
+                        else{
+                            TwitterUtils.DownloadImage(url, username, ImageQuality);
+                            analytics.AnalyticsFile.DownloadedImages.Trigger();
+                        }
+                    });
 
                     break;
+                }
 
-                case MenuSaveMedia:
+                case MenuSaveTweetImages: {
-                    if (LastLink.IsVideo){
+                    string[] urls = LastChirp.Images;
-                        control.InvokeAsyncSafe(analytics.AnalyticsFile.DownloadedVideos.Trigger);
+                    string username = LastChirp.Authors.LastOrDefault();
-                        TwitterUtils.DownloadVideo(LastLink.GetMediaSource(parameters), LastChirp.Authors.LastOrDefault());
+                    
-                    }
+                    control.InvokeAsyncSafe(() => {
-                    else{
+                        TwitterUtils.DownloadImages(urls, username, ImageQuality);
-                        control.InvokeAsyncSafe(analytics.AnalyticsFile.DownloadedImages.Trigger);
+                        analytics.AnalyticsFile.DownloadedImages.Trigger();
-                        TwitterUtils.DownloadImage(LastLink.GetMediaSource(parameters), LastChirp.Authors.LastOrDefault(), ImageQuality);
+                    });
-                    }
 
                     break;
+                }
 
-                case MenuSaveTweetImages:
+                case MenuReadApplyROT13:
-                    control.InvokeAsyncSafe(analytics.AnalyticsFile.DownloadedImages.Trigger);
+                    string selection = parameters.SelectionText;
-                    TwitterUtils.DownloadImages(LastChirp.Images, LastChirp.Authors.LastOrDefault(), ImageQuality);
+                    control.InvokeAsyncSafe(() => FormMessage.Information("ROT13", StringUtils.ConvertRot13(selection), FormMessage.OK));
-                    break;
+                    return true;
 
                 case MenuSearchInBrowser:
                     string query = parameters.SelectionText;
@@ -195,15 +220,15 @@ namespace TweetDuck.Core.Handling{
             return false;
         }
 
-        protected void DeselectAll(IFrame frame){
+        protected static void DeselectAll(IFrame frame){
             ScriptLoader.ExecuteScript(frame, "window.getSelection().removeAllRanges()", "gen:deselect");
         }
 
-        protected void OpenBrowser(Control control, string url){
+        protected static void OpenBrowser(Control control, string url){
             control.InvokeAsyncSafe(() => BrowserUtils.OpenExternalBrowser(url));
         }
 
-        protected void SetClipboardText(Control control, string text){
+        protected static void SetClipboardText(Control control, string text){
             control.InvokeAsyncSafe(() => WindowsUtils.SetClipboard(text, TextDataFormat.UnicodeText));
         }
 

Core/Handling/ContextMenuBrowser.cs

@@ -16,7 +16,7 @@ namespace TweetDuck.Core.Handling{
         private const CefMenuCommand MenuOpenQuotedTweetUrl = (CefMenuCommand)26612;
         private const CefMenuCommand MenuCopyQuotedTweetUrl = (CefMenuCommand)26613;
         private const CefMenuCommand MenuScreenshotTweet    = (CefMenuCommand)26614;
-        private const CefMenuCommand MenuInputApplyROT13    = (CefMenuCommand)26615;
+        private const CefMenuCommand MenuWriteApplyROT13    = (CefMenuCommand)26615;
         private const CefMenuCommand MenuSearchInColumn     = (CefMenuCommand)26616;
 
         private const string TitleReloadBrowser = "Reload browser";
@@ -44,7 +44,7 @@ namespace TweetDuck.Core.Handling{
             if (isSelecting){
                 if (isEditing){
                     model.AddSeparator();
-                    model.AddItem(MenuInputApplyROT13, "Apply ROT13");
+                    model.AddItem(MenuWriteApplyROT13, "Apply ROT13");
                 }
 
                 model.AddSeparator();
@@ -141,7 +141,7 @@ namespace TweetDuck.Core.Handling{
                     SetClipboardText(form, LastChirp.QuoteUrl);
                     return true;
 
-                case MenuInputApplyROT13:
+                case MenuWriteApplyROT13:
                     form.InvokeAsyncSafe(form.ApplyROT13);
                     return true;
 

Core/Handling/DragHandlerBrowser.cs

@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using CefSharp;
+using CefSharp.Enums;
 
 namespace TweetDuck.Core.Handling{
     sealed class DragHandlerBrowser : IDragHandler{

Core/Handling/General/JavaScriptDialogHandler.cs

@@ -50,8 +50,9 @@ namespace TweetDuck.Core.Handling.General{
 
                     input = new TextBox{
                         Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Bottom,
+                        Font = SystemFonts.MessageBoxFont,
                         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)
+                        Size = new Size(form.ClientSize.Width-BrowserUtils.Scale(44+inputPad, dpiScale), BrowserUtils.Scale(23, dpiScale))
                     };
 
                     form.Controls.Add(input);

Core/Notification/Example/FormNotificationExample.cs

@@ -1,4 +1,6 @@
-using System.Windows.Forms;
+using System;
+using System.Windows.Forms;
+using CefSharp;
 using TweetDuck.Core.Controls;
 using TweetDuck.Plugins;
 using TweetDuck.Resources;
@@ -21,9 +23,13 @@ namespace TweetDuck.Core.Notification.Example{
             }
         }
 
+        public event EventHandler Ready;
+
         private readonly TweetNotification exampleNotification;
 
         public FormNotificationExample(FormBrowser owner, PluginManager pluginManager) : base(owner, pluginManager, false){
+            browser.LoadingStateChanged += browser_LoadingStateChanged;
+
             string exampleTweetHTML = ScriptLoader.LoadResource("pages/example.html", true)?.Replace("{avatar}", TweetNotification.AppLogo.Url) ?? string.Empty;
 
             #if DEBUG
@@ -33,6 +39,13 @@ namespace TweetDuck.Core.Notification.Example{
             exampleNotification = TweetNotification.Example(exampleTweetHTML, 176);
         }
 
+        private void browser_LoadingStateChanged(object sender, LoadingStateChangedEventArgs e){
+            if (!e.IsLoading){
+                Ready?.Invoke(this, EventArgs.Empty);
+                browser.LoadingStateChanged -= browser_LoadingStateChanged;
+            }
+        }
+
         public override void HideNotification(){
             Location = ControlExtensions.InvisibleLocation;
         }

Core/Notification/FormNotificationBase.cs

@@ -1,6 +1,4 @@
-using CefSharp;
+using CefSharp.WinForms;
-using CefSharp.WinForms;
-using System;
 using System.Drawing;
 using System.Windows.Forms;
 using TweetDuck.Configuration;
@@ -65,7 +63,7 @@ namespace TweetDuck.Core.Notification{
             }
         }
 
-        public bool IsNotificationVisible => Location != ControlExtensions.InvisibleLocation;
+        protected bool IsNotificationVisible => Location != ControlExtensions.InvisibleLocation;
         protected virtual bool CanDragWindow => true;
 
         public new Point Location{
@@ -109,15 +107,13 @@ namespace TweetDuck.Core.Notification{
         public string CurrentQuoteUrl => currentNotification?.QuoteUrl;
 
         public bool CanViewDetail => currentNotification != null && !string.IsNullOrEmpty(currentNotification.ColumnId) && !string.IsNullOrEmpty(currentNotification.ChirpId);
-        public bool IsPaused => pauseCounter > 0;
 
+        protected bool IsPaused => pauseCounter > 0;
         protected bool IsCursorOverBrowser => browser.Bounds.Contains(PointToClient(Cursor.Position));
         
         public bool FreezeTimer { get; set; }
         public bool ContextMenuOpen { get; set; }
 
-        public event EventHandler Initialized;
-
         protected FormNotificationBase(FormBrowser owner, bool enableContextMenu){
             InitializeComponent();
 
@@ -133,7 +129,6 @@ namespace TweetDuck.Core.Notification{
 
             this.browser.Dock = DockStyle.None;
             this.browser.ClientSize = ClientSize;
-            this.browser.IsBrowserInitializedChanged += browser_IsBrowserInitializedChanged;
             
             browser.SetupResourceHandler(TwitterUtils.TweetDeckURL, this.resourceHandler);
             browser.SetupResourceHandler(TweetNotification.AppLogo);
@@ -165,12 +160,6 @@ namespace TweetDuck.Core.Notification{
             Close();
         }
 
-        private void browser_IsBrowserInitializedChanged(object sender, IsBrowserInitializedChangedEventArgs e){
-            if (e.IsBrowserInitialized){
-                Initialized?.Invoke(this, EventArgs.Empty);
-            }
-        }
-
         // notification methods
 
         public virtual void HideNotification(){

Core/Notification/FormNotificationMain.cs

@@ -65,7 +65,7 @@ namespace TweetDuck.Core.Notification{
             get{
                 switch(Program.UserConfig.NotificationSize){
                     default:
-                        return BrowserUtils.Scale(122, SizeScale*(1.0+0.075*FontSizeLevel));
+                        return BrowserUtils.Scale(122, SizeScale*(1.0+0.08*FontSizeLevel));
 
                     case TweetNotification.Size.Custom:
                         return Program.UserConfig.CustomNotificationSize.Height;

Core/Notification/Screenshot/FormNotificationScreenshotable.cs

@@ -15,11 +15,10 @@ namespace TweetDuck.Core.Notification.Screenshot{
         protected override bool CanDragWindow => false;
 
         private readonly PluginManager plugins;
-        private readonly int width;
+        private int height;
 
         public FormNotificationScreenshotable(Action callback, FormBrowser owner, PluginManager pluginManager, string html, int width) : base(owner, false){
             this.plugins = pluginManager;
-            this.width = width;
 
             browser.RegisterAsyncJsObject("$TD_NotificationScreenshot", new ScreenshotBridge(this, SetScreenshotHeight, callback));
 
@@ -36,11 +35,11 @@ namespace TweetDuck.Core.Notification.Screenshot{
                 }
                 
                 using(IFrame frame = args.Browser.MainFrame){
-                    ScriptLoader.ExecuteScript(frame, script.Replace("{width}", ClientSize.Width.ToString()), "screenshot");
+                    ScriptLoader.ExecuteScript(frame, script.Replace("{width}", BrowserUtils.Scale(width, DpiScale).ToString()).Replace("{frames}", TweetScreenshotManager.WaitFrames.ToString()), "gen:screenshot");
                 }
             };
             
-            SetScreenshotHeight(1);
+            SetNotificationSize(width, 1024);
             LoadTweet(new TweetNotification(string.Empty, string.Empty, string.Empty, html, 0, string.Empty, string.Empty));
         }
 
@@ -54,23 +53,34 @@ namespace TweetDuck.Core.Notification.Screenshot{
             return html;
         }
 
-        private void SetScreenshotHeight(int height){
+        private void SetScreenshotHeight(int browserHeight){
-            SetNotificationSize(width, height);
+            this.height = BrowserUtils.Scale(browserHeight, SizeScale);
         }
 
-        public void TakeScreenshot(){
+        public bool TakeScreenshot(bool ignoreHeightError = false){
-            if (ClientSize.Height == 0){
+            if (!ignoreHeightError){
-                FormMessage.Error("Screenshot Failed", "Could not detect screenshot size.", FormMessage.OK);
+                if (height == 0){
-                return;
+                    FormMessage.Error("Screenshot Failed", "Could not detect screenshot size.", FormMessage.OK);
+                    return false;
+                }
+                else if (height > ClientSize.Height){
+                    FormMessage.Error("Screenshot Failed", $"Screenshot is too large: {height}px > {ClientSize.Height}px", FormMessage.OK);
+                    return false;
+                }
+            }
+
+            if (!WindowsUtils.IsAeroEnabled){
+                MoveToVisibleLocation(); // TODO make this look nicer I guess
             }
             
             IntPtr context = NativeMethods.GetDC(this.Handle);
 
             if (context == IntPtr.Zero){
                 FormMessage.Error("Screenshot Failed", "Could not retrieve a graphics context handle for the notification window to take the screenshot.", FormMessage.OK);
+                return false;
             }
             else{
-                using(Bitmap bmp = new Bitmap(ClientSize.Width, ClientSize.Height, PixelFormat.Format32bppRgb)){
+                using(Bitmap bmp = new Bitmap(ClientSize.Width, Math.Max(1, height), PixelFormat.Format32bppRgb)){
                     try{
                         NativeMethods.RenderSourceIntoBitmap(context, bmp);
                     }finally{
@@ -78,6 +88,7 @@ namespace TweetDuck.Core.Notification.Screenshot{
                     }
 
                     Clipboard.SetImage(bmp);
+                    return true;
                 }
             }
         }

Core/Notification/Screenshot/TweetScreenshotManager.cs

@@ -1,17 +1,37 @@
-// Uncomment to keep screenshot windows visible for debugging
+#if DEBUG
+// Uncomment to keep screenshot windows visible for debugging
 // #define NO_HIDE_SCREENSHOTS
 
+// Uncomment to generate screenshots of individual frames for at most 1 second
+// #define GEN_SCREENSHOT_FRAMES
+#endif
+
 using System;
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
 using TweetDuck.Plugins;
 
+#if GEN_SCREENSHOT_FRAMES
+using System.Drawing.Imaging;
+using System.IO;
+using TweetDuck.Core.Utils;
+#endif
+
 namespace TweetDuck.Core.Notification.Screenshot{
     sealed class TweetScreenshotManager : IDisposable{
         private readonly FormBrowser owner;
         private readonly PluginManager plugins;
         private readonly Timer timeout;
         private readonly Timer disposer;
+
+        #if GEN_SCREENSHOT_FRAMES
+        private readonly Timer debugger;
+        private int frameCounter;
+
+        public const int WaitFrames = 60;
+        #else
+        public const int WaitFrames = 5;
+        #endif
         
         private FormNotificationScreenshotable screenshot;
 
@@ -24,6 +44,11 @@ namespace TweetDuck.Core.Notification.Screenshot{
 
             this.disposer = new Timer{ Interval = 1 };
             this.disposer.Tick += disposer_Tick;
+
+            #if GEN_SCREENSHOT_FRAMES
+            this.debugger = new Timer{ Interval = 16 };
+            this.debugger.Tick += debugger_Tick;
+            #endif
         }
 
         private void timeout_Tick(object sender, EventArgs e){
@@ -46,7 +71,11 @@ namespace TweetDuck.Core.Notification.Screenshot{
             screenshot.Show();
             timeout.Start();
 
-            #if !(DEBUG && NO_HIDE_SCREENSHOTS)
+            #if GEN_SCREENSHOT_FRAMES
+            StartDebugger();
+            #endif
+
+            #if !NO_HIDE_SCREENSHOTS
             owner.IsWaiting = true;
             #endif
         }
@@ -58,8 +87,8 @@ namespace TweetDuck.Core.Notification.Screenshot{
 
             timeout.Stop();
             screenshot.TakeScreenshot();
-
+            
-            #if !(DEBUG && NO_HIDE_SCREENSHOTS)
+            #if !NO_HIDE_SCREENSHOTS
             OnFinished();
             #else
             screenshot.MoveToVisibleLocation();
@@ -68,15 +97,52 @@ namespace TweetDuck.Core.Notification.Screenshot{
         }
 
         private void OnFinished(){
+            #if GEN_SCREENSHOT_FRAMES
+            debugger.Stop();
+            #endif
+
             screenshot.Location = ControlExtensions.InvisibleLocation;
             owner.IsWaiting = false;
             disposer.Start();
         }
 
         public void Dispose(){
+            #if GEN_SCREENSHOT_FRAMES
+            debugger.Dispose();
+            #endif
+
             timeout.Dispose();
             disposer.Dispose();
             screenshot?.Dispose();
         }
+
+        #if GEN_SCREENSHOT_FRAMES
+        private static readonly string DebugScreenshotPath = Path.Combine(Program.StoragePath, "TD_Screenshots");
+
+        private void StartDebugger(){
+            frameCounter = 0;
+
+            try{
+                Directory.Delete(DebugScreenshotPath, true);
+                WindowsUtils.TrySleepUntil(() => !Directory.Exists(DebugScreenshotPath), 1000, 10);
+            }catch(DirectoryNotFoundException){}
+            
+            Directory.CreateDirectory(DebugScreenshotPath);
+            debugger.Start();
+        }
+
+        private void debugger_Tick(object sender, EventArgs e){
+            if (frameCounter < 63 && screenshot.TakeScreenshot(true)){
+                try{
+                    Clipboard.GetImage()?.Save(Path.Combine(DebugScreenshotPath, "frame_"+(++frameCounter)+".png"), ImageFormat.Png);
+                }catch{
+                    System.Diagnostics.Debug.WriteLine("Failed generating frame "+frameCounter);
+                }
+            }
+            else{
+                debugger.Stop();
+            }
+        }
+        #endif
     }
 }

Core/Notification/TweetNotification.cs

@@ -70,7 +70,7 @@ namespace TweetDuck.Core.Notification{
                 build.Append(' ').Append(bodyClasses);
             }
 
-            build.Append('\'').Append(isExample ? " td-example-notification" : "").Append("><div class='column' style='width:100%!important;height:auto!important;overflow:initial!important;'>");
+            build.Append('\'').Append(isExample ? " td-example-notification" : "").Append("><div class='column' style='width:100%!important;min-height:100vh!important;height:auto!important;overflow:initial!important;'>");
             build.Append(html);
             build.Append("</div></body>");
             build.Append("</html>");

Core/Other/Analytics/AnalyticsReportGenerator.cs

@@ -42,7 +42,6 @@ namespace TweetDuck.Core.Other.Analytics{
                 { "Clear Cache Threshold"     , Exact(SysConfig.ClearCacheThreshold) },
                 0,
                 { "Expand Links"                  , Bool(UserConfig.ExpandLinksOnHover) },
-                { "Switch Account Selectors"      , Bool(false) }, // TODO remove in next major update
                 { "Search In First Column"        , Bool(UserConfig.OpenSearchInFirstColumn) },
                 { "Keep Like Follow Dialogs Open" , Bool(UserConfig.KeepLikeFollowDialogsOpen) },
                 { "Best Image Quality"            , Bool(UserConfig.BestImageQuality) },

Core/Other/FormAbout.Designer.cs

@@ -23,7 +23,6 @@ namespace TweetDuck.Core.Other {
         /// the contents of this method with the code editor.
         /// </summary>
         private void InitializeComponent() {
-            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormAbout));
             this.pictureLogo = new System.Windows.Forms.PictureBox();
             this.labelDescription = new System.Windows.Forms.Label();
             this.labelTips = new System.Windows.Forms.LinkLabel();
@@ -42,6 +41,7 @@ namespace TweetDuck.Core.Other {
             this.pictureLogo.Location = new System.Drawing.Point(12, 12);
             this.pictureLogo.Name = "pictureLogo";
             this.pictureLogo.Size = new System.Drawing.Size(96, 96);
+            this.pictureLogo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
             this.pictureLogo.TabIndex = 0;
             this.pictureLogo.TabStop = false;
             // 
@@ -50,23 +50,22 @@ namespace TweetDuck.Core.Other {
             this.labelDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.labelDescription.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelDescription.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelDescription.Location = new System.Drawing.Point(114, 12);
             this.labelDescription.Name = "labelDescription";
-            this.labelDescription.Size = new System.Drawing.Size(232, 109);
+            this.labelDescription.Size = new System.Drawing.Size(232, 113);
             this.labelDescription.TabIndex = 0;
             // 
             // labelTips
             // 
             this.labelTips.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.labelTips.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelTips.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelTips.LinkArea = new System.Windows.Forms.LinkArea(0, 0);
             this.labelTips.Location = new System.Drawing.Point(117, 0);
             this.labelTips.Margin = new System.Windows.Forms.Padding(0);
             this.labelTips.Name = "labelTips";
-            this.labelTips.Size = new System.Drawing.Size(99, 16);
+            this.labelTips.Size = new System.Drawing.Size(99, 18);
             this.labelTips.TabIndex = 1;
-            this.labelTips.TabStop = true;
             this.labelTips.Text = "Tips && Tricks";
             this.labelTips.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
             this.labelTips.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.OnLinkClicked);
@@ -75,14 +74,13 @@ namespace TweetDuck.Core.Other {
             // 
             this.labelWebsite.AutoSize = true;
             this.labelWebsite.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.labelWebsite.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelWebsite.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelWebsite.LinkArea = new System.Windows.Forms.LinkArea(0, 0);
             this.labelWebsite.Location = new System.Drawing.Point(0, 0);
             this.labelWebsite.Margin = new System.Windows.Forms.Padding(0);
             this.labelWebsite.Name = "labelWebsite";
-            this.labelWebsite.Size = new System.Drawing.Size(117, 16);
+            this.labelWebsite.Size = new System.Drawing.Size(117, 18);
             this.labelWebsite.TabIndex = 0;
-            this.labelWebsite.TabStop = true;
             this.labelWebsite.Text = "Official Website";
             this.labelWebsite.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
             this.labelWebsite.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.OnLinkClicked);
@@ -98,24 +96,23 @@ namespace TweetDuck.Core.Other {
             this.tablePanelLinks.Controls.Add(this.labelIssues, 2, 0);
             this.tablePanelLinks.Controls.Add(this.labelWebsite, 0, 0);
             this.tablePanelLinks.Controls.Add(this.labelTips, 1, 0);
-            this.tablePanelLinks.Location = new System.Drawing.Point(12, 124);
+            this.tablePanelLinks.Location = new System.Drawing.Point(12, 128);
             this.tablePanelLinks.Name = "tablePanelLinks";
             this.tablePanelLinks.RowCount = 1;
             this.tablePanelLinks.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tablePanelLinks.Size = new System.Drawing.Size(334, 16);
+            this.tablePanelLinks.Size = new System.Drawing.Size(334, 18);
             this.tablePanelLinks.TabIndex = 1;
             // 
             // labelIssues
             // 
             this.labelIssues.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.labelIssues.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelIssues.Font = new System.Drawing.Font("Segoe UI", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelIssues.LinkArea = new System.Windows.Forms.LinkArea(0, 0);
             this.labelIssues.Location = new System.Drawing.Point(216, 0);
             this.labelIssues.Margin = new System.Windows.Forms.Padding(0);
             this.labelIssues.Name = "labelIssues";
-            this.labelIssues.Size = new System.Drawing.Size(118, 16);
+            this.labelIssues.Size = new System.Drawing.Size(118, 18);
             this.labelIssues.TabIndex = 2;
-            this.labelIssues.TabStop = true;
             this.labelIssues.Text = "Report an Issue";
             this.labelIssues.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             this.labelIssues.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.OnLinkClicked);
@@ -125,7 +122,7 @@ namespace TweetDuck.Core.Other {
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.BackColor = System.Drawing.Color.White;
-            this.ClientSize = new System.Drawing.Size(358, 152);
+            this.ClientSize = new System.Drawing.Size(358, 156);
             this.Controls.Add(this.tablePanelLinks);
             this.Controls.Add(this.labelDescription);
             this.Controls.Add(this.pictureLogo);

Core/Other/FormGuide.cs

@@ -8,6 +8,7 @@ using TweetDuck.Core.Handling;
 using TweetDuck.Core.Handling.General;
 using TweetDuck.Core.Utils;
 using System.Text.RegularExpressions;
+using TweetDuck.Data;
 using TweetDuck.Resources;
 
 namespace TweetDuck.Core.Other{
@@ -15,6 +16,8 @@ namespace TweetDuck.Core.Other{
         private const string GuideUrl = "https://tweetduck.chylex.com/guide/v2/";
         private const string GuidePathRegex = @"^guide(?:/v\d+)?(?:/(#.*))?";
 
+        private static readonly ResourceLink DummyPage = new ResourceLink("http://td/dummy", ResourceHandler.FromString(""));
+
         public static bool CheckGuideUrl(string url, out string hash){
             if (!url.Contains("//tweetduck.chylex.com/guide")){
                 hash = null;
@@ -53,6 +56,7 @@ namespace TweetDuck.Core.Other{
         }
 
         private readonly ChromiumWebBrowser browser;
+        private string nextUrl;
 
         private FormGuide(string url, FormBrowser owner){
             InitializeComponent();
@@ -75,6 +79,9 @@ namespace TweetDuck.Core.Other{
             browser.BrowserSettings.BackgroundColor = (uint)BackColor.ToArgb();
             browser.Dock = DockStyle.None;
             browser.Location = ControlExtensions.InvisibleLocation;
+
+            browser.SetupResourceHandler(DummyPage);
+
             Controls.Add(browser);
 
             Disposed += (sender, args) => {
@@ -86,21 +93,26 @@ namespace TweetDuck.Core.Other{
         }
 
         private void Reload(string url){
+            nextUrl = url;
             browser.LoadingStateChanged += browser_LoadingStateChanged;
             browser.Dock = DockStyle.None;
             browser.Location = ControlExtensions.InvisibleLocation;
-            browser.Load("about:blank");
+            browser.Load(DummyPage.Url);
-            browser.Load(url);
         }
 
         private void browser_LoadingStateChanged(object sender, LoadingStateChangedEventArgs e){
-            if (!e.IsLoading && browser.Address != "about:blank"){
+            if (!e.IsLoading){
-                this.InvokeAsyncSafe(() => {
+                if (browser.Address == DummyPage.Url){
-                    browser.Location = Point.Empty;
+                    browser.Load(nextUrl);
-                    browser.Dock = DockStyle.Fill;
+                }
-                });
+                else{
+                    this.InvokeAsyncSafe(() => {
+                        browser.Location = Point.Empty;
+                        browser.Dock = DockStyle.Fill;
+                    });
 
-                browser.LoadingStateChanged -= browser_LoadingStateChanged;
+                    browser.LoadingStateChanged -= browser_LoadingStateChanged;
+                }
             }
         }
 
@@ -109,7 +121,6 @@ namespace TweetDuck.Core.Other{
         }
 
         private void browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
-            // idiot chromium
             ScriptLoader.ExecuteScript(e.Frame, "Array.prototype.forEach.call(document.getElementsByTagName('A'), ele => ele.addEventListener('click', e => { e.preventDefault(); window.open(ele.getAttribute('href')); }))", "gen:links");
         }
 

Core/Other/FormPlugins.Designer.cs

@@ -23,20 +23,23 @@
         /// the contents of this method with the code editor.
         /// </summary>
         private void InitializeComponent() {
+            this.components = new System.ComponentModel.Container();
             this.btnClose = new System.Windows.Forms.Button();
             this.btnReload = new System.Windows.Forms.Button();
             this.btnOpenFolder = new System.Windows.Forms.Button();
             this.flowLayoutPlugins = new TweetDuck.Plugins.Controls.PluginListFlowLayout();
+            this.timerLayout = new System.Windows.Forms.Timer(this.components);
             this.SuspendLayout();
             // 
             // btnClose
             // 
             this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnClose.AutoSize = true;
-            this.btnClose.Location = new System.Drawing.Point(643, 439);
+            this.btnClose.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnClose.Location = new System.Drawing.Point(642, 433);
             this.btnClose.Name = "btnClose";
-            this.btnClose.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.btnClose.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.btnClose.Size = new System.Drawing.Size(49, 23);
+            this.btnClose.Size = new System.Drawing.Size(50, 25);
             this.btnClose.TabIndex = 1;
             this.btnClose.Text = "Close";
             this.btnClose.UseVisualStyleBackColor = true;
@@ -46,10 +49,11 @@
             // 
             this.btnReload.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.btnReload.AutoSize = true;
-            this.btnReload.Location = new System.Drawing.Point(131, 439);
+            this.btnReload.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnReload.Location = new System.Drawing.Point(141, 433);
             this.btnReload.Name = "btnReload";
-            this.btnReload.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.btnReload.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.btnReload.Size = new System.Drawing.Size(71, 23);
+            this.btnReload.Size = new System.Drawing.Size(74, 25);
             this.btnReload.TabIndex = 2;
             this.btnReload.Text = "Reload All";
             this.btnReload.UseVisualStyleBackColor = true;
@@ -59,10 +63,11 @@
             // 
             this.btnOpenFolder.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.btnOpenFolder.AutoSize = true;
-            this.btnOpenFolder.Location = new System.Drawing.Point(12, 439);
+            this.btnOpenFolder.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnOpenFolder.Location = new System.Drawing.Point(12, 433);
             this.btnOpenFolder.Name = "btnOpenFolder";
-            this.btnOpenFolder.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.btnOpenFolder.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.btnOpenFolder.Size = new System.Drawing.Size(113, 23);
+            this.btnOpenFolder.Size = new System.Drawing.Size(123, 25);
             this.btnOpenFolder.TabIndex = 3;
             this.btnOpenFolder.Text = "Open Plugin Folder";
             this.btnOpenFolder.UseVisualStyleBackColor = true;
@@ -77,22 +82,29 @@
             this.flowLayoutPlugins.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
             this.flowLayoutPlugins.Location = new System.Drawing.Point(12, 12);
             this.flowLayoutPlugins.Name = "flowLayoutPlugins";
-            this.flowLayoutPlugins.Size = new System.Drawing.Size(680, 421);
+            this.flowLayoutPlugins.Size = new System.Drawing.Size(680, 415);
             this.flowLayoutPlugins.TabIndex = 0;
             this.flowLayoutPlugins.WrapContents = false;
             this.flowLayoutPlugins.Resize += new System.EventHandler(this.flowLayoutPlugins_Resize);
             // 
+            // timerLayout
+            // 
+            this.timerLayout.Interval = 99;
+            this.timerLayout.Tick += new System.EventHandler(this.timerLayout_Tick);
+            // 
             // FormPlugins
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(704, 474);
+            this.ClientSize = new System.Drawing.Size(704, 470);
             this.Controls.Add(this.flowLayoutPlugins);
             this.Controls.Add(this.btnOpenFolder);
             this.Controls.Add(this.btnReload);
             this.Controls.Add(this.btnClose);
             this.Icon = global::TweetDuck.Properties.Resources.icon;
-            this.MinimumSize = new System.Drawing.Size(480, 320);
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.MinimumSize = new System.Drawing.Size(640, 360);
             this.Name = "FormPlugins";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             this.ResumeLayout(false);
@@ -106,5 +118,6 @@
         private System.Windows.Forms.Button btnReload;
         private System.Windows.Forms.Button btnOpenFolder;
         private Plugins.Controls.PluginListFlowLayout flowLayoutPlugins;
+        private System.Windows.Forms.Timer timerLayout;
     }
 }

Core/Other/FormPlugins.cs

@@ -19,15 +19,23 @@ namespace TweetDuck.Core.Other{
         public FormPlugins(PluginManager pluginManager) : this(){
             this.pluginManager = pluginManager;
 
+            if (!Program.UserConfig.PluginsWindowSize.IsEmpty){
+                Size targetSize = Program.UserConfig.PluginsWindowSize;
+                Size = new Size(Math.Max(MinimumSize.Width, targetSize.Width), Math.Max(MinimumSize.Height, targetSize.Height));
+            }
+            
             Shown += (sender, args) => {
-                Program.UserConfig.PluginsWindow.Restore(this, false);
                 ReloadPluginList();
             };
 
             FormClosed += (sender, args) => {
-                Program.UserConfig.PluginsWindow.Save(this);
+                Program.UserConfig.PluginsWindowSize = Size;
                 Program.UserConfig.Save();
             };
+
+            ResizeEnd += (sender, args) => {
+                timerLayout.Start();
+            };
         }
 
         private int GetPluginOrderIndex(Plugin plugin){
@@ -50,18 +58,26 @@ namespace TweetDuck.Core.Other{
 
             flowLayoutPlugins.ResumeLayout(true);
             
-            // sorry, I guess...
+            timerLayout_Tick(null, EventArgs.Empty);
-            Padding = new Padding(Padding.Left, Padding.Top, Padding.Right+1, Padding.Bottom);
+            timerLayout.Start();
-            Padding = new Padding(Padding.Left, Padding.Top, Padding.Right-1, Padding.Bottom);
         }
 
-        private void flowLayoutPlugins_Resize(object sender, EventArgs e){
+        private void timerLayout_Tick(object sender, EventArgs e){
-            if (flowLayoutPlugins.Controls.Count == 0){
+            timerLayout.Stop();
+            
+            // stupid WinForms scrollbars and panels
+            Padding = new Padding(Padding.Left, Padding.Top, Padding.Right+1, Padding.Bottom+1);
+            Padding = new Padding(Padding.Left, Padding.Top, Padding.Right-1, Padding.Bottom-1);
+        }
+
+        public void flowLayoutPlugins_Resize(object sender, EventArgs e){
+            Control lastPlugin = flowLayoutPlugins.Controls.OfType<PluginControl>().LastOrDefault();
+            
+            if (lastPlugin == null){
                 return;
             }
 
-            Control lastControl = flowLayoutPlugins.Controls[flowLayoutPlugins.Controls.Count-1];
+            bool showScrollBar = lastPlugin.Location.Y+lastPlugin.Height+1 >= flowLayoutPlugins.Height;
-            bool showScrollBar = lastControl.Location.Y+lastControl.Height >= flowLayoutPlugins.Height;
             int horizontalOffset = showScrollBar ? SystemInformation.VerticalScrollBarWidth : 0;
             
             flowLayoutPlugins.AutoScroll = showScrollBar;
@@ -71,7 +87,7 @@ namespace TweetDuck.Core.Other{
                 control.Width = flowLayoutPlugins.Width-control.Margin.Horizontal-horizontalOffset;
             }
             
-            lastControl.Visible = !showScrollBar;
+            flowLayoutPlugins.Controls[flowLayoutPlugins.Controls.Count-1].Visible = !showScrollBar;
             flowLayoutPlugins.Focus();
         }
 

Core/Other/FormSettings.Designer.cs

@@ -33,10 +33,11 @@
             // 
             this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnClose.AutoSize = true;
-            this.btnClose.Location = new System.Drawing.Point(449, 504);
+            this.btnClose.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnClose.Location = new System.Drawing.Point(448, 525);
             this.btnClose.Name = "btnClose";
-            this.btnClose.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.btnClose.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.btnClose.Size = new System.Drawing.Size(49, 23);
+            this.btnClose.Size = new System.Drawing.Size(50, 25);
             this.btnClose.TabIndex = 3;
             this.btnClose.Text = "Close";
             this.btnClose.UseVisualStyleBackColor = true;
@@ -52,7 +53,7 @@
             this.panelContents.Location = new System.Drawing.Point(135, 12);
             this.panelContents.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
             this.panelContents.Name = "panelContents";
-            this.panelContents.Size = new System.Drawing.Size(363, 486);
+            this.panelContents.Size = new System.Drawing.Size(363, 507);
             this.panelContents.TabIndex = 1;
             // 
             // panelButtons
@@ -63,17 +64,18 @@
             this.panelButtons.Location = new System.Drawing.Point(12, 12);
             this.panelButtons.Margin = new System.Windows.Forms.Padding(3, 3, 0, 3);
             this.panelButtons.Name = "panelButtons";
-            this.panelButtons.Size = new System.Drawing.Size(124, 486);
+            this.panelButtons.Size = new System.Drawing.Size(124, 507);
             this.panelButtons.TabIndex = 0;
             // 
             // btnManageOptions
             // 
             this.btnManageOptions.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.btnManageOptions.AutoSize = true;
-            this.btnManageOptions.Location = new System.Drawing.Point(12, 504);
+            this.btnManageOptions.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnManageOptions.Location = new System.Drawing.Point(12, 525);
             this.btnManageOptions.Name = "btnManageOptions";
-            this.btnManageOptions.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.btnManageOptions.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.btnManageOptions.Size = new System.Drawing.Size(101, 23);
+            this.btnManageOptions.Size = new System.Drawing.Size(109, 25);
             this.btnManageOptions.TabIndex = 4;
             this.btnManageOptions.Text = "Manage Options";
             this.btnManageOptions.UseVisualStyleBackColor = true;
@@ -83,7 +85,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(510, 539);
+            this.ClientSize = new System.Drawing.Size(510, 562);
             this.Controls.Add(this.btnManageOptions);
             this.Controls.Add(this.panelContents);
             this.Controls.Add(this.panelButtons);

Core/Other/FormSettings.cs

@@ -90,6 +90,7 @@ namespace TweetDuck.Core.Other{
             FlatButton btn = new FlatButton{
                 BackColor = SystemColors.Control,
                 FlatStyle = FlatStyle.Flat,
+                Font = SystemFonts.MessageBoxFont,
                 Location = new Point(0, (buttonHeight+1)*(panelButtons.Controls.Count/2)),
                 Margin = new Padding(0),
                 Size = new Size(panelButtons.Width, buttonHeight),

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

@@ -34,21 +34,23 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.textBoxReport.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.textBoxReport.Location = new System.Drawing.Point(12, 41);
+            this.textBoxReport.Location = new System.Drawing.Point(12, 45);
             this.textBoxReport.Multiline = true;
             this.textBoxReport.Name = "textBoxReport";
             this.textBoxReport.ReadOnly = true;
             this.textBoxReport.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.textBoxReport.Size = new System.Drawing.Size(460, 480);
+            this.textBoxReport.Size = new System.Drawing.Size(435, 474);
             this.textBoxReport.TabIndex = 1;
             // 
             // btnClose
             // 
             this.btnClose.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnClose.Location = new System.Drawing.Point(416, 527);
+            this.btnClose.AutoSize = true;
+            this.btnClose.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnClose.Location = new System.Drawing.Point(397, 525);
             this.btnClose.Name = "btnClose";
-            this.btnClose.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.btnClose.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.btnClose.Size = new System.Drawing.Size(56, 23);
+            this.btnClose.Size = new System.Drawing.Size(50, 25);
             this.btnClose.TabIndex = 2;
             this.btnClose.Text = "Close";
             this.btnClose.UseVisualStyleBackColor = true;
@@ -56,23 +58,25 @@
             // 
             // labelInfo
             // 
+            this.labelInfo.AutoSize = true;
+            this.labelInfo.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelInfo.Location = new System.Drawing.Point(12, 9);
             this.labelInfo.Margin = new System.Windows.Forms.Padding(3, 0, 3, 3);
             this.labelInfo.Name = "labelInfo";
-            this.labelInfo.Size = new System.Drawing.Size(460, 26);
+            this.labelInfo.Size = new System.Drawing.Size(434, 30);
             this.labelInfo.TabIndex = 0;
-            this.labelInfo.Text = "When enabled, this data will be sent over a secure network roughly once every wee" +
+            this.labelInfo.Text = "When enabled, this data will be sent over a secure network roughly every 14 days." +
-    "k.\r\nSome numbers in the report were made imprecise on purpose.";
+    "\r\nSome numbers in the report were made imprecise on purpose.";
             // 
             // DialogSettingsAnalytics
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(484, 562);
+            this.ClientSize = new System.Drawing.Size(459, 562);
             this.Controls.Add(this.labelInfo);
             this.Controls.Add(this.btnClose);
             this.Controls.Add(this.textBoxReport);
-            this.MinimumSize = new System.Drawing.Size(450, 340);
+            this.MinimumSize = new System.Drawing.Size(475, 340);
             this.Name = "DialogSettingsAnalytics";
             this.ShowIcon = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

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

@@ -51,7 +51,7 @@
             this.textBoxBrowserCSS.Multiline = true;
             this.textBoxBrowserCSS.Name = "textBoxBrowserCSS";
             this.textBoxBrowserCSS.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.textBoxBrowserCSS.Size = new System.Drawing.Size(378, 253);
+            this.textBoxBrowserCSS.Size = new System.Drawing.Size(378, 251);
             this.textBoxBrowserCSS.TabIndex = 1;
             this.textBoxBrowserCSS.WordWrap = false;
             this.textBoxBrowserCSS.KeyUp += new System.Windows.Forms.KeyEventHandler(this.textBoxBrowserCSS_KeyUp);
@@ -59,10 +59,12 @@
             // 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(654, 287);
+            this.btnCancel.AutoSize = true;
+            this.btnCancel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btnCancel.Location = new System.Drawing.Point(657, 285);
             this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.btnCancel.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.btnCancel.Size = new System.Drawing.Size(56, 23);
+            this.btnCancel.Size = new System.Drawing.Size(57, 25);
             this.btnCancel.TabIndex = 2;
             this.btnCancel.Text = "Cancel";
             this.btnCancel.UseVisualStyleBackColor = true;
@@ -71,10 +73,12 @@
             // btnApply
             // 
             this.btnApply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnApply.Location = new System.Drawing.Point(716, 287);
+            this.btnApply.AutoSize = true;
+            this.btnApply.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btnApply.Location = new System.Drawing.Point(720, 285);
             this.btnApply.Name = "btnApply";
-            this.btnApply.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.btnApply.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.btnApply.Size = new System.Drawing.Size(56, 23);
+            this.btnApply.Size = new System.Drawing.Size(52, 25);
             this.btnApply.TabIndex = 1;
             this.btnApply.Text = "Apply";
             this.btnApply.UseVisualStyleBackColor = true;
@@ -99,7 +103,7 @@
             this.splitContainer.Panel2.Controls.Add(this.labelNotification);
             this.splitContainer.Panel2.Controls.Add(this.textBoxNotificationCSS);
             this.splitContainer.Panel2MinSize = 64;
-            this.splitContainer.Size = new System.Drawing.Size(760, 269);
+            this.splitContainer.Size = new System.Drawing.Size(760, 267);
             this.splitContainer.SplitterDistance = 378;
             this.splitContainer.SplitterWidth = 5;
             this.splitContainer.TabIndex = 0;
@@ -107,20 +111,22 @@
             // labelBrowser
             // 
             this.labelBrowser.AutoSize = true;
+            this.labelBrowser.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.labelBrowser.Location = new System.Drawing.Point(-3, 0);
             this.labelBrowser.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelBrowser.Name = "labelBrowser";
-            this.labelBrowser.Size = new System.Drawing.Size(45, 13);
+            this.labelBrowser.Size = new System.Drawing.Size(49, 15);
             this.labelBrowser.TabIndex = 0;
             this.labelBrowser.Text = "Browser";
             // 
             // labelNotification
             // 
             this.labelNotification.AutoSize = true;
+            this.labelNotification.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
             this.labelNotification.Location = new System.Drawing.Point(-3, 0);
             this.labelNotification.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelNotification.Name = "labelNotification";
-            this.labelNotification.Size = new System.Drawing.Size(60, 13);
+            this.labelNotification.Size = new System.Drawing.Size(70, 15);
             this.labelNotification.TabIndex = 0;
             this.labelNotification.Text = "Notification";
             // 
@@ -135,7 +141,7 @@
             this.textBoxNotificationCSS.Multiline = true;
             this.textBoxNotificationCSS.Name = "textBoxNotificationCSS";
             this.textBoxNotificationCSS.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.textBoxNotificationCSS.Size = new System.Drawing.Size(377, 253);
+            this.textBoxNotificationCSS.Size = new System.Drawing.Size(372, 251);
             this.textBoxNotificationCSS.TabIndex = 1;
             this.textBoxNotificationCSS.WordWrap = false;
             // 
@@ -143,19 +149,22 @@
             // 
             this.labelWarning.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.labelWarning.AutoSize = true;
-            this.labelWarning.Location = new System.Drawing.Point(91, 292);
+            this.labelWarning.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelWarning.Location = new System.Drawing.Point(94, 290);
             this.labelWarning.Name = "labelWarning";
-            this.labelWarning.Size = new System.Drawing.Size(341, 13);
+            this.labelWarning.Size = new System.Drawing.Size(373, 15);
             this.labelWarning.TabIndex = 3;
             this.labelWarning.Text = "The code is not validated, please make sure there are no syntax errors.";
             // 
             // btnOpenWiki
             // 
             this.btnOpenWiki.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.btnOpenWiki.Location = new System.Drawing.Point(12, 287);
+            this.btnOpenWiki.AutoSize = true;
+            this.btnOpenWiki.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0)));
+            this.btnOpenWiki.Location = new System.Drawing.Point(12, 285);
             this.btnOpenWiki.Name = "btnOpenWiki";
-            this.btnOpenWiki.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.btnOpenWiki.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.btnOpenWiki.Size = new System.Drawing.Size(73, 23);
+            this.btnOpenWiki.Size = new System.Drawing.Size(76, 25);
             this.btnOpenWiki.TabIndex = 4;
             this.btnOpenWiki.Text = "Open Wiki";
             this.btnOpenWiki.UseVisualStyleBackColor = true;
@@ -176,7 +185,7 @@
             this.Controls.Add(this.splitContainer);
             this.Controls.Add(this.btnApply);
             this.Controls.Add(this.btnCancel);
-            this.MinimumSize = new System.Drawing.Size(600, 160);
+            this.MinimumSize = new System.Drawing.Size(620, 160);
             this.Name = "DialogSettingsCSS";
             this.ShowIcon = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

Core/Other/Settings/Dialogs/DialogSettingsCSS.cs

@@ -10,7 +10,7 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
 
         private readonly Action<string> reinjectBrowserCSS;
 
-        public DialogSettingsCSS(Action<string> reinjectBrowserCSS){
+        public DialogSettingsCSS(Action<string> reinjectBrowserCSS){ // TODO high dpi breaks scaling of things inside the panel...
             InitializeComponent();
             
             Text = Program.BrandName+" Options - CSS";

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

@@ -36,19 +36,21 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.textBoxArgs.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.textBoxArgs.Location = new System.Drawing.Point(12, 28);
+            this.textBoxArgs.Location = new System.Drawing.Point(12, 30);
             this.textBoxArgs.Multiline = true;
             this.textBoxArgs.Name = "textBoxArgs";
-            this.textBoxArgs.Size = new System.Drawing.Size(460, 193);
+            this.textBoxArgs.Size = new System.Drawing.Size(480, 189);
             this.textBoxArgs.TabIndex = 1;
             // 
             // 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(354, 227);
+            this.btnCancel.AutoSize = true;
+            this.btnCancel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnCancel.Location = new System.Drawing.Point(377, 225);
             this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.btnCancel.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.btnCancel.Size = new System.Drawing.Size(56, 23);
+            this.btnCancel.Size = new System.Drawing.Size(57, 25);
             this.btnCancel.TabIndex = 3;
             this.btnCancel.Text = "Cancel";
             this.btnCancel.UseVisualStyleBackColor = true;
@@ -57,10 +59,12 @@
             // btnApply
             // 
             this.btnApply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnApply.Location = new System.Drawing.Point(416, 227);
+            this.btnApply.AutoSize = true;
+            this.btnApply.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnApply.Location = new System.Drawing.Point(440, 225);
             this.btnApply.Name = "btnApply";
-            this.btnApply.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.btnApply.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.btnApply.Size = new System.Drawing.Size(56, 23);
+            this.btnApply.Size = new System.Drawing.Size(52, 25);
             this.btnApply.TabIndex = 2;
             this.btnApply.Text = "Apply";
             this.btnApply.UseVisualStyleBackColor = true;
@@ -69,10 +73,12 @@
             // btnHelp
             // 
             this.btnHelp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.btnHelp.Location = new System.Drawing.Point(12, 227);
+            this.btnHelp.AutoSize = true;
+            this.btnHelp.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnHelp.Location = new System.Drawing.Point(12, 225);
             this.btnHelp.Name = "btnHelp";
-            this.btnHelp.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.btnHelp.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.btnHelp.Size = new System.Drawing.Size(124, 23);
+            this.btnHelp.Size = new System.Drawing.Size(141, 25);
             this.btnHelp.TabIndex = 4;
             this.btnHelp.Text = "List of Chromium Args";
             this.btnHelp.UseVisualStyleBackColor = true;
@@ -81,10 +87,11 @@
             // labelWarning
             // 
             this.labelWarning.AutoSize = true;
+            this.labelWarning.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelWarning.Location = new System.Drawing.Point(12, 9);
             this.labelWarning.Margin = new System.Windows.Forms.Padding(3, 0, 3, 3);
             this.labelWarning.Name = "labelWarning";
-            this.labelWarning.Size = new System.Drawing.Size(423, 13);
+            this.labelWarning.Size = new System.Drawing.Size(478, 15);
             this.labelWarning.TabIndex = 0;
             this.labelWarning.Text = "Warning: Some arguments may cause the program to stop working, edit at your own r" +
     "isk.";
@@ -93,13 +100,13 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(484, 262);
+            this.ClientSize = new System.Drawing.Size(504, 262);
             this.Controls.Add(this.labelWarning);
             this.Controls.Add(this.btnHelp);
             this.Controls.Add(this.btnApply);
             this.Controls.Add(this.btnCancel);
             this.Controls.Add(this.textBoxArgs);
-            this.MinimumSize = new System.Drawing.Size(500, 160);
+            this.MinimumSize = new System.Drawing.Size(520, 160);
             this.Name = "DialogSettingsCefArgs";
             this.ShowIcon = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

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

@@ -43,10 +43,12 @@
             // 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(176, 97);
+            this.btnCancel.AutoSize = true;
+            this.btnCancel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnCancel.Location = new System.Drawing.Point(165, 92);
             this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.btnCancel.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.btnCancel.Size = new System.Drawing.Size(56, 23);
+            this.btnCancel.Size = new System.Drawing.Size(57, 25);
             this.btnCancel.TabIndex = 4;
             this.btnCancel.Text = "Cancel";
             this.btnCancel.UseVisualStyleBackColor = true;
@@ -57,10 +59,11 @@
             this.btnContinue.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnContinue.AutoSize = true;
             this.btnContinue.Enabled = false;
-            this.btnContinue.Location = new System.Drawing.Point(119, 97);
+            this.btnContinue.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnContinue.Location = new System.Drawing.Point(114, 92);
             this.btnContinue.Name = "btnContinue";
-            this.btnContinue.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.btnContinue.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.btnContinue.Size = new System.Drawing.Size(51, 23);
+            this.btnContinue.Size = new System.Drawing.Size(45, 25);
             this.btnContinue.TabIndex = 3;
             this.btnContinue.Text = "Next";
             this.btnContinue.UseVisualStyleBackColor = true;
@@ -69,9 +72,11 @@
             // cbProgramConfig
             // 
             this.cbProgramConfig.AutoSize = true;
+            this.cbProgramConfig.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.cbProgramConfig.Location = new System.Drawing.Point(3, 3);
+            this.cbProgramConfig.Margin = new System.Windows.Forms.Padding(3, 3, 3, 2);
             this.cbProgramConfig.Name = "cbProgramConfig";
-            this.cbProgramConfig.Size = new System.Drawing.Size(104, 17);
+            this.cbProgramConfig.Size = new System.Drawing.Size(117, 19);
             this.cbProgramConfig.TabIndex = 0;
             this.cbProgramConfig.Text = "Program Options";
             this.toolTip.SetToolTip(this.cbProgramConfig, "Interface, notification, and update options.");
@@ -81,9 +86,11 @@
             // cbSession
             // 
             this.cbSession.AutoSize = true;
-            this.cbSession.Location = new System.Drawing.Point(3, 49);
+            this.cbSession.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.cbSession.Location = new System.Drawing.Point(3, 51);
+            this.cbSession.Margin = new System.Windows.Forms.Padding(3, 3, 3, 2);
             this.cbSession.Name = "cbSession";
-            this.cbSession.Size = new System.Drawing.Size(92, 17);
+            this.cbSession.Size = new System.Drawing.Size(98, 19);
             this.cbSession.TabIndex = 2;
             this.cbSession.Text = "Login Session";
             this.toolTip.SetToolTip(this.cbSession, "A token that allows logging into the\r\ncurrent TweetDeck account.");
@@ -93,9 +100,11 @@
             // cbPluginData
             // 
             this.cbPluginData.AutoSize = true;
-            this.cbPluginData.Location = new System.Drawing.Point(3, 72);
+            this.cbPluginData.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.cbPluginData.Location = new System.Drawing.Point(3, 75);
+            this.cbPluginData.Margin = new System.Windows.Forms.Padding(3, 3, 3, 2);
             this.cbPluginData.Name = "cbPluginData";
-            this.cbPluginData.Size = new System.Drawing.Size(81, 17);
+            this.cbPluginData.Size = new System.Drawing.Size(87, 19);
             this.cbPluginData.TabIndex = 3;
             this.cbPluginData.Text = "Plugin Data";
             this.toolTip.SetToolTip(this.cbPluginData, "Data files generated by plugins.\r\nDoes not include the plugins themselves.");
@@ -105,9 +114,11 @@
             // cbSystemConfig
             // 
             this.cbSystemConfig.AutoSize = true;
-            this.cbSystemConfig.Location = new System.Drawing.Point(3, 26);
+            this.cbSystemConfig.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.cbSystemConfig.Location = new System.Drawing.Point(3, 27);
+            this.cbSystemConfig.Margin = new System.Windows.Forms.Padding(3, 3, 3, 2);
             this.cbSystemConfig.Name = "cbSystemConfig";
-            this.cbSystemConfig.Size = new System.Drawing.Size(99, 17);
+            this.cbSystemConfig.Size = new System.Drawing.Size(109, 19);
             this.cbSystemConfig.TabIndex = 1;
             this.cbSystemConfig.Text = "System Options";
             this.toolTip.SetToolTip(this.cbSystemConfig, "Hardware acceleration and cache options.");
@@ -125,7 +136,7 @@
             this.panelSelection.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
             this.panelSelection.Location = new System.Drawing.Point(12, 12);
             this.panelSelection.Name = "panelSelection";
-            this.panelSelection.Size = new System.Drawing.Size(220, 89);
+            this.panelSelection.Size = new System.Drawing.Size(210, 97);
             this.panelSelection.TabIndex = 2;
             this.panelSelection.Visible = false;
             this.panelSelection.WrapContents = false;
@@ -140,16 +151,18 @@
             this.panelDecision.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
             this.panelDecision.Location = new System.Drawing.Point(12, 12);
             this.panelDecision.Name = "panelDecision";
-            this.panelDecision.Size = new System.Drawing.Size(220, 71);
+            this.panelDecision.Size = new System.Drawing.Size(210, 75);
             this.panelDecision.TabIndex = 0;
             this.panelDecision.WrapContents = false;
             // 
             // radioImport
             // 
             this.radioImport.AutoSize = true;
+            this.radioImport.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.radioImport.Location = new System.Drawing.Point(3, 3);
+            this.radioImport.Margin = new System.Windows.Forms.Padding(3, 3, 3, 2);
             this.radioImport.Name = "radioImport";
-            this.radioImport.Size = new System.Drawing.Size(86, 17);
+            this.radioImport.Size = new System.Drawing.Size(98, 19);
             this.radioImport.TabIndex = 0;
             this.radioImport.TabStop = true;
             this.radioImport.Text = "Import Profile";
@@ -159,9 +172,11 @@
             // radioExport
             // 
             this.radioExport.AutoSize = true;
-            this.radioExport.Location = new System.Drawing.Point(3, 26);
+            this.radioExport.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.radioExport.Location = new System.Drawing.Point(3, 27);
+            this.radioExport.Margin = new System.Windows.Forms.Padding(3, 3, 3, 2);
             this.radioExport.Name = "radioExport";
-            this.radioExport.Size = new System.Drawing.Size(87, 17);
+            this.radioExport.Size = new System.Drawing.Size(95, 19);
             this.radioExport.TabIndex = 1;
             this.radioExport.TabStop = true;
             this.radioExport.Text = "Export Profile";
@@ -171,9 +186,11 @@
             // radioReset
             // 
             this.radioReset.AutoSize = true;
-            this.radioReset.Location = new System.Drawing.Point(3, 49);
+            this.radioReset.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.radioReset.Location = new System.Drawing.Point(3, 51);
+            this.radioReset.Margin = new System.Windows.Forms.Padding(3, 3, 3, 2);
             this.radioReset.Name = "radioReset";
-            this.radioReset.Size = new System.Drawing.Size(104, 17);
+            this.radioReset.Size = new System.Drawing.Size(110, 19);
             this.radioReset.TabIndex = 2;
             this.radioReset.TabStop = true;
             this.radioReset.Text = "Restore Defaults";
@@ -184,7 +201,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(244, 132);
+            this.ClientSize = new System.Drawing.Size(234, 129);
             this.Controls.Add(this.btnContinue);
             this.Controls.Add(this.btnCancel);
             this.Controls.Add(this.panelDecision);
@@ -192,7 +209,7 @@
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.MaximizeBox = false;
             this.MinimizeBox = false;
-            this.MinimumSize = new System.Drawing.Size(260, 170);
+            this.MinimumSize = new System.Drawing.Size(250, 167);
             this.Name = "DialogSettingsManage";
             this.ShowIcon = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

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

@@ -39,10 +39,12 @@
             // 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(215, 139);
+            this.btnCancel.AutoSize = true;
+            this.btnCancel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnCancel.Location = new System.Drawing.Point(215, 146);
             this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.btnCancel.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.btnCancel.Size = new System.Drawing.Size(56, 23);
+            this.btnCancel.Size = new System.Drawing.Size(57, 25);
             this.btnCancel.TabIndex = 2;
             this.btnCancel.Text = "Cancel";
             this.btnCancel.UseVisualStyleBackColor = true;
@@ -51,10 +53,12 @@
             // 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(152, 139);
+            this.btnRestart.AutoSize = true;
+            this.btnRestart.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnRestart.Location = new System.Drawing.Point(152, 146);
             this.btnRestart.Name = "btnRestart";
-            this.btnRestart.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.btnRestart.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.btnRestart.Size = new System.Drawing.Size(57, 23);
+            this.btnRestart.Size = new System.Drawing.Size(57, 25);
             this.btnRestart.TabIndex = 1;
             this.btnRestart.Text = "Restart";
             this.btnRestart.UseVisualStyleBackColor = true;
@@ -63,19 +67,22 @@
             // cbLogging
             // 
             this.cbLogging.AutoSize = true;
+            this.cbLogging.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.cbLogging.Location = new System.Drawing.Point(3, 3);
+            this.cbLogging.Margin = new System.Windows.Forms.Padding(3, 3, 3, 2);
             this.cbLogging.Name = "cbLogging";
-            this.cbLogging.Size = new System.Drawing.Size(64, 17);
+            this.cbLogging.Size = new System.Drawing.Size(70, 19);
             this.cbLogging.TabIndex = 0;
             this.cbLogging.Text = "Logging";
-            this.toolTip.SetToolTip(this.cbLogging, "Logging JavaScript output into TD_Console.txt file in the data folder.");
+            this.toolTip.SetToolTip(this.cbLogging, "Logs JavaScript output into TD_Console.txt file in the data folder.");
             this.cbLogging.UseVisualStyleBackColor = true;
             // 
             // tbDataFolder
             // 
-            this.tbDataFolder.Location = new System.Drawing.Point(3, 51);
+            this.tbDataFolder.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.tbDataFolder.Location = new System.Drawing.Point(3, 54);
             this.tbDataFolder.Name = "tbDataFolder";
-            this.tbDataFolder.Size = new System.Drawing.Size(260, 20);
+            this.tbDataFolder.Size = new System.Drawing.Size(260, 23);
             this.tbDataFolder.TabIndex = 2;
             this.toolTip.SetToolTip(this.tbDataFolder, "Path to the data folder. Must be either an absolute path,\r\nor a simple folder nam" +
         "e that will be created in LocalAppData.");
@@ -85,30 +92,33 @@
             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(3, 102);
+            this.tbShortcutTarget.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.tbShortcutTarget.Location = new System.Drawing.Point(3, 110);
             this.tbShortcutTarget.Name = "tbShortcutTarget";
             this.tbShortcutTarget.ReadOnly = true;
-            this.tbShortcutTarget.Size = new System.Drawing.Size(260, 20);
+            this.tbShortcutTarget.Size = new System.Drawing.Size(260, 23);
             this.tbShortcutTarget.TabIndex = 4;
             this.tbShortcutTarget.Click += new System.EventHandler(this.tbShortcutTarget_Click);
             // 
             // labelDataFolder
             // 
             this.labelDataFolder.AutoSize = true;
-            this.labelDataFolder.Location = new System.Drawing.Point(3, 35);
+            this.labelDataFolder.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelDataFolder.Location = new System.Drawing.Point(3, 36);
             this.labelDataFolder.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelDataFolder.Name = "labelDataFolder";
-            this.labelDataFolder.Size = new System.Drawing.Size(62, 13);
+            this.labelDataFolder.Size = new System.Drawing.Size(67, 15);
             this.labelDataFolder.TabIndex = 1;
             this.labelDataFolder.Text = "Data Folder";
             // 
             // labelShortcutTarget
             // 
             this.labelShortcutTarget.AutoSize = true;
-            this.labelShortcutTarget.Location = new System.Drawing.Point(3, 86);
+            this.labelShortcutTarget.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelShortcutTarget.Location = new System.Drawing.Point(3, 92);
             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.Size = new System.Drawing.Size(171, 15);
             this.labelShortcutTarget.TabIndex = 3;
             this.labelShortcutTarget.Text = "Shortcut Target (click to select)";
             // 
@@ -126,7 +136,7 @@
             this.flowPanel.Location = new System.Drawing.Point(9, 9);
             this.flowPanel.Margin = new System.Windows.Forms.Padding(0);
             this.flowPanel.Name = "flowPanel";
-            this.flowPanel.Size = new System.Drawing.Size(266, 127);
+            this.flowPanel.Size = new System.Drawing.Size(266, 136);
             this.flowPanel.TabIndex = 0;
             this.flowPanel.WrapContents = false;
             // 
@@ -134,7 +144,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(284, 174);
+            this.ClientSize = new System.Drawing.Size(284, 183);
             this.Controls.Add(this.flowPanel);
             this.Controls.Add(this.btnRestart);
             this.Controls.Add(this.btnCancel);
@@ -147,6 +157,7 @@
             this.flowPanel.ResumeLayout(false);
             this.flowPanel.PerformLayout();
             this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
 

Core/Other/Settings/Dialogs/DialogSettingsRestart.cs

@@ -12,7 +12,7 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
 
             cbLogging.Checked = currentArgs.HasFlag(Arguments.ArgLogging);
             cbLogging.CheckedChanged += control_Change;
-
+            
             if (Program.IsPortable){
                 tbDataFolder.Text = "Not available in portable version";
                 tbDataFolder.Enabled = false;
@@ -33,7 +33,7 @@ namespace TweetDuck.Core.Other.Settings.Dialogs{
             if (cbLogging.Checked){
                 Args.AddFlag(Arguments.ArgLogging);
             }
-
+            
             if (!string.IsNullOrWhiteSpace(tbDataFolder.Text) && tbDataFolder.Enabled){
                 Args.SetValue(Arguments.ArgDataFolder, tbDataFolder.Text);
             }

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

@@ -34,18 +34,21 @@
             this.textBoxUrl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.textBoxUrl.Location = new System.Drawing.Point(12, 28);
+            this.textBoxUrl.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.textBoxUrl.Location = new System.Drawing.Point(12, 30);
             this.textBoxUrl.Name = "textBoxUrl";
-            this.textBoxUrl.Size = new System.Drawing.Size(310, 20);
+            this.textBoxUrl.Size = new System.Drawing.Size(310, 23);
             this.textBoxUrl.TabIndex = 1;
             // 
             // 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(204, 56);
+            this.btnCancel.AutoSize = true;
+            this.btnCancel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnCancel.Location = new System.Drawing.Point(207, 59);
             this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.btnCancel.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.btnCancel.Size = new System.Drawing.Size(56, 23);
+            this.btnCancel.Size = new System.Drawing.Size(57, 25);
             this.btnCancel.TabIndex = 3;
             this.btnCancel.Text = "Cancel";
             this.btnCancel.UseVisualStyleBackColor = true;
@@ -54,10 +57,12 @@
             // btnApply
             // 
             this.btnApply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnApply.Location = new System.Drawing.Point(266, 56);
+            this.btnApply.AutoSize = true;
+            this.btnApply.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnApply.Location = new System.Drawing.Point(270, 59);
             this.btnApply.Name = "btnApply";
-            this.btnApply.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.btnApply.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.btnApply.Size = new System.Drawing.Size(56, 23);
+            this.btnApply.Size = new System.Drawing.Size(52, 25);
             this.btnApply.TabIndex = 2;
             this.btnApply.Text = "Apply";
             this.btnApply.UseVisualStyleBackColor = true;
@@ -66,10 +71,11 @@
             // labelInfo
             // 
             this.labelInfo.AutoSize = true;
+            this.labelInfo.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelInfo.Location = new System.Drawing.Point(12, 9);
             this.labelInfo.Margin = new System.Windows.Forms.Padding(3, 0, 3, 3);
             this.labelInfo.Name = "labelInfo";
-            this.labelInfo.Size = new System.Drawing.Size(264, 13);
+            this.labelInfo.Size = new System.Drawing.Size(287, 15);
             this.labelInfo.TabIndex = 0;
             this.labelInfo.Text = "The search query will be added at the end of the URL.";
             // 
@@ -77,7 +83,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(334, 91);
+            this.ClientSize = new System.Drawing.Size(334, 96);
             this.Controls.Add(this.labelInfo);
             this.Controls.Add(this.btnApply);
             this.Controls.Add(this.btnCancel);

Core/Other/Settings/TabSettingsAdvanced.Designer.cs

@@ -52,101 +52,128 @@
             // 
             // btnClearCache
             // 
-            this.btnClearCache.Location = new System.Drawing.Point(5, 172);
+            this.btnClearCache.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnClearCache.Location = new System.Drawing.Point(5, 179);
             this.btnClearCache.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.btnClearCache.Name = "btnClearCache";
-            this.btnClearCache.Size = new System.Drawing.Size(144, 23);
+            this.btnClearCache.Size = new System.Drawing.Size(144, 25);
             this.btnClearCache.TabIndex = 5;
-            this.btnClearCache.Text = "Clear Cache (calculating)";
+            this.btnClearCache.Text = "Clear Cache (...)";
             this.btnClearCache.UseVisualStyleBackColor = true;
             // 
             // checkHardwareAcceleration
             // 
             this.checkHardwareAcceleration.AutoSize = true;
-            this.checkHardwareAcceleration.Location = new System.Drawing.Point(6, 124);
+            this.checkHardwareAcceleration.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.checkHardwareAcceleration.Margin = new System.Windows.Forms.Padding(6, 6, 3, 3);
+            this.checkHardwareAcceleration.Location = new System.Drawing.Point(6, 128);
+            this.checkHardwareAcceleration.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
             this.checkHardwareAcceleration.Name = "checkHardwareAcceleration";
-            this.checkHardwareAcceleration.Size = new System.Drawing.Size(134, 17);
+            this.checkHardwareAcceleration.Size = new System.Drawing.Size(146, 19);
             this.checkHardwareAcceleration.TabIndex = 3;
             this.checkHardwareAcceleration.Text = "Hardware Acceleration";
             this.checkHardwareAcceleration.UseVisualStyleBackColor = true;
             // 
             // btnEditCefArgs
             // 
+            this.btnEditCefArgs.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.btnEditCefArgs.Location = new System.Drawing.Point(5, 3);
             this.btnEditCefArgs.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.btnEditCefArgs.Name = "btnEditCefArgs";
-            this.btnEditCefArgs.Size = new System.Drawing.Size(144, 23);
+            this.btnEditCefArgs.Size = new System.Drawing.Size(144, 25);
             this.btnEditCefArgs.TabIndex = 0;
             this.btnEditCefArgs.Text = "Edit CEF Arguments";
             this.btnEditCefArgs.UseVisualStyleBackColor = true;
             // 
             // btnEditCSS
             // 
+            this.btnEditCSS.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.btnEditCSS.Location = new System.Drawing.Point(155, 3);
             this.btnEditCSS.Name = "btnEditCSS";
-            this.btnEditCSS.Size = new System.Drawing.Size(144, 23);
+            this.btnEditCSS.Size = new System.Drawing.Size(144, 25);
             this.btnEditCSS.TabIndex = 1;
             this.btnEditCSS.Text = "Edit CSS";
             this.btnEditCSS.UseVisualStyleBackColor = true;
             // 
             // btnRestartArgs
             // 
+            this.btnRestartArgs.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.btnRestartArgs.Location = new System.Drawing.Point(155, 32);
             this.btnRestartArgs.Name = "btnRestartArgs";
-            this.btnRestartArgs.Size = new System.Drawing.Size(144, 23);
+            this.btnRestartArgs.Size = new System.Drawing.Size(144, 25);
             this.btnRestartArgs.TabIndex = 3;
             this.btnRestartArgs.Text = "Restart with Arguments";
             this.btnRestartArgs.UseVisualStyleBackColor = true;
             // 
             // btnRestart
             // 
+            this.btnRestart.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.btnRestart.Location = new System.Drawing.Point(155, 3);
             this.btnRestart.Name = "btnRestart";
-            this.btnRestart.Size = new System.Drawing.Size(144, 23);
+            this.btnRestart.Size = new System.Drawing.Size(144, 25);
             this.btnRestart.TabIndex = 2;
             this.btnRestart.Text = "Restart the Program";
             this.btnRestart.UseVisualStyleBackColor = true;
             // 
             // btnOpenAppFolder
             // 
+            this.btnOpenAppFolder.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.btnOpenAppFolder.Location = new System.Drawing.Point(5, 3);
             this.btnOpenAppFolder.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.btnOpenAppFolder.Name = "btnOpenAppFolder";
-            this.btnOpenAppFolder.Size = new System.Drawing.Size(144, 23);
+            this.btnOpenAppFolder.Size = new System.Drawing.Size(144, 25);
             this.btnOpenAppFolder.TabIndex = 0;
             this.btnOpenAppFolder.Text = "Open Program Folder";
             this.btnOpenAppFolder.UseVisualStyleBackColor = true;
             // 
             // btnOpenDataFolder
             // 
+            this.btnOpenDataFolder.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.btnOpenDataFolder.Location = new System.Drawing.Point(5, 32);
             this.btnOpenDataFolder.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.btnOpenDataFolder.Name = "btnOpenDataFolder";
-            this.btnOpenDataFolder.Size = new System.Drawing.Size(144, 23);
+            this.btnOpenDataFolder.Size = new System.Drawing.Size(144, 25);
             this.btnOpenDataFolder.TabIndex = 1;
             this.btnOpenDataFolder.Text = "Open Data Folder";
             this.btnOpenDataFolder.UseVisualStyleBackColor = true;
             // 
             // numClearCacheThreshold
             // 
-            this.numClearCacheThreshold.Increment = 50;
+            this.numClearCacheThreshold.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.numClearCacheThreshold.Location = new System.Drawing.Point(227, 4);
+            this.numClearCacheThreshold.Increment = new decimal(new int[] {
-            this.numClearCacheThreshold.Maximum = 1000;
+            50,
-            this.numClearCacheThreshold.Minimum = 100;
+            0,
+            0,
+            0});
+            this.numClearCacheThreshold.Location = new System.Drawing.Point(246, 5);
+            this.numClearCacheThreshold.Maximum = new decimal(new int[] {
+            1000,
+            0,
+            0,
+            0});
+            this.numClearCacheThreshold.Minimum = new decimal(new int[] {
+            100,
+            0,
+            0,
+            0});
             this.numClearCacheThreshold.Name = "numClearCacheThreshold";
-            this.numClearCacheThreshold.Size = new System.Drawing.Size(72, 20);
+            this.numClearCacheThreshold.Size = new System.Drawing.Size(68, 23);
             this.numClearCacheThreshold.TabIndex = 1;
+            this.numClearCacheThreshold.TextAlign = System.Windows.Forms.HorizontalAlignment.Right;
             this.numClearCacheThreshold.TextSuffix = " MB";
-            this.numClearCacheThreshold.Value = 250;
+            this.numClearCacheThreshold.Value = new decimal(new int[] {
+            250,
+            0,
+            0,
+            0});
             // 
             // checkClearCacheAuto
             // 
             this.checkClearCacheAuto.AutoSize = true;
+            this.checkClearCacheAuto.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.checkClearCacheAuto.Location = new System.Drawing.Point(6, 6);
-            this.checkClearCacheAuto.Margin = new System.Windows.Forms.Padding(6, 6, 3, 3);
+            this.checkClearCacheAuto.Margin = new System.Windows.Forms.Padding(6, 6, 0, 2);
             this.checkClearCacheAuto.Name = "checkClearCacheAuto";
-            this.checkClearCacheAuto.Size = new System.Drawing.Size(215, 17);
+            this.checkClearCacheAuto.Size = new System.Drawing.Size(237, 19);
             this.checkClearCacheAuto.TabIndex = 0;
             this.checkClearCacheAuto.Text = "Clear Cache Automatically When Above";
             this.checkClearCacheAuto.UseVisualStyleBackColor = true;
@@ -154,11 +181,11 @@
             // labelApp
             // 
             this.labelApp.AutoSize = true;
-            this.labelApp.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelApp.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelApp.Location = new System.Drawing.Point(0, 0);
             this.labelApp.Margin = new System.Windows.Forms.Padding(0);
             this.labelApp.Name = "labelApp";
-            this.labelApp.Size = new System.Drawing.Size(38, 20);
+            this.labelApp.Size = new System.Drawing.Size(37, 20);
             this.labelApp.TabIndex = 0;
             this.labelApp.Text = "App";
             // 
@@ -172,17 +199,17 @@
             this.panelAppButtons.Location = new System.Drawing.Point(0, 20);
             this.panelAppButtons.Margin = new System.Windows.Forms.Padding(0);
             this.panelAppButtons.Name = "panelAppButtons";
-            this.panelAppButtons.Size = new System.Drawing.Size(322, 58);
+            this.panelAppButtons.Size = new System.Drawing.Size(322, 62);
             this.panelAppButtons.TabIndex = 1;
             // 
             // labelPerformance
             // 
             this.labelPerformance.AutoSize = true;
-            this.labelPerformance.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelPerformance.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelPerformance.Location = new System.Drawing.Point(0, 98);
+            this.labelPerformance.Location = new System.Drawing.Point(0, 102);
             this.labelPerformance.Margin = new System.Windows.Forms.Padding(0, 20, 0, 0);
             this.labelPerformance.Name = "labelPerformance";
-            this.labelPerformance.Size = new System.Drawing.Size(100, 20);
+            this.labelPerformance.Size = new System.Drawing.Size(93, 20);
             this.labelPerformance.TabIndex = 2;
             this.labelPerformance.Text = "Performance";
             // 
@@ -191,19 +218,20 @@
             this.panelClearCacheAuto.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.panelClearCacheAuto.Controls.Add(this.checkClearCacheAuto);
             this.panelClearCacheAuto.Controls.Add(this.numClearCacheThreshold);
-            this.panelClearCacheAuto.Location = new System.Drawing.Point(0, 198);
+            this.panelClearCacheAuto.Location = new System.Drawing.Point(0, 207);
             this.panelClearCacheAuto.Margin = new System.Windows.Forms.Padding(0);
             this.panelClearCacheAuto.Name = "panelClearCacheAuto";
-            this.panelClearCacheAuto.Size = new System.Drawing.Size(322, 26);
+            this.panelClearCacheAuto.Size = new System.Drawing.Size(322, 28);
             this.panelClearCacheAuto.TabIndex = 6;
             // 
             // labelCache
             // 
             this.labelCache.AutoSize = true;
-            this.labelCache.Location = new System.Drawing.Point(3, 156);
+            this.labelCache.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelCache.Location = new System.Drawing.Point(3, 161);
             this.labelCache.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelCache.Name = "labelCache";
-            this.labelCache.Size = new System.Drawing.Size(38, 13);
+            this.labelCache.Size = new System.Drawing.Size(40, 15);
             this.labelCache.TabIndex = 4;
             this.labelCache.Text = "Cache";
             // 
@@ -212,20 +240,20 @@
             this.panelConfiguration.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.panelConfiguration.Controls.Add(this.btnEditCSS);
             this.panelConfiguration.Controls.Add(this.btnEditCefArgs);
-            this.panelConfiguration.Location = new System.Drawing.Point(0, 264);
+            this.panelConfiguration.Location = new System.Drawing.Point(0, 275);
             this.panelConfiguration.Margin = new System.Windows.Forms.Padding(0);
             this.panelConfiguration.Name = "panelConfiguration";
-            this.panelConfiguration.Size = new System.Drawing.Size(322, 29);
+            this.panelConfiguration.Size = new System.Drawing.Size(322, 31);
             this.panelConfiguration.TabIndex = 8;
             // 
             // labelConfiguration
             // 
             this.labelConfiguration.AutoSize = true;
-            this.labelConfiguration.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelConfiguration.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelConfiguration.Location = new System.Drawing.Point(0, 244);
+            this.labelConfiguration.Location = new System.Drawing.Point(0, 255);
             this.labelConfiguration.Margin = new System.Windows.Forms.Padding(0, 20, 0, 0);
             this.labelConfiguration.Name = "labelConfiguration";
-            this.labelConfiguration.Size = new System.Drawing.Size(104, 20);
+            this.labelConfiguration.Size = new System.Drawing.Size(100, 20);
             this.labelConfiguration.TabIndex = 7;
             this.labelConfiguration.Text = "Configuration";
             // 
@@ -246,7 +274,7 @@
             this.flowPanel.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
             this.flowPanel.Location = new System.Drawing.Point(9, 9);
             this.flowPanel.Name = "flowPanel";
-            this.flowPanel.Size = new System.Drawing.Size(322, 295);
+            this.flowPanel.Size = new System.Drawing.Size(322, 307);
             this.flowPanel.TabIndex = 0;
             this.flowPanel.WrapContents = false;
             // 
@@ -256,7 +284,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.flowPanel);
             this.Name = "TabSettingsAdvanced";
-            this.Size = new System.Drawing.Size(340, 313);
+            this.Size = new System.Drawing.Size(340, 325);
             ((System.ComponentModel.ISupportInitialize)(this.numClearCacheThreshold)).EndInit();
             this.panelAppButtons.ResumeLayout(false);
             this.panelClearCacheAuto.ResumeLayout(false);

Core/Other/Settings/TabSettingsFeedback.Designer.cs

@@ -43,21 +43,22 @@
             this.panelDataCollection.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.panelDataCollection.Controls.Add(this.labelDataCollectionLink);
             this.panelDataCollection.Controls.Add(this.checkDataCollection);
-            this.panelDataCollection.Location = new System.Drawing.Point(0, 74);
+            this.panelDataCollection.Location = new System.Drawing.Point(0, 78);
             this.panelDataCollection.Margin = new System.Windows.Forms.Padding(0);
             this.panelDataCollection.Name = "panelDataCollection";
-            this.panelDataCollection.Size = new System.Drawing.Size(322, 26);
+            this.panelDataCollection.Size = new System.Drawing.Size(322, 28);
             this.panelDataCollection.TabIndex = 3;
             // 
             // labelDataCollectionLink
             // 
             this.labelDataCollectionLink.AutoSize = true;
+            this.labelDataCollectionLink.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             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, 6);
+            this.labelDataCollectionLink.Location = new System.Drawing.Point(153, 4);
-            this.labelDataCollectionLink.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
+            this.labelDataCollectionLink.Margin = new System.Windows.Forms.Padding(0);
             this.labelDataCollectionLink.Name = "labelDataCollectionLink";
-            this.labelDataCollectionLink.Size = new System.Drawing.Size(66, 17);
+            this.labelDataCollectionLink.Size = new System.Drawing.Size(71, 21);
             this.labelDataCollectionLink.TabIndex = 1;
             this.labelDataCollectionLink.TabStop = true;
             this.labelDataCollectionLink.Text = "(learn more)";
@@ -67,17 +68,19 @@
             // checkDataCollection
             // 
             this.checkDataCollection.AutoSize = true;
+            this.checkDataCollection.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.checkDataCollection.Location = new System.Drawing.Point(6, 6);
-            this.checkDataCollection.Margin = new System.Windows.Forms.Padding(6, 6, 0, 3);
+            this.checkDataCollection.Margin = new System.Windows.Forms.Padding(6, 6, 0, 2);
             this.checkDataCollection.Name = "checkDataCollection";
-            this.checkDataCollection.Size = new System.Drawing.Size(135, 17);
+            this.checkDataCollection.Size = new System.Drawing.Size(147, 19);
             this.checkDataCollection.TabIndex = 0;
             this.checkDataCollection.Text = "Send Anonymous Data";
             this.checkDataCollection.UseVisualStyleBackColor = true;
             // 
             // labelDataCollectionMessage
             // 
-            this.labelDataCollectionMessage.Location = new System.Drawing.Point(6, 135);
+            this.labelDataCollectionMessage.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelDataCollectionMessage.Location = new System.Drawing.Point(6, 143);
             this.labelDataCollectionMessage.Margin = new System.Windows.Forms.Padding(6);
             this.labelDataCollectionMessage.Name = "labelDataCollectionMessage";
             this.labelDataCollectionMessage.Size = new System.Drawing.Size(310, 67);
@@ -86,10 +89,12 @@
             // btnViewReport
             // 
             this.btnViewReport.AutoSize = true;
-            this.btnViewReport.Location = new System.Drawing.Point(5, 103);
+            this.btnViewReport.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnViewReport.Location = new System.Drawing.Point(5, 109);
             this.btnViewReport.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.btnViewReport.Name = "btnViewReport";
-            this.btnViewReport.Size = new System.Drawing.Size(144, 23);
+            this.btnViewReport.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.btnViewReport.Size = new System.Drawing.Size(155, 25);
             this.btnViewReport.TabIndex = 4;
             this.btnViewReport.Text = "View My Analytics Report";
             this.btnViewReport.UseVisualStyleBackColor = true;
@@ -97,11 +102,12 @@
             // btnSendFeedback
             // 
             this.btnSendFeedback.AutoSize = true;
+            this.btnSendFeedback.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.btnSendFeedback.Location = new System.Drawing.Point(5, 23);
             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.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.btnSendFeedback.Size = new System.Drawing.Size(164, 23);
+            this.btnSendFeedback.Size = new System.Drawing.Size(170, 25);
             this.btnSendFeedback.TabIndex = 1;
             this.btnSendFeedback.Text = "Send Feedback / Bug Report";
             this.btnSendFeedback.UseVisualStyleBackColor = true;
@@ -109,21 +115,22 @@
             // labelDataCollection
             // 
             this.labelDataCollection.AutoSize = true;
-            this.labelDataCollection.Location = new System.Drawing.Point(3, 61);
+            this.labelDataCollection.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelDataCollection.Location = new System.Drawing.Point(3, 63);
             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.Size = new System.Drawing.Size(88, 15);
             this.labelDataCollection.TabIndex = 2;
             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.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelFeedback.Location = new System.Drawing.Point(0, 0);
             this.labelFeedback.Margin = new System.Windows.Forms.Padding(0);
             this.labelFeedback.Name = "labelFeedback";
-            this.labelFeedback.Size = new System.Drawing.Size(80, 20);
+            this.labelFeedback.Size = new System.Drawing.Size(72, 20);
             this.labelFeedback.TabIndex = 0;
             this.labelFeedback.Text = "Feedback";
             // 
@@ -141,7 +148,7 @@
             this.flowPanel.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
             this.flowPanel.Location = new System.Drawing.Point(9, 9);
             this.flowPanel.Name = "flowPanel";
-            this.flowPanel.Size = new System.Drawing.Size(322, 209);
+            this.flowPanel.Size = new System.Drawing.Size(322, 212);
             this.flowPanel.TabIndex = 0;
             this.flowPanel.WrapContents = false;
             // 
@@ -151,7 +158,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.flowPanel);
             this.Name = "TabSettingsFeedback";
-            this.Size = new System.Drawing.Size(340, 227);
+            this.Size = new System.Drawing.Size(340, 230);
             this.panelDataCollection.ResumeLayout(false);
             this.panelDataCollection.PerformLayout();
             this.flowPanel.ResumeLayout(false);

Core/Other/Settings/TabSettingsGeneral.Designer.cs

@@ -54,10 +54,11 @@
             // checkExpandLinks
             // 
             this.checkExpandLinks.AutoSize = true;
+            this.checkExpandLinks.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.checkExpandLinks.Location = new System.Drawing.Point(6, 26);
-            this.checkExpandLinks.Margin = new System.Windows.Forms.Padding(6, 6, 3, 3);
+            this.checkExpandLinks.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
             this.checkExpandLinks.Name = "checkExpandLinks";
-            this.checkExpandLinks.Size = new System.Drawing.Size(166, 17);
+            this.checkExpandLinks.Size = new System.Drawing.Size(176, 19);
             this.checkExpandLinks.TabIndex = 1;
             this.checkExpandLinks.Text = "Expand Links When Hovered";
             this.checkExpandLinks.UseVisualStyleBackColor = true;
@@ -65,20 +66,24 @@
             // checkUpdateNotifications
             // 
             this.checkUpdateNotifications.AutoSize = true;
-            this.checkUpdateNotifications.Location = new System.Drawing.Point(6, 415);
+            this.checkUpdateNotifications.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.checkUpdateNotifications.Margin = new System.Windows.Forms.Padding(6, 6, 3, 3);
+            this.checkUpdateNotifications.Location = new System.Drawing.Point(6, 427);
+            this.checkUpdateNotifications.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
             this.checkUpdateNotifications.Name = "checkUpdateNotifications";
-            this.checkUpdateNotifications.Size = new System.Drawing.Size(165, 17);
+            this.checkUpdateNotifications.Size = new System.Drawing.Size(182, 19);
             this.checkUpdateNotifications.TabIndex = 15;
             this.checkUpdateNotifications.Text = "Check Updates Automatically";
             this.checkUpdateNotifications.UseVisualStyleBackColor = true;
             // 
             // btnCheckUpdates
             // 
-            this.btnCheckUpdates.Location = new System.Drawing.Point(5, 438);
+            this.btnCheckUpdates.AutoSize = true;
+            this.btnCheckUpdates.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnCheckUpdates.Location = new System.Drawing.Point(5, 451);
             this.btnCheckUpdates.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.btnCheckUpdates.Name = "btnCheckUpdates";
-            this.btnCheckUpdates.Size = new System.Drawing.Size(144, 23);
+            this.btnCheckUpdates.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
+            this.btnCheckUpdates.Size = new System.Drawing.Size(128, 25);
             this.btnCheckUpdates.TabIndex = 16;
             this.btnCheckUpdates.Text = "Check Updates Now";
             this.btnCheckUpdates.UseVisualStyleBackColor = true;
@@ -86,6 +91,7 @@
             // labelZoomValue
             // 
             this.labelZoomValue.BackColor = System.Drawing.Color.Transparent;
+            this.labelZoomValue.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelZoomValue.Location = new System.Drawing.Point(147, 4);
             this.labelZoomValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelZoomValue.Name = "labelZoomValue";
@@ -97,10 +103,11 @@
             // checkBestImageQuality
             // 
             this.checkBestImageQuality.AutoSize = true;
-            this.checkBestImageQuality.Location = new System.Drawing.Point(6, 95);
+            this.checkBestImageQuality.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.checkBestImageQuality.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
+            this.checkBestImageQuality.Location = new System.Drawing.Point(6, 98);
+            this.checkBestImageQuality.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkBestImageQuality.Name = "checkBestImageQuality";
-            this.checkBestImageQuality.Size = new System.Drawing.Size(114, 17);
+            this.checkBestImageQuality.Size = new System.Drawing.Size(125, 19);
             this.checkBestImageQuality.TabIndex = 4;
             this.checkBestImageQuality.Text = "Best Image Quality";
             this.checkBestImageQuality.UseVisualStyleBackColor = true;
@@ -108,10 +115,11 @@
             // checkOpenSearchInFirstColumn
             // 
             this.checkOpenSearchInFirstColumn.AutoSize = true;
-            this.checkOpenSearchInFirstColumn.Location = new System.Drawing.Point(6, 49);
+            this.checkOpenSearchInFirstColumn.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.checkOpenSearchInFirstColumn.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
+            this.checkOpenSearchInFirstColumn.Location = new System.Drawing.Point(6, 50);
+            this.checkOpenSearchInFirstColumn.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkOpenSearchInFirstColumn.Name = "checkOpenSearchInFirstColumn";
-            this.checkOpenSearchInFirstColumn.Size = new System.Drawing.Size(219, 17);
+            this.checkOpenSearchInFirstColumn.Size = new System.Drawing.Size(245, 19);
             this.checkOpenSearchInFirstColumn.TabIndex = 2;
             this.checkOpenSearchInFirstColumn.Text = "Add Search Columns Before First Column";
             this.checkOpenSearchInFirstColumn.UseVisualStyleBackColor = true;
@@ -134,10 +142,11 @@
             // labelZoom
             // 
             this.labelZoom.AutoSize = true;
-            this.labelZoom.Location = new System.Drawing.Point(3, 320);
+            this.labelZoom.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelZoom.Location = new System.Drawing.Point(3, 330);
             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.Size = new System.Drawing.Size(39, 15);
             this.labelZoom.TabIndex = 12;
             this.labelZoom.Text = "Zoom";
             // 
@@ -149,11 +158,11 @@
             // labelUI
             // 
             this.labelUI.AutoSize = true;
-            this.labelUI.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelUI.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelUI.Location = new System.Drawing.Point(0, 0);
             this.labelUI.Margin = new System.Windows.Forms.Padding(0);
             this.labelUI.Name = "labelUI";
-            this.labelUI.Size = new System.Drawing.Size(111, 20);
+            this.labelUI.Size = new System.Drawing.Size(100, 20);
             this.labelUI.TabIndex = 0;
             this.labelUI.Text = "User Interface";
             // 
@@ -162,7 +171,7 @@
             this.panelZoom.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.panelZoom.Controls.Add(this.trackBarZoom);
             this.panelZoom.Controls.Add(this.labelZoomValue);
-            this.panelZoom.Location = new System.Drawing.Point(0, 333);
+            this.panelZoom.Location = new System.Drawing.Point(0, 345);
             this.panelZoom.Margin = new System.Windows.Forms.Padding(0);
             this.panelZoom.Name = "panelZoom";
             this.panelZoom.Size = new System.Drawing.Size(322, 36);
@@ -171,10 +180,11 @@
             // checkAnimatedAvatars
             // 
             this.checkAnimatedAvatars.AutoSize = true;
-            this.checkAnimatedAvatars.Location = new System.Drawing.Point(6, 118);
+            this.checkAnimatedAvatars.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.checkAnimatedAvatars.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
+            this.checkAnimatedAvatars.Location = new System.Drawing.Point(6, 122);
+            this.checkAnimatedAvatars.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkAnimatedAvatars.Name = "checkAnimatedAvatars";
-            this.checkAnimatedAvatars.Size = new System.Drawing.Size(145, 17);
+            this.checkAnimatedAvatars.Size = new System.Drawing.Size(158, 19);
             this.checkAnimatedAvatars.TabIndex = 5;
             this.checkAnimatedAvatars.Text = "Enable Animated Avatars";
             this.checkAnimatedAvatars.UseVisualStyleBackColor = true;
@@ -182,11 +192,11 @@
             // 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.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelUpdates.Location = new System.Drawing.Point(0, 389);
+            this.labelUpdates.Location = new System.Drawing.Point(0, 401);
             this.labelUpdates.Margin = new System.Windows.Forms.Padding(0, 20, 0, 0);
             this.labelUpdates.Name = "labelUpdates";
-            this.labelUpdates.Size = new System.Drawing.Size(70, 20);
+            this.labelUpdates.Size = new System.Drawing.Size(64, 20);
             this.labelUpdates.TabIndex = 14;
             this.labelUpdates.Text = "Updates";
             // 
@@ -215,17 +225,18 @@
             this.flowPanel.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
             this.flowPanel.Location = new System.Drawing.Point(9, 9);
             this.flowPanel.Name = "flowPanel";
-            this.flowPanel.Size = new System.Drawing.Size(322, 462);
+            this.flowPanel.Size = new System.Drawing.Size(322, 486);
             this.flowPanel.TabIndex = 0;
             this.flowPanel.WrapContents = false;
             // 
             // checkKeepLikeFollowDialogsOpen
             // 
             this.checkKeepLikeFollowDialogsOpen.AutoSize = true;
-            this.checkKeepLikeFollowDialogsOpen.Location = new System.Drawing.Point(6, 72);
+            this.checkKeepLikeFollowDialogsOpen.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.checkKeepLikeFollowDialogsOpen.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
+            this.checkKeepLikeFollowDialogsOpen.Location = new System.Drawing.Point(6, 74);
+            this.checkKeepLikeFollowDialogsOpen.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkKeepLikeFollowDialogsOpen.Name = "checkKeepLikeFollowDialogsOpen";
-            this.checkKeepLikeFollowDialogsOpen.Size = new System.Drawing.Size(176, 17);
+            this.checkKeepLikeFollowDialogsOpen.Size = new System.Drawing.Size(190, 19);
             this.checkKeepLikeFollowDialogsOpen.TabIndex = 3;
             this.checkKeepLikeFollowDialogsOpen.Text = "Keep Like/Follow Dialogs Open";
             this.checkKeepLikeFollowDialogsOpen.UseVisualStyleBackColor = true;
@@ -233,21 +244,22 @@
             // labelBrowserSettings
             // 
             this.labelBrowserSettings.AutoSize = true;
-            this.labelBrowserSettings.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelBrowserSettings.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelBrowserSettings.Location = new System.Drawing.Point(0, 158);
+            this.labelBrowserSettings.Location = new System.Drawing.Point(0, 163);
             this.labelBrowserSettings.Margin = new System.Windows.Forms.Padding(0, 20, 0, 0);
             this.labelBrowserSettings.Name = "labelBrowserSettings";
-            this.labelBrowserSettings.Size = new System.Drawing.Size(130, 20);
+            this.labelBrowserSettings.Size = new System.Drawing.Size(119, 20);
             this.labelBrowserSettings.TabIndex = 6;
             this.labelBrowserSettings.Text = "Browser Settings";
             // 
             // checkSmoothScrolling
             // 
             this.checkSmoothScrolling.AutoSize = true;
-            this.checkSmoothScrolling.Location = new System.Drawing.Point(6, 184);
+            this.checkSmoothScrolling.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.checkSmoothScrolling.Margin = new System.Windows.Forms.Padding(6, 6, 3, 3);
+            this.checkSmoothScrolling.Location = new System.Drawing.Point(6, 189);
+            this.checkSmoothScrolling.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
             this.checkSmoothScrolling.Name = "checkSmoothScrolling";
-            this.checkSmoothScrolling.Size = new System.Drawing.Size(105, 17);
+            this.checkSmoothScrolling.Size = new System.Drawing.Size(117, 19);
             this.checkSmoothScrolling.TabIndex = 7;
             this.checkSmoothScrolling.Text = "Smooth Scrolling";
             this.checkSmoothScrolling.UseVisualStyleBackColor = true;
@@ -255,41 +267,45 @@
             // labelBrowserPath
             // 
             this.labelBrowserPath.AutoSize = true;
-            this.labelBrowserPath.Location = new System.Drawing.Point(3, 216);
+            this.labelBrowserPath.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelBrowserPath.Location = new System.Drawing.Point(3, 222);
             this.labelBrowserPath.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelBrowserPath.Name = "labelBrowserPath";
-            this.labelBrowserPath.Size = new System.Drawing.Size(95, 13);
+            this.labelBrowserPath.Size = new System.Drawing.Size(103, 15);
             this.labelBrowserPath.TabIndex = 8;
             this.labelBrowserPath.Text = "Open Links With...";
             // 
             // comboBoxBrowserPath
             // 
             this.comboBoxBrowserPath.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxBrowserPath.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.comboBoxBrowserPath.FormattingEnabled = true;
-            this.comboBoxBrowserPath.Location = new System.Drawing.Point(5, 232);
+            this.comboBoxBrowserPath.Location = new System.Drawing.Point(5, 240);
             this.comboBoxBrowserPath.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.comboBoxBrowserPath.Name = "comboBoxBrowserPath";
-            this.comboBoxBrowserPath.Size = new System.Drawing.Size(173, 21);
+            this.comboBoxBrowserPath.Size = new System.Drawing.Size(173, 23);
             this.comboBoxBrowserPath.TabIndex = 9;
             // 
             // labelSearchEngine
             // 
             this.labelSearchEngine.AutoSize = true;
-            this.labelSearchEngine.Location = new System.Drawing.Point(3, 268);
+            this.labelSearchEngine.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelSearchEngine.Location = new System.Drawing.Point(3, 276);
             this.labelSearchEngine.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelSearchEngine.Name = "labelSearchEngine";
-            this.labelSearchEngine.Size = new System.Drawing.Size(77, 13);
+            this.labelSearchEngine.Size = new System.Drawing.Size(81, 15);
             this.labelSearchEngine.TabIndex = 10;
             this.labelSearchEngine.Text = "Search Engine";
             // 
             // comboBoxSearchEngine
             // 
             this.comboBoxSearchEngine.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxSearchEngine.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.comboBoxSearchEngine.FormattingEnabled = true;
-            this.comboBoxSearchEngine.Location = new System.Drawing.Point(5, 284);
+            this.comboBoxSearchEngine.Location = new System.Drawing.Point(5, 294);
             this.comboBoxSearchEngine.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.comboBoxSearchEngine.Name = "comboBoxSearchEngine";
-            this.comboBoxSearchEngine.Size = new System.Drawing.Size(173, 21);
+            this.comboBoxSearchEngine.Size = new System.Drawing.Size(173, 23);
             this.comboBoxSearchEngine.TabIndex = 11;
             // 
             // TabSettingsGeneral
@@ -298,7 +314,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.flowPanel);
             this.Name = "TabSettingsGeneral";
-            this.Size = new System.Drawing.Size(340, 480);
+            this.Size = new System.Drawing.Size(340, 504);
             ((System.ComponentModel.ISupportInitialize)(this.trackBarZoom)).EndInit();
             this.panelZoom.ResumeLayout(false);
             this.flowPanel.ResumeLayout(false);

Core/Other/Settings/TabSettingsGeneral.cs

@@ -218,19 +218,17 @@ namespace TweetDuck.Core.Other.Settings{
         }
 
         private void updates_CheckFinished(object sender, UpdateCheckEventArgs e){
-            this.InvokeAsyncSafe(() => {
+            if (e.EventId == updateCheckEventId){
-                if (e.EventId == updateCheckEventId){
+                btnCheckUpdates.Enabled = true;
-                    btnCheckUpdates.Enabled = true;
 
-                    e.Result.Handle(update => {
+                e.Result.Handle(update => {
-                        if (!update.IsUpdateNew){
+                    if (update.VersionTag == Program.VersionTag){
-                            FormMessage.Information("No Updates Available", "Your version of TweetDuck is up to date.", FormMessage.OK);
+                        FormMessage.Information("No Updates Available", "Your version of TweetDuck is up to date.", FormMessage.OK);
-                        }
+                    }
-                    }, ex => {
+                }, ex => {
-                        Program.Reporter.HandleException("Update Check Error", "An error occurred while checking for updates.", true, ex);
+                    Program.Reporter.HandleException("Update Check Error", "An error occurred while checking for updates.", true, ex);
-                    });
+                });
-                }
+            }
-            });
         }
 
         private void zoomUpdateTimer_Tick(object sender, EventArgs e){

Core/Other/Settings/TabSettingsLocales.Designer.cs

@@ -39,10 +39,11 @@
             // checkSpellCheck
             // 
             this.checkSpellCheck.AutoSize = true;
+            this.checkSpellCheck.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.checkSpellCheck.Location = new System.Drawing.Point(6, 26);
-            this.checkSpellCheck.Margin = new System.Windows.Forms.Padding(6, 6, 3, 3);
+            this.checkSpellCheck.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
             this.checkSpellCheck.Name = "checkSpellCheck";
-            this.checkSpellCheck.Size = new System.Drawing.Size(119, 17);
+            this.checkSpellCheck.Size = new System.Drawing.Size(125, 19);
             this.checkSpellCheck.TabIndex = 1;
             this.checkSpellCheck.Text = "Enable Spell Check";
             this.checkSpellCheck.UseVisualStyleBackColor = true;
@@ -50,11 +51,11 @@
             // labelLocales
             // 
             this.labelLocales.AutoSize = true;
-            this.labelLocales.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelLocales.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelLocales.Location = new System.Drawing.Point(0, 0);
             this.labelLocales.Margin = new System.Windows.Forms.Padding(0);
             this.labelLocales.Name = "labelLocales";
-            this.labelLocales.Size = new System.Drawing.Size(64, 20);
+            this.labelLocales.Size = new System.Drawing.Size(58, 20);
             this.labelLocales.TabIndex = 0;
             this.labelLocales.Text = "Locales";
             // 
@@ -73,59 +74,63 @@
             this.flowPanel.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
             this.flowPanel.Location = new System.Drawing.Point(9, 9);
             this.flowPanel.Name = "flowPanel";
-            this.flowPanel.Size = new System.Drawing.Size(322, 193);
+            this.flowPanel.Size = new System.Drawing.Size(322, 201);
             this.flowPanel.TabIndex = 0;
             this.flowPanel.WrapContents = false;
             // 
             // labelSpellCheckLanguage
             // 
             this.labelSpellCheckLanguage.AutoSize = true;
-            this.labelSpellCheckLanguage.Location = new System.Drawing.Point(3, 58);
+            this.labelSpellCheckLanguage.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelSpellCheckLanguage.Location = new System.Drawing.Point(3, 59);
             this.labelSpellCheckLanguage.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelSpellCheckLanguage.Name = "labelSpellCheckLanguage";
-            this.labelSpellCheckLanguage.Size = new System.Drawing.Size(115, 13);
+            this.labelSpellCheckLanguage.Size = new System.Drawing.Size(123, 15);
             this.labelSpellCheckLanguage.TabIndex = 2;
             this.labelSpellCheckLanguage.Text = "Spell Check Language";
             // 
             // comboBoxSpellCheckLanguage
             // 
             this.comboBoxSpellCheckLanguage.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxSpellCheckLanguage.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.comboBoxSpellCheckLanguage.FormattingEnabled = true;
-            this.comboBoxSpellCheckLanguage.Location = new System.Drawing.Point(5, 74);
+            this.comboBoxSpellCheckLanguage.Location = new System.Drawing.Point(5, 77);
             this.comboBoxSpellCheckLanguage.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.comboBoxSpellCheckLanguage.Name = "comboBoxSpellCheckLanguage";
-            this.comboBoxSpellCheckLanguage.Size = new System.Drawing.Size(311, 21);
+            this.comboBoxSpellCheckLanguage.Size = new System.Drawing.Size(311, 23);
             this.comboBoxSpellCheckLanguage.TabIndex = 3;
             // 
             // labelTranslations
             // 
             this.labelTranslations.AutoSize = true;
-            this.labelTranslations.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelTranslations.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelTranslations.Location = new System.Drawing.Point(0, 118);
+            this.labelTranslations.Location = new System.Drawing.Point(0, 123);
             this.labelTranslations.Margin = new System.Windows.Forms.Padding(0, 20, 0, 0);
             this.labelTranslations.Name = "labelTranslations";
-            this.labelTranslations.Size = new System.Drawing.Size(116, 20);
+            this.labelTranslations.Size = new System.Drawing.Size(109, 20);
             this.labelTranslations.TabIndex = 4;
             this.labelTranslations.Text = "Bing Translator";
             // 
             // labelTranslationTarget
             // 
             this.labelTranslationTarget.AutoSize = true;
-            this.labelTranslationTarget.Location = new System.Drawing.Point(3, 150);
+            this.labelTranslationTarget.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelTranslationTarget.Location = new System.Drawing.Point(3, 155);
             this.labelTranslationTarget.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelTranslationTarget.Name = "labelTranslationTarget";
-            this.labelTranslationTarget.Size = new System.Drawing.Size(89, 13);
+            this.labelTranslationTarget.Size = new System.Drawing.Size(96, 15);
             this.labelTranslationTarget.TabIndex = 5;
             this.labelTranslationTarget.Text = "Target Language";
             // 
             // comboBoxTranslationTarget
             // 
             this.comboBoxTranslationTarget.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxTranslationTarget.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.comboBoxTranslationTarget.FormattingEnabled = true;
-            this.comboBoxTranslationTarget.Location = new System.Drawing.Point(5, 166);
+            this.comboBoxTranslationTarget.Location = new System.Drawing.Point(5, 173);
             this.comboBoxTranslationTarget.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.comboBoxTranslationTarget.Name = "comboBoxTranslationTarget";
-            this.comboBoxTranslationTarget.Size = new System.Drawing.Size(311, 21);
+            this.comboBoxTranslationTarget.Size = new System.Drawing.Size(311, 23);
             this.comboBoxTranslationTarget.TabIndex = 6;
             // 
             // TabSettingsLocales
@@ -134,7 +139,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.flowPanel);
             this.Name = "TabSettingsLocales";
-            this.Size = new System.Drawing.Size(340, 211);
+            this.Size = new System.Drawing.Size(340, 219);
             this.flowPanel.ResumeLayout(false);
             this.flowPanel.PerformLayout();
             this.ResumeLayout(false);

Core/Other/Settings/TabSettingsNotifications.Designer.cs

@@ -80,10 +80,11 @@
             // 
             // labelEdgeDistanceValue
             // 
+            this.labelEdgeDistanceValue.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelEdgeDistanceValue.Location = new System.Drawing.Point(145, 4);
             this.labelEdgeDistanceValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelEdgeDistanceValue.Name = "labelEdgeDistanceValue";
-            this.labelEdgeDistanceValue.Size = new System.Drawing.Size(40, 13);
+            this.labelEdgeDistanceValue.Size = new System.Drawing.Size(40, 15);
             this.labelEdgeDistanceValue.TabIndex = 1;
             this.labelEdgeDistanceValue.Text = "0 px";
             this.labelEdgeDistanceValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
@@ -91,39 +92,43 @@
             // labelDisplay
             // 
             this.labelDisplay.AutoSize = true;
-            this.labelDisplay.Location = new System.Drawing.Point(3, 451);
+            this.labelDisplay.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelDisplay.Location = new System.Drawing.Point(3, 465);
             this.labelDisplay.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelDisplay.Name = "labelDisplay";
-            this.labelDisplay.Size = new System.Drawing.Size(41, 13);
+            this.labelDisplay.Size = new System.Drawing.Size(45, 15);
             this.labelDisplay.TabIndex = 15;
             this.labelDisplay.Text = "Display";
             // 
             // comboBoxDisplay
             // 
             this.comboBoxDisplay.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxDisplay.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.comboBoxDisplay.FormattingEnabled = true;
-            this.comboBoxDisplay.Location = new System.Drawing.Point(5, 467);
+            this.comboBoxDisplay.Location = new System.Drawing.Point(5, 483);
             this.comboBoxDisplay.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.comboBoxDisplay.Name = "comboBoxDisplay";
-            this.comboBoxDisplay.Size = new System.Drawing.Size(144, 21);
+            this.comboBoxDisplay.Size = new System.Drawing.Size(144, 23);
             this.comboBoxDisplay.TabIndex = 16;
             // 
             // labelEdgeDistance
             // 
             this.labelEdgeDistance.AutoSize = true;
-            this.labelEdgeDistance.Location = new System.Drawing.Point(3, 503);
+            this.labelEdgeDistance.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelEdgeDistance.Location = new System.Drawing.Point(3, 521);
             this.labelEdgeDistance.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelEdgeDistance.Name = "labelEdgeDistance";
-            this.labelEdgeDistance.Size = new System.Drawing.Size(103, 13);
+            this.labelEdgeDistance.Size = new System.Drawing.Size(112, 15);
             this.labelEdgeDistance.TabIndex = 17;
             this.labelEdgeDistance.Text = "Distance From Edge";
             // 
             // radioLocCustom
             // 
+            this.radioLocCustom.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.radioLocCustom.Location = new System.Drawing.Point(205, 4);
             this.radioLocCustom.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
             this.radioLocCustom.Name = "radioLocCustom";
-            this.radioLocCustom.Size = new System.Drawing.Size(65, 41);
+            this.radioLocCustom.Size = new System.Drawing.Size(70, 43);
             this.radioLocCustom.TabIndex = 4;
             this.radioLocCustom.TabStop = true;
             this.radioLocCustom.Text = "Custom";
@@ -131,10 +136,11 @@
             // 
             // radioLocBR
             // 
+            this.radioLocBR.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.radioLocBR.Location = new System.Drawing.Point(105, 28);
             this.radioLocBR.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
             this.radioLocBR.Name = "radioLocBR";
-            this.radioLocBR.Size = new System.Drawing.Size(92, 17);
+            this.radioLocBR.Size = new System.Drawing.Size(92, 19);
             this.radioLocBR.TabIndex = 3;
             this.radioLocBR.TabStop = true;
             this.radioLocBR.Text = "Bottom Right";
@@ -142,10 +148,11 @@
             // 
             // radioLocBL
             // 
+            this.radioLocBL.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.radioLocBL.Location = new System.Drawing.Point(5, 28);
             this.radioLocBL.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
             this.radioLocBL.Name = "radioLocBL";
-            this.radioLocBL.Size = new System.Drawing.Size(92, 17);
+            this.radioLocBL.Size = new System.Drawing.Size(92, 19);
             this.radioLocBL.TabIndex = 2;
             this.radioLocBL.TabStop = true;
             this.radioLocBL.Text = "Bottom Left";
@@ -153,10 +160,11 @@
             // 
             // radioLocTR
             // 
+            this.radioLocTR.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.radioLocTR.Location = new System.Drawing.Point(105, 4);
             this.radioLocTR.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
             this.radioLocTR.Name = "radioLocTR";
-            this.radioLocTR.Size = new System.Drawing.Size(92, 17);
+            this.radioLocTR.Size = new System.Drawing.Size(92, 19);
             this.radioLocTR.TabIndex = 1;
             this.radioLocTR.TabStop = true;
             this.radioLocTR.Text = "Top Right";
@@ -164,10 +172,11 @@
             // 
             // radioLocTL
             // 
+            this.radioLocTL.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.radioLocTL.Location = new System.Drawing.Point(5, 4);
             this.radioLocTL.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
             this.radioLocTL.Name = "radioLocTL";
-            this.radioLocTL.Size = new System.Drawing.Size(92, 17);
+            this.radioLocTL.Size = new System.Drawing.Size(92, 19);
             this.radioLocTL.TabIndex = 0;
             this.radioLocTL.TabStop = true;
             this.radioLocTL.Text = "Top Left";
@@ -196,11 +205,11 @@
             this.tableLayoutDurationButtons.Controls.Add(this.btnDurationMedium, 0, 0);
             this.tableLayoutDurationButtons.Controls.Add(this.btnDurationLong, 1, 0);
             this.tableLayoutDurationButtons.Controls.Add(this.btnDurationShort, 0, 0);
-            this.tableLayoutDurationButtons.Location = new System.Drawing.Point(3, 320);
+            this.tableLayoutDurationButtons.Location = new System.Drawing.Point(3, 332);
             this.tableLayoutDurationButtons.Name = "tableLayoutDurationButtons";
             this.tableLayoutDurationButtons.RowCount = 1;
             this.tableLayoutDurationButtons.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
-            this.tableLayoutDurationButtons.Size = new System.Drawing.Size(171, 27);
+            this.tableLayoutDurationButtons.Size = new System.Drawing.Size(180, 27);
             this.tableLayoutDurationButtons.TabIndex = 12;
             // 
             // btnDurationMedium
@@ -210,10 +219,11 @@
             this.btnDurationMedium.FlatAppearance.MouseDownBackColor = System.Drawing.SystemColors.ControlLight;
             this.btnDurationMedium.FlatAppearance.MouseOverBackColor = System.Drawing.Color.White;
             this.btnDurationMedium.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnDurationMedium.Location = new System.Drawing.Point(55, 1);
+            this.btnDurationMedium.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnDurationMedium.Location = new System.Drawing.Point(58, 1);
             this.btnDurationMedium.Margin = new System.Windows.Forms.Padding(1);
             this.btnDurationMedium.Name = "btnDurationMedium";
-            this.btnDurationMedium.Size = new System.Drawing.Size(59, 25);
+            this.btnDurationMedium.Size = new System.Drawing.Size(62, 25);
             this.btnDurationMedium.TabIndex = 1;
             this.btnDurationMedium.Text = "Medium";
             this.btnDurationMedium.UseVisualStyleBackColor = true;
@@ -225,10 +235,11 @@
             this.btnDurationLong.FlatAppearance.MouseDownBackColor = System.Drawing.SystemColors.ControlLight;
             this.btnDurationLong.FlatAppearance.MouseOverBackColor = System.Drawing.Color.White;
             this.btnDurationLong.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
-            this.btnDurationLong.Location = new System.Drawing.Point(116, 1);
+            this.btnDurationLong.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnDurationLong.Location = new System.Drawing.Point(122, 1);
             this.btnDurationLong.Margin = new System.Windows.Forms.Padding(1);
             this.btnDurationLong.Name = "btnDurationLong";
-            this.btnDurationLong.Size = new System.Drawing.Size(54, 25);
+            this.btnDurationLong.Size = new System.Drawing.Size(57, 25);
             this.btnDurationLong.TabIndex = 2;
             this.btnDurationLong.Text = "Long";
             this.btnDurationLong.UseVisualStyleBackColor = true;
@@ -240,10 +251,11 @@
             this.btnDurationShort.FlatAppearance.MouseDownBackColor = System.Drawing.SystemColors.ControlLight;
             this.btnDurationShort.FlatAppearance.MouseOverBackColor = System.Drawing.Color.White;
             this.btnDurationShort.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnDurationShort.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.btnDurationShort.Location = new System.Drawing.Point(1, 1);
             this.btnDurationShort.Margin = new System.Windows.Forms.Padding(1);
             this.btnDurationShort.Name = "btnDurationShort";
-            this.btnDurationShort.Size = new System.Drawing.Size(52, 25);
+            this.btnDurationShort.Size = new System.Drawing.Size(55, 25);
             this.btnDurationShort.TabIndex = 0;
             this.btnDurationShort.Text = "Short";
             this.btnDurationShort.UseVisualStyleBackColor = true;
@@ -251,10 +263,11 @@
             // labelDurationValue
             // 
             this.labelDurationValue.BackColor = System.Drawing.Color.Transparent;
+            this.labelDurationValue.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelDurationValue.Location = new System.Drawing.Point(147, 4);
             this.labelDurationValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelDurationValue.Name = "labelDurationValue";
-            this.labelDurationValue.Size = new System.Drawing.Size(52, 13);
+            this.labelDurationValue.Size = new System.Drawing.Size(52, 15);
             this.labelDurationValue.TabIndex = 1;
             this.labelDurationValue.Text = "0 ms/c";
             this.labelDurationValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
@@ -274,10 +287,11 @@
             // checkSkipOnLinkClick
             // 
             this.checkSkipOnLinkClick.AutoSize = true;
-            this.checkSkipOnLinkClick.Location = new System.Drawing.Point(6, 72);
+            this.checkSkipOnLinkClick.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.checkSkipOnLinkClick.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
+            this.checkSkipOnLinkClick.Location = new System.Drawing.Point(6, 74);
+            this.checkSkipOnLinkClick.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkSkipOnLinkClick.Name = "checkSkipOnLinkClick";
-            this.checkSkipOnLinkClick.Size = new System.Drawing.Size(113, 17);
+            this.checkSkipOnLinkClick.Size = new System.Drawing.Size(121, 19);
             this.checkSkipOnLinkClick.TabIndex = 3;
             this.checkSkipOnLinkClick.Text = "Skip On Link Click";
             this.checkSkipOnLinkClick.UseVisualStyleBackColor = true;
@@ -285,10 +299,11 @@
             // checkColumnName
             // 
             this.checkColumnName.AutoSize = true;
+            this.checkColumnName.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.checkColumnName.Location = new System.Drawing.Point(6, 26);
-            this.checkColumnName.Margin = new System.Windows.Forms.Padding(6, 6, 3, 3);
+            this.checkColumnName.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
             this.checkColumnName.Name = "checkColumnName";
-            this.checkColumnName.Size = new System.Drawing.Size(129, 17);
+            this.checkColumnName.Size = new System.Drawing.Size(145, 19);
             this.checkColumnName.TabIndex = 1;
             this.checkColumnName.Text = "Display Column Name";
             this.checkColumnName.UseVisualStyleBackColor = true;
@@ -296,30 +311,33 @@
             // labelIdlePause
             // 
             this.labelIdlePause.AutoSize = true;
-            this.labelIdlePause.Location = new System.Drawing.Point(3, 127);
+            this.labelIdlePause.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelIdlePause.Location = new System.Drawing.Point(3, 131);
             this.labelIdlePause.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelIdlePause.Name = "labelIdlePause";
-            this.labelIdlePause.Size = new System.Drawing.Size(89, 13);
+            this.labelIdlePause.Size = new System.Drawing.Size(94, 15);
             this.labelIdlePause.TabIndex = 5;
             this.labelIdlePause.Text = "Pause When Idle";
             // 
             // comboBoxIdlePause
             // 
             this.comboBoxIdlePause.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxIdlePause.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.comboBoxIdlePause.FormattingEnabled = true;
-            this.comboBoxIdlePause.Location = new System.Drawing.Point(5, 143);
+            this.comboBoxIdlePause.Location = new System.Drawing.Point(5, 149);
             this.comboBoxIdlePause.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.comboBoxIdlePause.Name = "comboBoxIdlePause";
-            this.comboBoxIdlePause.Size = new System.Drawing.Size(144, 21);
+            this.comboBoxIdlePause.Size = new System.Drawing.Size(144, 23);
             this.comboBoxIdlePause.TabIndex = 6;
             // 
             // checkNonIntrusive
             // 
             this.checkNonIntrusive.AutoSize = true;
-            this.checkNonIntrusive.Location = new System.Drawing.Point(6, 95);
+            this.checkNonIntrusive.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.checkNonIntrusive.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
+            this.checkNonIntrusive.Location = new System.Drawing.Point(6, 98);
+            this.checkNonIntrusive.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkNonIntrusive.Name = "checkNonIntrusive";
-            this.checkNonIntrusive.Size = new System.Drawing.Size(128, 17);
+            this.checkNonIntrusive.Size = new System.Drawing.Size(142, 19);
             this.checkNonIntrusive.TabIndex = 4;
             this.checkNonIntrusive.Text = "Non-Intrusive Popups";
             this.checkNonIntrusive.UseVisualStyleBackColor = true;
@@ -327,10 +345,11 @@
             // checkTimerCountDown
             // 
             this.checkTimerCountDown.AutoSize = true;
-            this.checkTimerCountDown.Location = new System.Drawing.Point(6, 236);
+            this.checkTimerCountDown.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.checkTimerCountDown.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
+            this.checkTimerCountDown.Location = new System.Drawing.Point(6, 245);
+            this.checkTimerCountDown.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkTimerCountDown.Name = "checkTimerCountDown";
-            this.checkTimerCountDown.Size = new System.Drawing.Size(119, 17);
+            this.checkTimerCountDown.Size = new System.Drawing.Size(132, 19);
             this.checkTimerCountDown.TabIndex = 9;
             this.checkTimerCountDown.Text = "Timer Counts Down";
             this.checkTimerCountDown.UseVisualStyleBackColor = true;
@@ -338,20 +357,22 @@
             // checkNotificationTimer
             // 
             this.checkNotificationTimer.AutoSize = true;
-            this.checkNotificationTimer.Location = new System.Drawing.Point(6, 213);
+            this.checkNotificationTimer.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.checkNotificationTimer.Margin = new System.Windows.Forms.Padding(6, 6, 3, 3);
+            this.checkNotificationTimer.Location = new System.Drawing.Point(6, 221);
+            this.checkNotificationTimer.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
             this.checkNotificationTimer.Name = "checkNotificationTimer";
-            this.checkNotificationTimer.Size = new System.Drawing.Size(145, 17);
+            this.checkNotificationTimer.Size = new System.Drawing.Size(164, 19);
             this.checkNotificationTimer.TabIndex = 8;
             this.checkNotificationTimer.Text = "Display Notification Timer";
             this.checkNotificationTimer.UseVisualStyleBackColor = true;
             // 
             // radioSizeAuto
             // 
+            this.radioSizeAuto.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.radioSizeAuto.Location = new System.Drawing.Point(5, 4);
             this.radioSizeAuto.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
             this.radioSizeAuto.Name = "radioSizeAuto";
-            this.radioSizeAuto.Size = new System.Drawing.Size(92, 17);
+            this.radioSizeAuto.Size = new System.Drawing.Size(92, 19);
             this.radioSizeAuto.TabIndex = 0;
             this.radioSizeAuto.TabStop = true;
             this.radioSizeAuto.Text = "Auto";
@@ -359,10 +380,11 @@
             // 
             // radioSizeCustom
             // 
+            this.radioSizeCustom.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.radioSizeCustom.Location = new System.Drawing.Point(105, 4);
             this.radioSizeCustom.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
             this.radioSizeCustom.Name = "radioSizeCustom";
-            this.radioSizeCustom.Size = new System.Drawing.Size(92, 17);
+            this.radioSizeCustom.Size = new System.Drawing.Size(92, 19);
             this.radioSizeCustom.TabIndex = 1;
             this.radioSizeCustom.TabStop = true;
             this.radioSizeCustom.Text = "Custom";
@@ -371,11 +393,11 @@
             // labelGeneral
             // 
             this.labelGeneral.AutoSize = true;
-            this.labelGeneral.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelGeneral.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelGeneral.Location = new System.Drawing.Point(0, 0);
             this.labelGeneral.Margin = new System.Windows.Forms.Padding(0);
             this.labelGeneral.Name = "labelGeneral";
-            this.labelGeneral.Size = new System.Drawing.Size(66, 20);
+            this.labelGeneral.Size = new System.Drawing.Size(60, 20);
             this.labelGeneral.TabIndex = 0;
             this.labelGeneral.Text = "General";
             // 
@@ -384,7 +406,7 @@
             this.panelEdgeDistance.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.panelEdgeDistance.Controls.Add(this.trackBarEdgeDistance);
             this.panelEdgeDistance.Controls.Add(this.labelEdgeDistanceValue);
-            this.panelEdgeDistance.Location = new System.Drawing.Point(0, 516);
+            this.panelEdgeDistance.Location = new System.Drawing.Point(0, 536);
             this.panelEdgeDistance.Margin = new System.Windows.Forms.Padding(0);
             this.panelEdgeDistance.Name = "panelEdgeDistance";
             this.panelEdgeDistance.Size = new System.Drawing.Size(322, 36);
@@ -393,20 +415,22 @@
             // checkMediaPreviews
             // 
             this.checkMediaPreviews.AutoSize = true;
-            this.checkMediaPreviews.Location = new System.Drawing.Point(6, 49);
+            this.checkMediaPreviews.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.checkMediaPreviews.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
+            this.checkMediaPreviews.Location = new System.Drawing.Point(6, 50);
+            this.checkMediaPreviews.Margin = new System.Windows.Forms.Padding(6, 3, 3, 2);
             this.checkMediaPreviews.Name = "checkMediaPreviews";
-            this.checkMediaPreviews.Size = new System.Drawing.Size(131, 17);
+            this.checkMediaPreviews.Size = new System.Drawing.Size(140, 19);
             this.checkMediaPreviews.TabIndex = 2;
             this.checkMediaPreviews.Text = "Show Media Previews";
             this.checkMediaPreviews.UseVisualStyleBackColor = true;
             // 
             // labelScrollSpeedValue
             // 
+            this.labelScrollSpeedValue.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelScrollSpeedValue.Location = new System.Drawing.Point(145, 4);
             this.labelScrollSpeedValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelScrollSpeedValue.Name = "labelScrollSpeedValue";
-            this.labelScrollSpeedValue.Size = new System.Drawing.Size(38, 13);
+            this.labelScrollSpeedValue.Size = new System.Drawing.Size(38, 15);
             this.labelScrollSpeedValue.TabIndex = 1;
             this.labelScrollSpeedValue.Text = "100%";
             this.labelScrollSpeedValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
@@ -428,21 +452,22 @@
             // labelScrollSpeed
             // 
             this.labelScrollSpeed.AutoSize = true;
-            this.labelScrollSpeed.Location = new System.Drawing.Point(3, 629);
+            this.labelScrollSpeed.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelScrollSpeed.Location = new System.Drawing.Point(3, 651);
             this.labelScrollSpeed.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelScrollSpeed.Name = "labelScrollSpeed";
-            this.labelScrollSpeed.Size = new System.Drawing.Size(67, 13);
+            this.labelScrollSpeed.Size = new System.Drawing.Size(71, 15);
             this.labelScrollSpeed.TabIndex = 21;
             this.labelScrollSpeed.Text = "Scroll Speed";
             // 
             // labelLocation
             // 
             this.labelLocation.AutoSize = true;
-            this.labelLocation.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelLocation.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelLocation.Location = new System.Drawing.Point(0, 370);
+            this.labelLocation.Location = new System.Drawing.Point(0, 382);
             this.labelLocation.Margin = new System.Windows.Forms.Padding(0, 20, 0, 0);
             this.labelLocation.Name = "labelLocation";
-            this.labelLocation.Size = new System.Drawing.Size(70, 20);
+            this.labelLocation.Size = new System.Drawing.Size(66, 20);
             this.labelLocation.TabIndex = 13;
             this.labelLocation.Text = "Location";
             // 
@@ -454,10 +479,10 @@
             this.panelLocation.Controls.Add(this.radioLocBL);
             this.panelLocation.Controls.Add(this.radioLocCustom);
             this.panelLocation.Controls.Add(this.radioLocBR);
-            this.panelLocation.Location = new System.Drawing.Point(0, 390);
+            this.panelLocation.Location = new System.Drawing.Point(0, 402);
             this.panelLocation.Margin = new System.Windows.Forms.Padding(0);
             this.panelLocation.Name = "panelLocation";
-            this.panelLocation.Size = new System.Drawing.Size(322, 49);
+            this.panelLocation.Size = new System.Drawing.Size(322, 51);
             this.panelLocation.TabIndex = 14;
             // 
             // panelTimer
@@ -465,7 +490,7 @@
             this.panelTimer.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.panelTimer.Controls.Add(this.labelDurationValue);
             this.panelTimer.Controls.Add(this.trackBarDuration);
-            this.panelTimer.Location = new System.Drawing.Point(0, 281);
+            this.panelTimer.Location = new System.Drawing.Point(0, 293);
             this.panelTimer.Margin = new System.Windows.Forms.Padding(0);
             this.panelTimer.Name = "panelTimer";
             this.panelTimer.Size = new System.Drawing.Size(322, 36);
@@ -474,32 +499,33 @@
             // labelDuration
             // 
             this.labelDuration.AutoSize = true;
-            this.labelDuration.Location = new System.Drawing.Point(3, 268);
+            this.labelDuration.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelDuration.Location = new System.Drawing.Point(3, 278);
             this.labelDuration.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
             this.labelDuration.Name = "labelDuration";
-            this.labelDuration.Size = new System.Drawing.Size(47, 13);
+            this.labelDuration.Size = new System.Drawing.Size(53, 15);
             this.labelDuration.TabIndex = 10;
             this.labelDuration.Text = "Duration";
             // 
             // labelTimer
             // 
             this.labelTimer.AutoSize = true;
-            this.labelTimer.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelTimer.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelTimer.Location = new System.Drawing.Point(0, 187);
+            this.labelTimer.Location = new System.Drawing.Point(0, 195);
             this.labelTimer.Margin = new System.Windows.Forms.Padding(0, 20, 0, 0);
             this.labelTimer.Name = "labelTimer";
-            this.labelTimer.Size = new System.Drawing.Size(48, 20);
+            this.labelTimer.Size = new System.Drawing.Size(47, 20);
             this.labelTimer.TabIndex = 7;
             this.labelTimer.Text = "Timer";
             // 
             // labelSize
             // 
             this.labelSize.AutoSize = true;
-            this.labelSize.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelSize.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelSize.Location = new System.Drawing.Point(0, 572);
+            this.labelSize.Location = new System.Drawing.Point(0, 592);
             this.labelSize.Margin = new System.Windows.Forms.Padding(0, 20, 0, 0);
             this.labelSize.Name = "labelSize";
-            this.labelSize.Size = new System.Drawing.Size(40, 20);
+            this.labelSize.Size = new System.Drawing.Size(36, 20);
             this.labelSize.TabIndex = 19;
             this.labelSize.Text = "Size";
             // 
@@ -509,10 +535,10 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.panelSize.Controls.Add(this.radioSizeCustom);
             this.panelSize.Controls.Add(this.radioSizeAuto);
-            this.panelSize.Location = new System.Drawing.Point(0, 592);
+            this.panelSize.Location = new System.Drawing.Point(0, 612);
             this.panelSize.Margin = new System.Windows.Forms.Padding(0);
             this.panelSize.Name = "panelSize";
-            this.panelSize.Size = new System.Drawing.Size(322, 25);
+            this.panelSize.Size = new System.Drawing.Size(322, 27);
             this.panelSize.TabIndex = 20;
             // 
             // durationUpdateTimer
@@ -551,7 +577,7 @@
             this.flowPanel.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
             this.flowPanel.Location = new System.Drawing.Point(9, 9);
             this.flowPanel.Name = "flowPanel";
-            this.flowPanel.Size = new System.Drawing.Size(322, 678);
+            this.flowPanel.Size = new System.Drawing.Size(322, 698);
             this.flowPanel.TabIndex = 0;
             this.flowPanel.WrapContents = false;
             // 
@@ -560,7 +586,7 @@
             this.panelScrollSpeed.Anchor = System.Windows.Forms.AnchorStyles.Top;
             this.panelScrollSpeed.Controls.Add(this.trackBarScrollSpeed);
             this.panelScrollSpeed.Controls.Add(this.labelScrollSpeedValue);
-            this.panelScrollSpeed.Location = new System.Drawing.Point(0, 642);
+            this.panelScrollSpeed.Location = new System.Drawing.Point(0, 666);
             this.panelScrollSpeed.Margin = new System.Windows.Forms.Padding(0);
             this.panelScrollSpeed.Name = "panelScrollSpeed";
             this.panelScrollSpeed.Size = new System.Drawing.Size(322, 36);
@@ -572,7 +598,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.flowPanel);
             this.Name = "TabSettingsNotifications";
-            this.Size = new System.Drawing.Size(340, 697);
+            this.Size = new System.Drawing.Size(340, 717);
             this.ParentChanged += new System.EventHandler(this.TabSettingsNotifications_ParentChanged);
             ((System.ComponentModel.ISupportInitialize)(this.trackBarEdgeDistance)).EndInit();
             this.tableLayoutDurationButtons.ResumeLayout(false);

Core/Other/Settings/TabSettingsNotifications.cs

@@ -15,7 +15,7 @@ namespace TweetDuck.Core.Other.Settings{
 
             this.notification = notification;
             
-            this.notification.Initialized += (sender, args) => {
+            this.notification.Ready += (sender, args) => {
                 this.InvokeAsyncSafe(() => {
                     this.notification.ShowExampleNotification(true);
                     this.notification.Move += notification_Move;

Core/Other/Settings/TabSettingsSounds.Designer.cs

@@ -47,18 +47,20 @@
             // 
             this.tbCustomSound.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+            this.tbCustomSound.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.tbCustomSound.Location = new System.Drawing.Point(3, 3);
             this.tbCustomSound.Name = "tbCustomSound";
-            this.tbCustomSound.Size = new System.Drawing.Size(316, 20);
+            this.tbCustomSound.Size = new System.Drawing.Size(316, 23);
             this.tbCustomSound.TabIndex = 0;
             // 
             // labelVolumeValue
             // 
             this.labelVolumeValue.BackColor = System.Drawing.Color.Transparent;
+            this.labelVolumeValue.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelVolumeValue.Location = new System.Drawing.Point(147, 4);
             this.labelVolumeValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelVolumeValue.Name = "labelVolumeValue";
-            this.labelVolumeValue.Size = new System.Drawing.Size(38, 13);
+            this.labelVolumeValue.Size = new System.Drawing.Size(38, 15);
             this.labelVolumeValue.TabIndex = 1;
             this.labelVolumeValue.Text = "100%";
             this.labelVolumeValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
@@ -67,10 +69,11 @@
             // 
             this.btnPlaySound.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.btnPlaySound.AutoSize = true;
-            this.btnPlaySound.Location = new System.Drawing.Point(203, 29);
+            this.btnPlaySound.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnPlaySound.Location = new System.Drawing.Point(202, 32);
             this.btnPlaySound.Name = "btnPlaySound";
-            this.btnPlaySound.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.btnPlaySound.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.btnPlaySound.Size = new System.Drawing.Size(43, 23);
+            this.btnPlaySound.Size = new System.Drawing.Size(43, 25);
             this.btnPlaySound.TabIndex = 2;
             this.btnPlaySound.Text = "Play";
             this.btnPlaySound.UseVisualStyleBackColor = true;
@@ -78,10 +81,11 @@
             // btnResetSound
             // 
             this.btnResetSound.AutoSize = true;
-            this.btnResetSound.Location = new System.Drawing.Point(3, 29);
+            this.btnResetSound.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnResetSound.Location = new System.Drawing.Point(3, 32);
             this.btnResetSound.Name = "btnResetSound";
-            this.btnResetSound.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.btnResetSound.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.btnResetSound.Size = new System.Drawing.Size(51, 23);
+            this.btnResetSound.Size = new System.Drawing.Size(49, 25);
             this.btnResetSound.TabIndex = 3;
             this.btnResetSound.Text = "Reset";
             this.btnResetSound.UseVisualStyleBackColor = true;
@@ -90,10 +94,11 @@
             // 
             this.btnBrowseSound.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.btnBrowseSound.AutoSize = true;
-            this.btnBrowseSound.Location = new System.Drawing.Point(252, 29);
+            this.btnBrowseSound.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnBrowseSound.Location = new System.Drawing.Point(251, 32);
             this.btnBrowseSound.Name = "btnBrowseSound";
-            this.btnBrowseSound.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.btnBrowseSound.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.btnBrowseSound.Size = new System.Drawing.Size(67, 23);
+            this.btnBrowseSound.Size = new System.Drawing.Size(68, 25);
             this.btnBrowseSound.TabIndex = 1;
             this.btnBrowseSound.Text = "Browse...";
             this.btnBrowseSound.UseVisualStyleBackColor = true;
@@ -101,11 +106,11 @@
             // labelSoundNotification
             // 
             this.labelSoundNotification.AutoSize = true;
-            this.labelSoundNotification.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelSoundNotification.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelSoundNotification.Location = new System.Drawing.Point(0, 0);
             this.labelSoundNotification.Margin = new System.Windows.Forms.Padding(0);
             this.labelSoundNotification.Name = "labelSoundNotification";
-            this.labelSoundNotification.Size = new System.Drawing.Size(198, 20);
+            this.labelSoundNotification.Size = new System.Drawing.Size(188, 20);
             this.labelSoundNotification.TabIndex = 0;
             this.labelSoundNotification.Text = "Custom Sound Notification";
             // 
@@ -119,16 +124,17 @@
             this.panelSoundNotification.Location = new System.Drawing.Point(0, 20);
             this.panelSoundNotification.Margin = new System.Windows.Forms.Padding(0);
             this.panelSoundNotification.Name = "panelSoundNotification";
-            this.panelSoundNotification.Size = new System.Drawing.Size(322, 55);
+            this.panelSoundNotification.Size = new System.Drawing.Size(322, 59);
             this.panelSoundNotification.TabIndex = 1;
             // 
             // labelVolume
             // 
             this.labelVolume.AutoSize = true;
-            this.labelVolume.Location = new System.Drawing.Point(3, 87);
+            this.labelVolume.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelVolume.Location = new System.Drawing.Point(3, 91);
             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.Size = new System.Drawing.Size(48, 15);
             this.labelVolume.TabIndex = 2;
             this.labelVolume.Text = "Volume";
             // 
@@ -157,7 +163,7 @@
             this.flowPanel.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
             this.flowPanel.Location = new System.Drawing.Point(9, 9);
             this.flowPanel.Name = "flowPanel";
-            this.flowPanel.Size = new System.Drawing.Size(322, 136);
+            this.flowPanel.Size = new System.Drawing.Size(322, 142);
             this.flowPanel.TabIndex = 0;
             this.flowPanel.WrapContents = false;
             // 
@@ -165,7 +171,7 @@
             // 
             this.panelVolume.Controls.Add(this.trackBarVolume);
             this.panelVolume.Controls.Add(this.labelVolumeValue);
-            this.panelVolume.Location = new System.Drawing.Point(0, 100);
+            this.panelVolume.Location = new System.Drawing.Point(0, 106);
             this.panelVolume.Margin = new System.Windows.Forms.Padding(0);
             this.panelVolume.Name = "panelVolume";
             this.panelVolume.Size = new System.Drawing.Size(322, 36);
@@ -182,7 +188,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.flowPanel);
             this.Name = "TabSettingsSounds";
-            this.Size = new System.Drawing.Size(340, 154);
+            this.Size = new System.Drawing.Size(340, 160);
             this.panelSoundNotification.ResumeLayout(false);
             this.panelSoundNotification.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.trackBarVolume)).EndInit();

Core/Other/Settings/TabSettingsTray.Designer.cs

@@ -36,10 +36,11 @@
             // checkTrayHighlight
             // 
             this.checkTrayHighlight.AutoSize = true;
-            this.checkTrayHighlight.Location = new System.Drawing.Point(6, 77);
+            this.checkTrayHighlight.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.checkTrayHighlight.Margin = new System.Windows.Forms.Padding(6, 6, 3, 3);
+            this.checkTrayHighlight.Location = new System.Drawing.Point(6, 81);
+            this.checkTrayHighlight.Margin = new System.Windows.Forms.Padding(6, 6, 3, 2);
             this.checkTrayHighlight.Name = "checkTrayHighlight";
-            this.checkTrayHighlight.Size = new System.Drawing.Size(103, 17);
+            this.checkTrayHighlight.Size = new System.Drawing.Size(114, 19);
             this.checkTrayHighlight.TabIndex = 3;
             this.checkTrayHighlight.Text = "Enable Highlight";
             this.checkTrayHighlight.UseVisualStyleBackColor = true;
@@ -47,31 +48,33 @@
             // comboBoxTrayType
             // 
             this.comboBoxTrayType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.comboBoxTrayType.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.comboBoxTrayType.FormattingEnabled = true;
             this.comboBoxTrayType.Location = new System.Drawing.Point(5, 25);
             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.Size = new System.Drawing.Size(144, 23);
             this.comboBoxTrayType.TabIndex = 1;
             // 
             // labelTrayIcon
             // 
             this.labelTrayIcon.AutoSize = true;
-            this.labelTrayIcon.Location = new System.Drawing.Point(3, 58);
+            this.labelTrayIcon.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelTrayIcon.Location = new System.Drawing.Point(3, 60);
             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.Size = new System.Drawing.Size(56, 15);
             this.labelTrayIcon.TabIndex = 2;
             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.Font = new System.Drawing.Font("Segoe UI", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelTray.Location = new System.Drawing.Point(0, 0);
             this.labelTray.Margin = new System.Windows.Forms.Padding(0);
             this.labelTray.Name = "labelTray";
-            this.labelTray.Size = new System.Drawing.Size(96, 20);
+            this.labelTray.Size = new System.Drawing.Size(88, 20);
             this.labelTray.TabIndex = 0;
             this.labelTray.Text = "System Tray";
             // 
@@ -87,7 +90,7 @@
             this.flowPanel.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
             this.flowPanel.Location = new System.Drawing.Point(9, 9);
             this.flowPanel.Name = "flowPanel";
-            this.flowPanel.Size = new System.Drawing.Size(322, 97);
+            this.flowPanel.Size = new System.Drawing.Size(322, 102);
             this.flowPanel.TabIndex = 0;
             this.flowPanel.WrapContents = false;
             // 
@@ -97,7 +100,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.flowPanel);
             this.Name = "TabSettingsTray";
-            this.Size = new System.Drawing.Size(340, 115);
+            this.Size = new System.Drawing.Size(340, 120);
             this.flowPanel.ResumeLayout(false);
             this.flowPanel.PerformLayout();
             this.ResumeLayout(false);

Core/TweetDeckBrowser.cs

@@ -4,6 +4,7 @@ using System.Text;
 using System.Windows.Forms;
 using CefSharp;
 using CefSharp.WinForms;
+using TweetDuck.Configuration;
 using TweetDuck.Core.Bridge;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Handling;
@@ -154,6 +155,10 @@ namespace TweetDuck.Core{
 
                 TweetDeckBridge.ResetStaticProperties();
 
+                if (Arguments.HasFlag(Arguments.ArgIgnoreGDPR)){
+                    ScriptLoader.ExecuteScript(frame, @"TD.storage.Account.prototype.requiresConsent = function(){ return false; }", "gen:gdpr");
+                }
+
                 if (Program.UserConfig.FirstRun){
                     ScriptLoader.ExecuteFile(frame, "introduction.js", browser);
                 }

Core/Utils/BrowserUtils.cs

@@ -11,8 +11,9 @@ using TweetDuck.Data;
 
 namespace TweetDuck.Core.Utils{
     static class BrowserUtils{
-        public static string HeaderUserAgent => Program.BrandName+" "+Application.ProductVersion;
+        public static string UserAgentVanilla => Program.BrandName+" "+Application.ProductVersion;
-
+        public static string UserAgentChrome => "Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/"+Cef.ChromiumVersion+" Safari/537.36";
+        
         public static void SetupCefArgs(IDictionary<string, string> args){
             if (!Program.SystemConfig.HardwareAcceleration){
                 args["disable-gpu"] = "1";
@@ -167,7 +168,7 @@ namespace TweetDuck.Core.Utils{
             WindowsUtils.EnsureTLS12();
 
             WebClient client = new WebClient{ Proxy = null };
-            client.Headers[HttpRequestHeader.UserAgent] = HeaderUserAgent;
+            client.Headers[HttpRequestHeader.UserAgent] = UserAgentVanilla;
             return client;
         }
 

Core/Utils/NativeMethods.cs

@@ -71,6 +71,9 @@ namespace TweetDuck.Core.Utils{
         [return: MarshalAs(UnmanagedType.Bool)]
         private static extern bool BitBlt(IntPtr hdc, int nXDest, int nYDest, int nWidth, int nHeight, IntPtr hdcSrc, int nXSrc, int nYSrc, uint dwRop);
         
+        [DllImport("dwmapi.dll")]
+        public static extern int DwmIsCompositionEnabled(out bool enabled);
+        
         [DllImport("user32.dll")]
         [return: MarshalAs(UnmanagedType.Bool)]
         public static extern bool ShowScrollBar(IntPtr hWnd, int wBar, bool bShow);

Core/Utils/StringUtils.cs

@@ -19,6 +19,14 @@ namespace TweetDuck.Core.Utils{
             return Regex.Replace(str, @"(\p{Ll})(\P{Ll})|(\P{Ll})(\P{Ll}\p{Ll})", "$1$3_$2$4").ToUpper();
         }
 
+        public static string ConvertRot13(string str){
+            return Regex.Replace(str, @"[a-zA-Z]", match => {
+                int code = match.Value[0];
+                int start = code <= 90 ? 65 : 97;
+                return ((char)(start+(code-start+13)%26)).ToString();
+            });
+        }
+
         public static int CountOccurrences(string source, string substring){
             int count = 0, index = 0;
 

Core/Utils/WindowsUtils.cs

@@ -15,10 +15,12 @@ namespace TweetDuck.Core.Utils{
         private static readonly Lazy<Regex> RegexStripHtmlStyles = new Lazy<Regex>(() => new Regex(@"\s?(?:style|class)="".*?"""), false);
         private static readonly Lazy<Regex> RegexOffsetClipboardHtml = new Lazy<Regex>(() => new Regex(@"(?<=EndHTML:|EndFragment:)(\d+)"), false);
 
+        private static readonly bool IsWindows8OrNewer;
+        private static bool HasMicrosoftBeenBroughtTo2008Yet;
+
         public static int CurrentProcessID { get; }
         public static bool ShouldAvoidToolWindow { get; }
-        
+        public static bool IsAeroEnabled => IsWindows8OrNewer || (NativeMethods.DwmIsCompositionEnabled(out bool isCompositionEnabled) == 0 && isCompositionEnabled);
-        private static bool HasMicrosoftBeenBroughtTo2008Yet;
 
         static WindowsUtils(){
             using(Process me = Process.GetCurrentProcess()){
@@ -26,7 +28,9 @@ namespace TweetDuck.Core.Utils{
             }
 
             Version ver = Environment.OSVersion.Version;
-            ShouldAvoidToolWindow = ver.Major == 6 && ver.Minor == 2; // windows 8/10
+            IsWindows8OrNewer = ver.Major == 6 && ver.Minor == 2; // windows 8/10
+
+            ShouldAvoidToolWindow = IsWindows8OrNewer;
         }
         
         public static void EnsureTLS12(){

Plugins/Controls/PluginControl.Designer.cs

@@ -23,6 +23,7 @@
         /// the contents of this method with the code editor.
         /// </summary>
         private void InitializeComponent() {
+            this.components = new System.ComponentModel.Container();
             this.btnToggleState = new System.Windows.Forms.Button();
             this.labelName = new System.Windows.Forms.Label();
             this.panelDescription = new System.Windows.Forms.Panel();
@@ -33,6 +34,8 @@
             this.labelVersion = new System.Windows.Forms.Label();
             this.btnConfigure = new System.Windows.Forms.Button();
             this.labelType = new TweetDuck.Core.Controls.LabelVertical();
+            this.timerLayout = new System.Windows.Forms.Timer(this.components);
+            this.panelBorder = new System.Windows.Forms.Panel();
             this.panelDescription.SuspendLayout();
             this.flowLayoutInfo.SuspendLayout();
             this.SuspendLayout();
@@ -40,21 +43,24 @@
             // btnToggleState
             // 
             this.btnToggleState.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnToggleState.Location = new System.Drawing.Point(456, 80);
+            this.btnToggleState.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnToggleState.Location = new System.Drawing.Point(451, 59);
             this.btnToggleState.Name = "btnToggleState";
-            this.btnToggleState.Size = new System.Drawing.Size(65, 23);
+            this.btnToggleState.Size = new System.Drawing.Size(70, 23);
-            this.btnToggleState.TabIndex = 5;
+            this.btnToggleState.TabIndex = 6;
             this.btnToggleState.Text = "Disable";
             this.btnToggleState.UseVisualStyleBackColor = true;
             this.btnToggleState.Click += new System.EventHandler(this.btnToggleState_Click);
             // 
             // labelName
             // 
+            this.labelName.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.labelName.AutoSize = true;
-            this.labelName.Font = new System.Drawing.Font("Microsoft Sans Serif", 14.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelName.Font = new System.Drawing.Font("Segoe UI Semibold", 12F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelName.Location = new System.Drawing.Point(24, 7);
+            this.labelName.Location = new System.Drawing.Point(0, 0);
+            this.labelName.Margin = new System.Windows.Forms.Padding(0);
             this.labelName.Name = "labelName";
-            this.labelName.Size = new System.Drawing.Size(61, 24);
+            this.labelName.Size = new System.Drawing.Size(53, 21);
             this.labelName.TabIndex = 0;
             this.labelName.Text = "Name";
             this.labelName.UseMnemonic = false;
@@ -66,10 +72,11 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.panelDescription.AutoScroll = true;
             this.panelDescription.Controls.Add(this.labelDescription);
-            this.panelDescription.Location = new System.Drawing.Point(28, 35);
+            this.panelDescription.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.panelDescription.Location = new System.Drawing.Point(28, 33);
             this.panelDescription.Name = "panelDescription";
-            this.panelDescription.Size = new System.Drawing.Size(493, 39);
+            this.panelDescription.Size = new System.Drawing.Size(410, 47);
-            this.panelDescription.TabIndex = 2;
+            this.panelDescription.TabIndex = 4;
             this.panelDescription.Resize += new System.EventHandler(this.panelDescription_Resize);
             // 
             // labelDescription
@@ -80,44 +87,51 @@
             this.labelDescription.Location = new System.Drawing.Point(0, 0);
             this.labelDescription.Margin = new System.Windows.Forms.Padding(0);
             this.labelDescription.Name = "labelDescription";
-            this.labelDescription.Size = new System.Drawing.Size(13, 39);
+            this.labelDescription.Size = new System.Drawing.Size(14, 45);
             this.labelDescription.TabIndex = 0;
             this.labelDescription.Text = "a\r\nb\r\nc";
             this.labelDescription.UseMnemonic = false;
             // 
             // labelAuthor
             // 
+            this.labelAuthor.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.labelAuthor.AutoSize = true;
-            this.labelAuthor.Location = new System.Drawing.Point(3, 0);
+            this.labelAuthor.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelAuthor.Margin = new System.Windows.Forms.Padding(3, 0, 32, 0);
+            this.labelAuthor.Location = new System.Drawing.Point(53, 5);
+            this.labelAuthor.Margin = new System.Windows.Forms.Padding(0, 0, 0, 1);
             this.labelAuthor.Name = "labelAuthor";
-            this.labelAuthor.Size = new System.Drawing.Size(38, 13);
+            this.labelAuthor.Size = new System.Drawing.Size(44, 15);
-            this.labelAuthor.TabIndex = 0;
+            this.labelAuthor.TabIndex = 1;
             this.labelAuthor.Text = "Author";
             this.labelAuthor.UseMnemonic = false;
             // 
             // flowLayoutInfo
             // 
-            this.flowLayoutInfo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
+            this.flowLayoutInfo.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
+            this.flowLayoutInfo.Controls.Add(this.labelName);
             this.flowLayoutInfo.Controls.Add(this.labelAuthor);
             this.flowLayoutInfo.Controls.Add(this.labelWebsite);
-            this.flowLayoutInfo.Location = new System.Drawing.Point(28, 85);
+            this.flowLayoutInfo.Location = new System.Drawing.Point(24, 6);
+            this.flowLayoutInfo.Margin = new System.Windows.Forms.Padding(0);
             this.flowLayoutInfo.Name = "flowLayoutInfo";
-            this.flowLayoutInfo.Size = new System.Drawing.Size(348, 18);
+            this.flowLayoutInfo.Size = new System.Drawing.Size(414, 21);
-            this.flowLayoutInfo.TabIndex = 3;
+            this.flowLayoutInfo.TabIndex = 2;
             this.flowLayoutInfo.WrapContents = false;
             // 
             // labelWebsite
             // 
+            this.labelWebsite.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.labelWebsite.AutoEllipsis = true;
             this.labelWebsite.AutoSize = true;
             this.labelWebsite.Cursor = System.Windows.Forms.Cursors.Hand;
-            this.labelWebsite.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelWebsite.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Underline, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelWebsite.ForeColor = System.Drawing.Color.Blue;
-            this.labelWebsite.Location = new System.Drawing.Point(76, 0);
+            this.labelWebsite.Location = new System.Drawing.Point(100, 5);
+            this.labelWebsite.Margin = new System.Windows.Forms.Padding(3, 0, 0, 1);
             this.labelWebsite.Name = "labelWebsite";
-            this.labelWebsite.Size = new System.Drawing.Size(46, 13);
+            this.labelWebsite.Size = new System.Drawing.Size(49, 15);
-            this.labelWebsite.TabIndex = 1;
+            this.labelWebsite.TabIndex = 2;
             this.labelWebsite.Text = "Website";
             this.labelWebsite.UseMnemonic = false;
             this.labelWebsite.Click += new System.EventHandler(this.labelWebsite_Click);
@@ -126,22 +140,25 @@
             // 
             this.labelVersion.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-            this.labelVersion.Location = new System.Drawing.Point(14, 12);
+            this.labelVersion.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelVersion.Margin = new System.Windows.Forms.Padding(3, 9, 3, 0);
+            this.labelVersion.Location = new System.Drawing.Point(88, 6);
+            this.labelVersion.Margin = new System.Windows.Forms.Padding(0, 0, 1, 0);
             this.labelVersion.Name = "labelVersion";
-            this.labelVersion.Size = new System.Drawing.Size(510, 13);
+            this.labelVersion.Padding = new System.Windows.Forms.Padding(0, 0, 0, 3);
-            this.labelVersion.TabIndex = 1;
+            this.labelVersion.Size = new System.Drawing.Size(436, 21);
+            this.labelVersion.TabIndex = 3;
             this.labelVersion.Text = "Version";
-            this.labelVersion.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.labelVersion.TextAlign = System.Drawing.ContentAlignment.BottomRight;
             this.labelVersion.UseMnemonic = false;
             // 
             // btnConfigure
             // 
             this.btnConfigure.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnConfigure.Location = new System.Drawing.Point(382, 80);
+            this.btnConfigure.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnConfigure.Location = new System.Drawing.Point(451, 30);
             this.btnConfigure.Name = "btnConfigure";
-            this.btnConfigure.Size = new System.Drawing.Size(68, 23);
+            this.btnConfigure.Size = new System.Drawing.Size(70, 23);
-            this.btnConfigure.TabIndex = 4;
+            this.btnConfigure.TabIndex = 5;
             this.btnConfigure.Text = "Configure";
             this.btnConfigure.UseVisualStyleBackColor = true;
             this.btnConfigure.Click += new System.EventHandler(this.btnConfigure_Click);
@@ -152,12 +169,29 @@
             | System.Windows.Forms.AnchorStyles.Left)));
             this.labelType.BackColor = System.Drawing.Color.DarkGray;
             this.labelType.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelType.LineHeight = 0;
             this.labelType.Location = new System.Drawing.Point(0, 0);
             this.labelType.Name = "labelType";
-            this.labelType.Size = new System.Drawing.Size(18, 109);
+            this.labelType.Size = new System.Drawing.Size(18, 88);
-            this.labelType.TabIndex = 6;
+            this.labelType.TabIndex = 0;
             this.labelType.Text = "TYPE";
             // 
+            // timerLayout
+            // 
+            this.timerLayout.Interval = 1;
+            this.timerLayout.Tick += new System.EventHandler(this.timerLayout_Tick);
+            // 
+            // panelBorder
+            // 
+            this.panelBorder.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
+            this.panelBorder.BackColor = System.Drawing.Color.DimGray;
+            this.panelBorder.Location = new System.Drawing.Point(18, 0);
+            this.panelBorder.Margin = new System.Windows.Forms.Padding(0);
+            this.panelBorder.Name = "panelBorder";
+            this.panelBorder.Size = new System.Drawing.Size(1, 88);
+            this.panelBorder.TabIndex = 1;
+            // 
             // PluginControl
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -165,22 +199,20 @@
             this.Controls.Add(this.labelType);
             this.Controls.Add(this.btnConfigure);
             this.Controls.Add(this.flowLayoutInfo);
+            this.Controls.Add(this.panelBorder);
             this.Controls.Add(this.panelDescription);
-            this.Controls.Add(this.labelName);
             this.Controls.Add(this.btnToggleState);
             this.Controls.Add(this.labelVersion);
             this.Margin = new System.Windows.Forms.Padding(0);
-            this.MaximumSize = new System.Drawing.Size(65535, 109);
+            this.MaximumSize = new System.Drawing.Size(65535, 88);
-            this.MinimumSize = new System.Drawing.Size(0, 61);
             this.Name = "PluginControl";
             this.Padding = new System.Windows.Forms.Padding(3, 3, 6, 3);
-            this.Size = new System.Drawing.Size(530, 109);
+            this.Size = new System.Drawing.Size(530, 88);
             this.panelDescription.ResumeLayout(false);
             this.panelDescription.PerformLayout();
             this.flowLayoutInfo.ResumeLayout(false);
             this.flowLayoutInfo.PerformLayout();
             this.ResumeLayout(false);
-            this.PerformLayout();
 
         }
 
@@ -196,5 +228,7 @@
         private System.Windows.Forms.Label labelVersion;
         private System.Windows.Forms.Button btnConfigure;
         private Core.Controls.LabelVertical labelType;
+        private System.Windows.Forms.Timer timerLayout;
+        private System.Windows.Forms.Panel panelBorder;
     }
 }

Plugins/Controls/PluginControl.cs

@@ -9,8 +9,9 @@ namespace TweetDuck.Plugins.Controls{
     sealed partial class PluginControl : UserControl{
         private readonly PluginManager pluginManager;
         private readonly Plugin plugin;
-
+        private readonly bool isConfigurable;
-        private readonly float dpiScale;
+        
+        private int nextHeight;
 
         public PluginControl(){
             InitializeComponent();
@@ -20,32 +21,59 @@ namespace TweetDuck.Plugins.Controls{
             this.pluginManager = pluginManager;
             this.plugin = plugin;
 
-            this.dpiScale = this.GetDPIScale();
+            this.isConfigurable = pluginManager.IsPluginConfigurable(plugin);
 
-            this.labelName.Text = plugin.Name;
+            float dpiScale = this.GetDPIScale();
-            this.labelDescription.Text = plugin.CanRun ? plugin.Description : "This plugin requires TweetDuck "+plugin.RequiredVersion+" or newer.";
+
-            this.labelVersion.Text = plugin.Version;
+            if (dpiScale > 1F){
-            this.labelAuthor.Text = plugin.Author;
+                Size = MaximumSize = new Size(MaximumSize.Width, MaximumSize.Height+3);
-            this.labelWebsite.Text = plugin.Website;
+            }
             
-            this.labelType.LineHeight = BrowserUtils.Scale(9, dpiScale);
+            this.labelName.Text = plugin.Name;
+            this.labelDescription.Text = plugin.CanRun ? plugin.Description : $"This plugin requires TweetDuck {plugin.RequiredVersion} or newer.";
+            this.labelAuthor.Text = string.IsNullOrWhiteSpace(plugin.Author) ? string.Empty : $"by {plugin.Author}";
+            this.labelWebsite.Text = plugin.Website;
+            this.labelVersion.Text = plugin.Version;
+            
+            this.labelType.LineHeight = BrowserUtils.Scale(11, dpiScale);
 
             UpdatePluginState();
 
             if (labelDescription.Text.Length == 0){
                 labelDescription.Visible = false;
             }
-
+            
             panelDescription_Resize(panelDescription, EventArgs.Empty);
         }
 
+        private void timerLayout_Tick(object sender, EventArgs e){
+            timerLayout.Stop();
+            Height = nextHeight;
+            ResumeLayout();
+        }
+
         private void panelDescription_Resize(object sender, EventArgs e){
-            if (labelDescription.Text.Length == 0){
+            SuspendLayout();
-                Height = MinimumSize.Height;
+            
+            int maxWidth = panelDescription.Width-(panelDescription.VerticalScroll.Visible ? SystemInformation.VerticalScrollBarWidth : 0);
+            labelDescription.MaximumSize = new Size(maxWidth, int.MaxValue);
+
+            Font font = labelDescription.Font;
+            int descriptionLines = TextRenderer.MeasureText(labelDescription.Text, font, new Size(maxWidth, int.MaxValue), TextFormatFlags.WordBreak).Height/(font.Height-1);
+            
+            int requiredLines = Math.Max(descriptionLines, 1+(string.IsNullOrEmpty(labelVersion.Text) ? 0 : 1)+(isConfigurable ? 1 : 0));
+            
+            switch(requiredLines){
+                case 1: nextHeight = MaximumSize.Height-2*(font.Height-1); break;
+                case 2: nextHeight = MaximumSize.Height-(font.Height-1); break;
+                default: nextHeight = MaximumSize.Height; break;
+            }
+
+            if (nextHeight != Height){
+                timerLayout.Start();
             }
             else{
-                labelDescription.MaximumSize = new Size(panelDescription.Width-SystemInformation.VerticalScrollBarWidth, 0);
+                ResumeLayout();
-                Height = Math.Min(MinimumSize.Height+BrowserUtils.Scale(9, dpiScale)+labelDescription.Height, MaximumSize.Height);
             }
         }
 
@@ -74,11 +102,11 @@ namespace TweetDuck.Plugins.Controls{
             labelWebsite.ForeColor = isEnabled ? Color.Blue : Color.FromArgb(90, 90, 249);
 
             if (plugin.Group == PluginGroup.Official){
-                labelType.Text = "OFFICIAL";
+                labelType.Text = "CORE";
                 labelType.BackColor = isEnabled ? Color.FromArgb(154, 195, 217) : Color.FromArgb(185, 185, 185);
             }
             else{
-                labelType.Text = "CUSTOM";
+                labelType.Text = "USER";
                 labelType.BackColor = isEnabled ? Color.FromArgb(208, 154, 217) : Color.FromArgb(185, 185, 185);
             }
 
@@ -86,7 +114,8 @@ namespace TweetDuck.Plugins.Controls{
                 labelName.ForeColor = textColor;
                 labelDescription.ForeColor = textColor;
                 btnToggleState.Text = isEnabled ? "Disable" : "Enable";
-                btnConfigure.Visible = isEnabled && pluginManager.IsPluginConfigurable(plugin);
+                btnConfigure.Visible = isConfigurable;
+                btnConfigure.Enabled = isEnabled;
             }
             else{
                 labelName.ForeColor = Color.DarkRed;

Plugins/Controls/PluginListFlowLayout.cs

@@ -9,7 +9,10 @@ namespace TweetDuck.Plugins.Controls{
         }
 
         protected override void WndProc(ref Message m){
-            NativeMethods.ShowScrollBar(Handle, NativeMethods.SB_HORZ, false); // basically fuck the horizontal scrollbar very much
+            if (m.Msg == 0x85){ // WM_NCPAINT
+                NativeMethods.ShowScrollBar(Handle, NativeMethods.SB_HORZ, false); // basically fuck the horizontal scrollbar very much
+            }
+
             base.WndProc(ref m);
         }
     }

Plugins/Plugin.cs

@@ -4,7 +4,6 @@ using TweetDuck.Plugins.Enums;
 
 namespace TweetDuck.Plugins{
     sealed class Plugin{
-        private const string VersionWildcard = "*";
         private static readonly Version AppVersion = new Version(Program.VersionTag);
 
         public string Identifier { get; }
@@ -119,14 +118,14 @@ namespace TweetDuck.Plugins{
         public sealed class Builder{
             private static readonly Version DefaultRequiredVersion = new Version(0, 0, 0, 0);
 
-            public string Name             { get; private set; }
+            public string Name             { get; set; }
-            public string Description      { get; private set; } = string.Empty;
+            public string Description      { get; set; } = string.Empty;
-            public string Author           { get; private set; } = "(anonymous)";
+            public string Author           { get; set; } = "(anonymous)";
-            public string Version          { get; private set; } = "(unknown)";
+            public string Version          { get; set; } = string.Empty;
-            public string Website          { get; private set; } = string.Empty;
+            public string Website          { get; set; } = string.Empty;
-            public string ConfigFile       { get; private set; } = string.Empty;
+            public string ConfigFile       { get; set; } = string.Empty;
-            public string ConfigDefault    { get; private set; } = string.Empty;
+            public string ConfigDefault    { get; set; } = string.Empty;
-            public Version RequiredVersion { get; private set; } = DefaultRequiredVersion;
+            public Version RequiredVersion { get; set; } = DefaultRequiredVersion;
 
             public PluginEnvironment Environments { get; private set; } = PluginEnvironment.None;
 
@@ -142,36 +141,10 @@ namespace TweetDuck.Plugins{
                 this.identifier = group.GetIdentifierPrefix()+name;
             }
 
-            public void SetFromTag(string tag, string value){
-                switch(tag){
-                    case "NAME":          this.Name = value; break;
-                    case "DESCRIPTION":   this.Description = value; break;
-                    case "AUTHOR":        this.Author = value; break;
-                    case "VERSION":       this.Version = value; break;
-                    case "WEBSITE":       this.Website = value; break;
-                    case "CONFIGFILE":    this.ConfigFile = value; break;
-                    case "CONFIGDEFAULT": this.ConfigDefault = value; break;
-                    case "REQUIRES":      SetRequiredVersion(value); break;
-                    default: throw new FormatException("Invalid metadata tag: "+tag);
-                }
-            }
-
             public void AddEnvironment(PluginEnvironment environment){
                 this.Environments |= environment;
             }
 
-            private void SetRequiredVersion(string versionStr){
-                if (System.Version.TryParse(versionStr, out Version version)){
-                    this.RequiredVersion = version;
-                }
-                else if (versionStr == VersionWildcard){
-                    this.RequiredVersion = DefaultRequiredVersion;
-                }
-                else{
-                    throw new FormatException("Plugin contains invalid minimum version: "+versionStr);
-                }
-            }
-
             public Plugin BuildAndSetup(){
                 Plugin plugin = new Plugin(group, identifier, pathRoot, pathData, this);
 
@@ -183,6 +156,15 @@ namespace TweetDuck.Plugins{
                     throw new InvalidOperationException("Plugin has no script files");
                 }
 
+                if (plugin.Group == PluginGroup.Official){
+                    if (plugin.RequiredVersion != AppVersion){
+                        throw new InvalidOperationException("Plugin is not supported in this version of TweetDuck, this may indicate a failed update or an unsupported plugin that was not removed automatically");
+                    }
+                    else if (!string.IsNullOrEmpty(plugin.Version)){
+                        throw new InvalidOperationException("Official plugins cannot have a version identifier");
+                    }
+                }
+
                 // setup
 
                 string configPath = plugin.ConfigPath, defaultConfigPath = plugin.DefaultConfigPath;

Plugins/PluginLoader.cs

@@ -32,7 +32,7 @@ namespace TweetDuck.Plugins{
             foreach(string line in File.ReadAllLines(metaFile, Encoding.UTF8).Concat(EndTag).Select(line => line.TrimEnd()).Where(line => line.Length > 0)){
                 if (line[0] == '[' && line[line.Length-1] == ']'){
                     if (currentTag != null){
-                        builder.SetFromTag(currentTag, currentContents);
+                        SetProperty(builder, currentTag, currentContents);
                     }
 
                     currentTag = line.Substring(1, line.Length-2).ToUpper();
@@ -52,5 +52,19 @@ namespace TweetDuck.Plugins{
 
             return builder.BuildAndSetup();
         }
+
+        private static void SetProperty(Plugin.Builder builder, string tag, string value){
+            switch(tag){
+                case "NAME":          builder.Name = value; break;
+                case "DESCRIPTION":   builder.Description = value; break;
+                case "AUTHOR":        builder.Author = value; break;
+                case "VERSION":       builder.Version = value; break;
+                case "WEBSITE":       builder.Website = value; break;
+                case "CONFIGFILE":    builder.ConfigFile = value; break;
+                case "CONFIGDEFAULT": builder.ConfigDefault = value; break;
+                case "REQUIRES":      builder.RequiredVersion = Version.TryParse(value, out Version version) ? version : throw new FormatException("Invalid required minimum version: "+value); break;
+                default: throw new FormatException("Invalid metadata tag: "+tag);
+            }
+        }
     }
 }

Program.cs

@@ -13,25 +13,24 @@ using TweetDuck.Core.Other;
 using TweetDuck.Core.Management;
 using TweetDuck.Core.Utils;
 using TweetDuck.Data;
-using TweetDuck.Updates;
 
 namespace TweetDuck{
     static class Program{
         public const string BrandName = "TweetDuck";
         public const string Website = "https://tweetduck.chylex.com";
 
-        public const string VersionTag = "1.13.4";
+        public const string VersionTag = "1.14.2";
-
-        public static readonly bool IsPortable = File.Exists("makeportable");
 
         public static readonly string ProgramPath = AppDomain.CurrentDomain.BaseDirectory;
-        public static readonly string StoragePath = IsPortable ? Path.Combine(ProgramPath, "portable", "storage") : GetDataStoragePath();
+        public static readonly bool IsPortable = File.Exists(Path.Combine(ProgramPath, "makeportable"));
 
         public static readonly string ScriptPath = Path.Combine(ProgramPath, "scripts");
         public static readonly string PluginPath = Path.Combine(ProgramPath, "plugins");
 
+        public static readonly string StoragePath = IsPortable ? Path.Combine(ProgramPath, "portable", "storage") : GetDataStoragePath();
+
         public static readonly string PluginDataPath = Path.Combine(StoragePath, "TD_Plugins");
-        private static readonly string InstallerPath = Path.Combine(StoragePath, "TD_Updates");
+        public static readonly string InstallerPath = Path.Combine(StoragePath, "TD_Updates");
         private static readonly string CefDataPath = Path.Combine(StoragePath, "TD_Chromium");
 
         public static string UserConfigFilePath => Path.Combine(StoragePath, "TD_UserConfig.cfg");
@@ -134,7 +133,7 @@ namespace TweetDuck{
             CefSharpSettings.LegacyJavascriptBindingEnabled = true;
 
             CefSettings settings = new CefSettings{
-                UserAgent = BrowserUtils.HeaderUserAgent,
+                UserAgent = BrowserUtils.UserAgentChrome,
                 BrowserSubprocessPath = BrandName+".Browser.exe",
                 CachePath = StoragePath,
                 UserDataPath = CefDataPath,
@@ -143,27 +142,22 @@ namespace TweetDuck{
                 LogSeverity = Arguments.HasFlag(Arguments.ArgLogging) ? LogSeverity.Info : LogSeverity.Disable
                 #endif
             };
-
+            
             CommandLineArgs.ReadCefArguments(UserConfig.CustomCefArgs).ToDictionary(settings.CefCommandLineArgs);
             BrowserUtils.SetupCefArgs(settings.CefCommandLineArgs);
             
             Cef.Initialize(settings, false, new BrowserProcessHandler());
 
             Application.ApplicationExit += (sender, args) => ExitCleanup();
-
+            
-            UpdaterSettings updaterSettings = new UpdaterSettings(InstallerPath){
+            FormBrowser mainForm = new FormBrowser();
-                AllowPreReleases = Arguments.HasFlag(Arguments.ArgDebugUpdates),
-                DismissedUpdate = UserConfig.DismissedUpdate
-            };
-
-            FormBrowser mainForm = new FormBrowser(updaterSettings);
             Application.Run(mainForm);
 
             if (mainForm.UpdateInstallerPath != null){
                 ExitCleanup();
 
                 // ProgramPath has a trailing backslash
-                string updaterArgs = "/SP- /SILENT /CLOSEAPPLICATIONS /UPDATEPATH=\""+ProgramPath+"\" /RUNARGS=\""+Arguments.GetCurrentForInstallerCmd()+"\""+(IsPortable ? " /PORTABLE=1" : "");
+                string updaterArgs = "/SP- /SILENT /FORCECLOSEAPPLICATIONS /UPDATEPATH=\""+ProgramPath+"\" /RUNARGS=\""+Arguments.GetCurrentForInstallerCmd()+"\""+(IsPortable ? " /PORTABLE=1" : "");
                 bool runElevated = !IsPortable || !WindowsUtils.CheckFolderWritePermission(ProgramPath);
 
                 if (WindowsUtils.OpenAssociatedProgram(mainForm.UpdateInstallerPath, updaterArgs, runElevated)){

README.md

@@ -12,50 +12,44 @@ The program was built using Visual Studio 2017. Before opening the solution, ple
 * **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 this command in the **Package Manager Console**:
+After opening the solution, right-click the solution and select **Restore NuGet Packages**, or manually run this command in the **Package Manager Console**:
 ```
-PM> Install-Package CefSharp.WinForms -Version 64.0.0-CI2508 -Source https://www.myget.org/F/cefsharp/api/v3/index.json
+PM> Install-Package CefSharp.WinForms -Version 66.0.0-CI2629 -Source https://www.myget.org/F/cefsharp/api/v3/index.json
 ```
 
 Note that some pre-release builds of CefSharp are not available on NuGet. To correctly restore packages in that case, open **Package Manager Settings**, and add `https://www.myget.org/F/cefsharp/api/v3/index.json` to the list of package sources.
 
 ### Debug
 
-It is recommended to create a separate data folder for debugging, otherwise you will not be able to run TweetDuck while debugging the solution.
+The `Debug` configuration uses a separate data folder by default (`%LOCALAPPDATA%\TweetDuckDebug`) to avoid affecting an existing installation of TweetDuck. You can modify this by opening **TweetDuck Properties** in Visual Studio, clicking the **Debug** tab, and changing the **Command line arguments** field.
 
-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:
+While debugging, opening the main menu and clicking **Reload browser** automatically rebuilds all resources in the `Resources/Scripts` and `Resources/Plugins` folders. This allows editing HTML/CSS/JS files and applying the changes without restarting the program, but it will cause a short delay between browser reloads.
-```
--datafolder TweetDuckDebug
-```
 
-### Build
+### Release
 
-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, see the [Troubleshooting](#troubleshooting) section.
+Open **Batch Build**, tick all `Release` configurations with `x86` platform except for the `UnitTest` project, and click **Rebuild**. Check the status bar to make sure it says **Rebuild All succeeded**; if not, see the [Troubleshooting](#troubleshooting) section.
 
 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.
+The `Release` configuration omits debug symbols and other unnecessary files. You can modify this behavior by opening `TweetDuck.csproj`, and editing the `<Target Name="AfterBuild" Condition="$(ConfigurationName) == Release">` section.
+
+If you decide to publicly release a custom version, please make it clear that it is not an official release of TweetDuck. There are many references to the official website and this repository, especially in the update system, so search for `chylex.com` and `github.com` in all files and replace them appropriately.
 
 ### Troubleshooting
 
-There are a few quirks in the build process that may catch you off guard:
+#### Error: The command (...) exited with code 1
-
+- This indicates a failed post-build event, open the **Output** tab for logs
-- **Plugin files are not updated automatically**
+- Determine if there was an IO error from the `rmdir` commands, or whether the error was in the **PostBuild.ps1** script (`Encountered an error while running PostBuild.ps1 on line <xyz>`)
-  - Since official plugins (`Resources/Plugins`) are not included in the project, Visual Studio will not automatically detect changes in the files
+- Some files are checked for invalid characters:
-  - To ensure plugins are updated when testing the app, click **Rebuild Solution** before clicking **Start**
+  - `Resources/Plugins/emoji-keyboard/emoji-ordering.txt` line endings must be LF (line feed); any CR (carriage return) in the file will cause a failed build, and you will need to ensure correct line endings in your text editor
-- **Error: The command (...) exited with code 1**
-  - If the post-build event fails, open the **Output** tab and look for the cause
-  - Determine if there was an IO error while copying files or modifying folders, or whether the final .ps1 script failed (`Encountered an error while running PostBuild.ps1 on line xyz`)
-  - Some files are checked for invalid characters:
-    - `Resources/Plugins/emoji-keyboard/emoji-ordering.txt` line endings must be LF (line feed); any CR (carriage return) in the file will cause a failed build, and you will need to ensure correct line endings in your text editor
 
 ### 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).
+TweetDuck uses **Inno Setup** for installers and updates. First, download and install [InnoSetup QuickStart Pack](http://www.jrsoftware.org/isdl.php) (non-unicode; editor and encryption support not required) and the [Inno Download Plugin](https://code.google.com/archive/p/inno-download-plugin).
 
 Next, add the Inno Setup installation folder (usually `C:\Program Files (x86)\Inno Setup 5`) into your **PATH** environment variable. You may need to restart File Explorer 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!
+Now you can generate installers after a build by running `bld/RUN BUILD.bat`. Note that this will only package the files, you still need to run the [release build](#release) in Visual Studio!
 
 After the window closes, three installers will be generated inside the `bld/Output` folder:
 * **TweetDuck.exe**
@@ -67,8 +61,8 @@ After the window closes, three installers will be generated inside the `bld/Outp
   * 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.
+#### Notes
 
-### Code Notes
+> There is a small chance running `RUN BUILD.bat` immediately shows a resource error. If that happens, close the console window (which terminates all Inno Setup processes and leaves corrupted installers in the output folder), and run it again.
 
-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.
+> Running `RUN BUILD.bat` uses about 400 MB of RAM due to high compression. You can lower this to about 140 MB by opening `gen_full.iss` and `gen_port.iss`, and changing `LZMADictionarySize=15360` to `LZMADictionarySize=4096`.

Resources/Plugins/.debug/.meta

@@ -2,14 +2,18 @@
 Debug plugin
 
 [description]
-- Enables debug functionality and tests
+Enables debug functionality and tests.
-- Only included in debug configuration
+Text line 2.
+Text line 3.
+Text line 4.
+Text line 5.
+Text line 6.
 
 [author]
 chylex
 
 [version]
-1.1
+1.2
 
 [website]
 https://tweetduck.chylex.com

Resources/Plugins/.debug/browser.js

@@ -61,3 +61,7 @@ ready(){
 disabled(){
   $(document).off("keydown", this.onKeyDown);
 }
+
+configure(){
+  alert("Configure triggered");
+}

Resources/Plugins/clear-columns/.meta

@@ -1,18 +1,12 @@
 [name]
-Clear columns
+Clear column shortcuts
 
 [description]
-- Adds buttons and keyboard shortcuts to quickly clear columns
+Adds convenient buttons and keyboard shortcuts to clear/restore individual or all columns.
-- Hold Shift when clicking or using a keyboard shortcut to restore the column instead
+When enabled, the list of keyboard shortcuts is available in the [Settings] menu.
 
 [author]
 chylex
 
-[version]
-1.2
-
-[website]
-https://tweetduck.chylex.com
-
 [requires]
-1.4.1
+{version}

Resources/Plugins/clear-columns/browser.js

@@ -7,17 +7,12 @@ constructor(){
 enabled(){
   // prepare variables and functions
   var clearColumn = (columnName) => {
-    let col = TD.controller.columnManager.get(columnName);
+    TD.controller.columnManager.get(columnName).clear();
-    return if !col.isClearable();
-    
-    col.clear();
     TD.controller.stats.columnActionClick("clear");
   };
   
   var resetColumn = (columnName) => {
     let col = TD.controller.columnManager.get(columnName);
-    return if !col.isClearable();
-    
     col.model.setClearedTimestamp(0);
     col.reloadTweets();
   };
@@ -26,10 +21,6 @@ enabled(){
     Object.keys(TD.controller.columnManager.getAll()).forEach(func);
   };
   
-  var replaceMustache = (key, search, replace) => {
-    TD.mustaches[key] = TD.mustaches[key].replace(search, replace);
-  };
-  
   var wasShiftPressed = false;
   
   var updateShiftState = (pressed) => {
@@ -43,7 +34,7 @@ enabled(){
         $(document).off("mousemove", this.eventKeyUp);
       }
       
-      $("#clear-columns-btn-all-1,#clear-columns-btn-all-2").text(pressed ? "Restore columns" : "Clear columns");
+      $(".clear-columns-btn-all").text(pressed ? "Restore columns" : "Clear columns");
     }
   };
   
@@ -83,33 +74,37 @@ enabled(){
     }
   };
   
-  // add column buttons and keyboard shortcut info to UI
+  // setup clear all button
-  replaceMustache("column/column_header.mustache", "</header>", [
+  this.btnClearAllHTML = `
-    '{{^isTemporary}}',
+<a class="clear-columns-btn-all-parent js-header-action link-clean cf app-nav-link padding-h--10" data-title="Clear columns (hold Shift to restore)" data-action="td-clearcolumns-doall">
-    '<a class="column-header-link td-clear-column-shortcut" href="#" data-action="td-clearcolumns-dosingle" style="right:34px">',
+  <div class="obj-left margin-l--2"><i class="icon icon-medium icon-clear-timeline"></i></div>
-    '<i class="icon icon-clear-timeline js-show-tip" data-placement="bottom" data-original-title="Clear column (hold Shift to restore)"></i>',
+  <div class="clear-columns-btn-all nbfc padding-ts hide-condensed txt-size--16 app-nav-link-text">Clear columns</div>
-    '</a>',
+</a>`;
-    '{{/isTemporary}}',
-    '</header>'
-  ].join(""));
   
-  replaceMustache("keyboard_shortcut_list.mustache", "</dl>  <dl", [
+  // add column buttons and keyboard shortcut info to UI
-    '<dd class="keyboard-shortcut-definition" style="white-space:nowrap">',
+  window.TDPF_injectMustache("column/column_header.mustache", "prepend", "<a data-testid=\"optionsToggle\"", `
-    '<span class="text-like-keyboard-key">1</span> … <span class="text-like-keyboard-key">9</span> + <span class="text-like-keyboard-key">Del</span> Clear column 1－9',
+<a class="js-action-header-button column-header-link" href="#" data-action="td-clearcolumns-dosingle">
-    '</dd><dd class="keyboard-shortcut-definition">',
+  <i class="icon icon-clear-timeline js-show-tip" data-placement="bottom" data-original-title="Clear column (hold Shift to restore)"></i>
-    '<span class="text-like-keyboard-key">Alt</span> + <span class="text-like-keyboard-key">Del</span> Clear all columns',
+</a>`);
-    '</dd></dl><dl'
+  
-  ].join(""));
+  window.TDPF_injectMustache("keyboard_shortcut_list.mustache", "prepend", "</dl> <dl", `
+<dd class="keyboard-shortcut-definition" style="white-space:nowrap">
+  <span class="text-like-keyboard-key">1</span> … <span class="text-like-keyboard-key">9</span> + <span class="text-like-keyboard-key">Del</span> Clear column 1－9
+</dd><dd class="keyboard-shortcut-definition">
+  <span class="text-like-keyboard-key">Alt</span> + <span class="text-like-keyboard-key">Del</span> Clear all columns
+</dd>`);
+  
+  window.TDPF_injectMustache("menus/column_nav_menu.mustache", "replace", "{{_i}}Add column{{/i}}</div> </a> </div>", `{{_i}}Add column{{/i}}</div></a>${this.btnClearAllHTML}</div>`)
   
   // load custom style
   var css = window.TDPF_createCustomStyle(this);
-  css.insert(".js-app-add-column.is-hidden + #clear-columns-btn-all-parent-1 { display: none; }");
+  css.insert(".js-app-add-column.is-hidden + .clear-columns-btn-all-parent { display: none; }");
-  css.insert(".column-navigator-overflow #clear-columns-btn-all-parent-2 { display: none; }");
+  css.insert(".column-header-links { min-width: 51px !important; }");
-  css.insert(".column-title { margin-right: 60px !important; }");
+  css.insert("[data-td-icon='icon-message'] .column-header-links { min-width: 110px !important; }");
-  css.insert(".mark-all-read-link { right: 59px !important; }");
+  css.insert(".column-navigator-overflow .clear-columns-btn-all-parent { display: none !important; }");
-  css.insert(".open-compose-dm-link { right: 90px !important; }");
+  css.insert(".column-navigator-overflow { bottom: 224px !important; }");
-  css.insert("button[data-action='clear'].btn-options-tray { display: none !important; }");
+  css.insert("[data-action='td-clearcolumns-dosingle'] { padding: 3px 0 !important; }");
-  css.insert("[data-td-icon='icon-message'] .column-title { margin-right: 115px !important; }");
+  css.insert("[data-action='clear'].btn-options-tray { display: none !important; }");
   css.insert("[data-td-icon='icon-schedule'] .td-clear-column-shortcut { display: none; }");
   css.insert("[data-td-icon='icon-custom-timeline'] .td-clear-column-shortcut { display: none; }");
 }
@@ -121,23 +116,14 @@ ready(){
   $(document).on("keydown", this.eventKeyDown);
   $(document).on("keyup", this.eventKeyUp);
   
-  // add clear all button
+  // setup clear all button for nav overflow
-  const generateButton = (idParent, idButton) => {
+  $(".js-app-add-column").first().after(this.btnClearAllHTML);
-    return `
-<a id="${idParent}" class="js-header-action link-clean cf app-nav-link padding-h--10" data-title="Clear columns (hold Shift to restore)" data-action="td-clearcolumns-doall">
-  <div class="obj-left margin-l--2"><i class="icon icon-medium icon-clear-timeline"></i></div>
-  <div id="${idButton}" class="nbfc padding-ts hide-condensed txt-size--16 app-nav-link-text">Clear columns</div>
-</a>`;
-  };
-  
-  $(".js-app-add-column").first().after(generateButton("clear-columns-btn-all-parent-1", "clear-columns-btn-all-1"));
-  $(".js-column-nav-list").first().append(generateButton("clear-columns-btn-all-parent-2", "clear-columns-btn-all-2"));
   
   // setup tooltip handling
   var tooltipEvents = $._data($(".js-header-action")[0]).events;
   
   if (tooltipEvents.mouseover && tooltipEvents.mouseover.length && tooltipEvents.mouseout && tooltipEvents.mouseout.length){
-    $("#clear-columns-btn-all-parent-1,#clear-columns-btn-all-parent-2").on("mouseover", tooltipEvents.mouseover[0].handler).on("mouseout", tooltipEvents.mouseout[0].handler);
+    $(".clear-columns-btn-all-parent").on("mouseover", tooltipEvents.mouseover[0].handler).on("mouseout", tooltipEvents.mouseout[0].handler);
   }
 }
 

Resources/Plugins/edit-design/.meta

@@ -2,16 +2,10 @@
 Edit layout & design
 
 [description]
-- Adds new layout and design configuration, which can be accessed via Settings - Edit layout & design
+Expand the [Settings] menu and open [Edit layout & design] to customize how TweetDeck looks.
 
 [author]
 chylex
 
-[version]
-1.2.5
-
-[website]
-https://tweetduck.chylex.com
-
 [requires]
-1.10.2
+{version}

Resources/Plugins/edit-design/browser.js

@@ -21,6 +21,22 @@ enabled(){
     avatarRadius: 2
   };
   
+  var prepareDefaultConfig = () => {
+    this.defaultConfig._theme = TD.settings.getTheme();
+    
+    switch(TD.settings.getColumnWidth()){
+      case "wide": this.defaultConfig.columnWidth = "350px"; break;
+      case "narrow": this.defaultConfig.columnWidth = "270px"; break;
+    }
+    
+    switch(TD.settings.getFontSize()){
+      case "small": this.defaultConfig.fontSize = "13px"; break;
+      case "medium": this.defaultConfig.fontSize = "14px"; break;
+      case "large": this.defaultConfig.fontSize = "15px"; break;
+      case "largest": this.defaultConfig.fontSize = "16px"; break;
+    }
+  };
+  
   this.firstTimeLoad = null;
   
   var me = this;
@@ -45,6 +61,7 @@ enabled(){
     else if (this.tmpConfig !== null){
       let needsResave = !("_theme" in this.tmpConfig);
       
+      prepareDefaultConfig();
       this.config = $.extend(this.defaultConfig, this.tmpConfig);
       this.tmpConfig = null;
       this.reinjectAll();
@@ -62,28 +79,11 @@ enabled(){
     this.onStageReady();
   };
   
-  if (this.$$wasLoadedBefore){
+  if (TD.ready){
     this.onStageReady();
   }
   else{
-    $(document).one("dataSettingsValues", () => {
+    $(document).one("dataSettingsValues", () => this.onStageReady());
-      this.defaultConfig._theme = TD.settings.getTheme();
-      
-      switch(TD.settings.getColumnWidth()){
-        case "wide": this.defaultConfig.columnWidth = "350px"; break;
-        case "narrow": this.defaultConfig.columnWidth = "270px"; break;
-      }
-
-      switch(TD.settings.getFontSize()){
-        case "small": this.defaultConfig.fontSize = "13px"; break;
-        case "medium": this.defaultConfig.fontSize = "14px"; break;
-        case "large": this.defaultConfig.fontSize = "15px"; break;
-        case "largest": this.defaultConfig.fontSize = "16px"; break;
-      }
-      
-      this.$$wasLoadedBefore = true;
-      this.onStageReady();
-    });
   }
     
   $TDP.checkFileExists(this.$token, configFile).then(exists => {
@@ -536,10 +536,11 @@ ${iconData.map(entry => `#tduck .icon-${entry[0]}:before{content:\"\\f0${entry[1
 
 .drawer .btn .icon, .app-header .btn .icon { line-height: 1em !important }
 .app-search-fake .icon { margin-top: -3px !important }
+#tduck .js-docked-compose .js-drawer-close { margin: 20px 0 0 !important }
 #tduck .search-input-control .icon { font-size: 20px !important; top: -4px !important }
 
-.column-header .column-type-icon { bottom: 26px !important }
+.column-type-icon { margin-top: -1px !important }
-.is-options-open .column-type-icon { bottom: 25px !important }
+.inline-reply .pull-left .Button--link { margin-top: 3px !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; }

Resources/Plugins/edit-design/modal.html

@@ -151,8 +151,7 @@
       <!-- END -->
     </div>
     <footer class="padding-vxl txt-center">
-      <button class="js-dismiss btn btn-positive pull-right">
+      <button class="js-dismiss Button--primary pull-right">
-        <i class="icon icon-check icon-small padding-rs"></i>
         <span class="label">Done</span>
       </button>
     </footer>

Resources/Plugins/emoji-keyboard/.meta

@@ -1,18 +1,12 @@
 [name]
-Emoji keyboard
+Emoji picker
 
 [description]
-- Adds an emoji keyboard when writing tweets
+Adds a button that opens an emoji picker in the New Tweet panel.
-- Emoji list provided by http://unicode.org/emoji/charts/emoji-ordering.html
+Use :short_codes: to quickly add emoji when writing tweets.
 
 [author]
 chylex
 
-[version]
-1.4.4
-
-[website]
-https://tweetduck.chylex.com
-
 [requires]
-1.5.3
+{version}

Resources/Plugins/emoji-keyboard/browser.js

@@ -32,6 +32,7 @@ enabled(){
   
   this.css = window.TDPF_createCustomStyle(this);
   this.css.insert(".emoji-keyboard { position: absolute; width: 15.35em; background-color: white; border-radius: 1px; font-size: 24px; z-index: 9999 }");
+  this.css.insert(".emoji-keyboard-popup-btn { height: 36px !important }");
   this.css.insert(".emoji-keyboard-popup-btn .icon { vertical-align: -4px !important }");
   
   this.css.insert(".emoji-keyboard-list { height: 10.14em; padding: 0.1em; box-sizing: border-box; overflow-y: auto }");
@@ -53,7 +54,7 @@ enabled(){
   var buttonHTML = '<button class="needsclick btn btn-on-blue txt-left padding-v--6 padding-h--8 emoji-keyboard-popup-btn"><i class="icon icon-heart"></i></button>';
   
   this.prevComposeMustache = TD.mustaches["compose/docked_compose.mustache"];
-  TD.mustaches["compose/docked_compose.mustache"] = TD.mustaches["compose/docked_compose.mustache"].replace('<div class="cf margin-t--12 margin-b--30">', '<div class="cf margin-t--12 margin-b--30">'+buttonHTML);
+  window.TDPF_injectMustache("compose/docked_compose.mustache", "append", '<div class="cf margin-t--12 margin-b--30">', buttonHTML);
   
   var maybeDockedComposePanel = $(".js-docked-compose");
   

Resources/Plugins/reply-account/.meta

@@ -1,17 +1,11 @@
 [name]
-Custom reply account
+Customizable reply account
-
-[description]
-- Allows customizing the automatically selected reply account per column
 
 [author]
 chylex
 
-[version]
+[description]
-1.3
+Allows configuring which account is pre-selected for replies in each column.
-
-[website]
-https://tweetduck.chylex.com
 
 [configfile]
 configuration.js
@@ -20,4 +14,4 @@ configuration.js
 configuration.default.js
 
 [requires]
-1.10.3
+{version}

Resources/Plugins/reply-account/browser.js

@@ -23,25 +23,34 @@ enabled(){
           return;
         }
         
-        var section = data.element.closest("section.js-column");
+        let section = data.element.closest("section.js-column");
+        let column = TD.controller.columnManager.get(section.attr("data-column"));
         
-        var column = TD.controller.columnManager.get(section.attr("data-column"));
+        let feeds = column.getFeeds();
-        var header = $(".column-title", section);
+        let accountText = "";
-        var title = header.children(".column-head-title");
         
-        var columnTitle, columnAccount;
+        if (feeds.length === 1){
-        
+          let metadata = feeds[0].getMetadata();
-        if (title.length){
+          let id = metadata.ownerId || metadata.id;
-          columnTitle = title.text();
+          
-          columnAccount = header.children(".attribution").text();
+          if (id){
-        }
+            accountText = TD.cache.names.getScreenName(id);
-        else{
+          }
-          columnTitle = header.children(".column-title-edit-box").val();
+          else{
-          columnAccount = "";
+            let account = TD.storage.accountController.get(feeds[0].getAccountKey());
+            
+            if (account){
+              accountText = "@"+account.getUsername();
+            }
+          }
         }
         
+        let header = $(".column-header-title", section);
+        let title = header.children(".column-heading");
+        let titleText = title.length ? title.text() : header.children(".column-title-edit-box").val();
+        
         try{
-          query = configuration.customSelector(columnTitle, columnAccount, column, section.hasClass("column-temp"));
+          query = configuration.customSelector(titleText, accountText, column, section.hasClass("column-temp"));
         }catch(e){
           $TD.alert("warning", "Plugin reply-account has invalid configuration: customSelector threw an error: "+e.message);
           return;

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

@@ -30,19 +30,12 @@
    *   https://tweetduck.chylex.com/guide/#dev-tools
    *
    *
-   * In order to check the column type, use the 'column.isOfType' function. It is recommended to always put it
+   * In order to check the column type, use the 'window.TDPF_getColumnName(column)' function. List of available names:
-   * last in an 'if' statement, because it is much more demanding than checking the title/account.
+   *   Home, Mentions, Messages, Notifications, Followers, Activity, Likes,
+   *   User, Search, List, Timeline, Dataminr, Live video, Scheduled
    *
-   * Here is the full list of column types, note that some are unused and have misleading names.
+   * If you want to see your current column types, run the following code in your browser console:
-   * (for example, Home columns are 'col_timeline' instead of 'col_home')
+   *   TD.controller.columnManager.getAllOrdered().map(window.TDPF_getColumnName)
-   *
-   *   col_activity, col_customtimeline, col_dataminr, col_favorites, col_followers,  col_home,
-   *   col_inbox,    col_interactions,   col_list,     col_livevideo, col_me,         col_mentions,
-   *   col_messages, col_scheduled,      col_search,   col_timeline,  col_usertweets, col_unknown
-   *
-   * If you want to see your current column types, run this in your browser console:
-   *
-   *   (c=>c.columnManager.getAllOrdered().map(o=>Object.keys(c.stats.columnNamespaces).find(t=>o.isOfType(t))).map(t=>t==""+void 0?"col_unknown":t))(TD.controller)
    *
    *
    * The 'title' parameter is the column title. Some are fixed (such as 'Home' or 'Notifications'),
@@ -60,7 +53,7 @@
    *
    *
    * 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.
+   * for example when clicking on a user and viewing their tweets in a modal dialog.
    *
    */
   
@@ -69,13 +62,13 @@
   customSelector: function(title, account, column, isTemporary){
     console.info(arguments); // Prints all arguments into the console
     
-    if (title === "TweetDuck" && column.isOfType("col_search")){
+    if (title === "TweetDuck" && window.TDPF_getColumnName(column) === "Search"){
       // 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
       return "@TryTweetDuck";
     }
-    else if (account === "@chylexcz" && column.isOfType("col_timeline")){
+    else if (account === "@chylexcz" && window.TDPF_getColumnName(column) === "Home"){
       // This is a Home column of my test account @chylexcz,
       // but I want to reply to tweets from my official account
       return "@chylexmc";

Resources/Plugins/templates/.meta

@@ -1,17 +1,11 @@
 [name]
-Templates
+Tweet templates
 
 [description]
-- Adds a templating system for tweets
+Adds a [Manage templates] button to the New Tweet panel.
 
 [author]
 chylex
 
-[version]
-1.0.4
-
-[website]
-https://tweetduck.chylex.com
-
 [requires]
-1.5.3
+{version}

Resources/Plugins/templates/browser.js

@@ -37,7 +37,7 @@ enabled(){
   var buttonHTML = '<button class="manage-templates-btn needsclick btn btn-on-blue full-width txt-left margin-b--12 padding-v--6 padding-h--12"><i class="icon icon-bookmark"></i><span class="label padding-ls">Manage templates</span></button>';
   
   this.prevComposeMustache = TD.mustaches["compose/docked_compose.mustache"];
-  TD.mustaches["compose/docked_compose.mustache"] = TD.mustaches["compose/docked_compose.mustache"].replace('<div class="js-tweet-type-button">', buttonHTML+'<div class="js-tweet-type-button">');
+  window.TDPF_injectMustache("compose/docked_compose.mustache", "prepend", '<div class="js-tweet-type-button">', buttonHTML);
   
   var dockedComposePanel = $(".js-docked-compose");
   
@@ -267,8 +267,8 @@ enabled(){
       <ul></ul>
       
       <div class="templates-modal-bottom">
-        <button data-action="close" class="btn"><i class="icon icon-close icon-small padding-rs"></i><span class="label">Close</span></button>
+        <button data-action="close" class="Button--secondary"><i class="icon icon-close icon-small padding-rs"></i><span class="label">Close</span></button>
-        <button data-action="new-template" class="btn btn-positive"><i class="icon icon-plus icon-small padding-rs"></i><span class="label">New Template</span></button>
+        <button data-action="new-template" class="Button--primary"><i class="icon icon-plus icon-small padding-rs"></i><span class="label">New Template</span></button>
       </div>
     </div>
 
@@ -300,8 +300,8 @@ enabled(){
       </div>
       
       <div class="templates-modal-bottom">
-        <button data-action="editor-cancel" class="btn"><i class="icon icon-close icon-small padding-rs"></i><span class="label">Cancel</span></button>
+        <button data-action="editor-cancel" class="Button--secondary"><i class="icon icon-close icon-small padding-rs"></i><span class="label">Cancel</span></button>
-        <button data-action="editor-confirm" class="btn btn-positive" style="margin-left:4px"><i class="icon icon-check icon-small padding-rs"></i><span class="label">Confirm</span></button>
+        <button data-action="editor-confirm" class="Button--primary" style="margin-left:4px"><i class="icon icon-check icon-small padding-rs"></i><span class="label">Confirm</span></button>
       </div>
     </div>
   </div>

Resources/Plugins/timeline-polls/.meta

@@ -1,17 +1,11 @@
 [name]
-Polls in timelines
+Show poll results
 
 [description]
-- Adds poll results into timelines and quoted tweets
+Displays poll results directly in timelines and notifications.
 
 [author]
 chylex
 
-[version]
-1.1
-
-[website]
-https://tweetduck.chylex.com
-
 [requires]
-1.7
+{version}

Resources/PostBuild.ps1

@@ -1,13 +1,15 @@
 Param(
   [Parameter(Mandatory = $True, Position = 1)][string] $targetDir,
   [Parameter(Mandatory = $True, Position = 2)][string] $projectDir,
-  [Parameter(Position = 3)][string] $version = ""
+  [Parameter(Position = 3)][string] $configuration = "Release",
+  [Parameter(Position = 4)][string] $version = ""
 )
 
 $ErrorActionPreference = "Stop"
 
 try{
-  Write-Host "------------------------------"
+  $sw = [Diagnostics.Stopwatch]::StartNew()
+  Write-Host "--------------------------"
   
   if ($version.Equals("")){
     $version = (Get-Item (Join-Path $targetDir "TweetDuck.exe")).VersionInfo.FileVersion
@@ -15,7 +17,7 @@ try{
   
   Write-Host "TweetDuck version" $version
   
-  Write-Host "------------------------------"
+  Write-Host "--------------------------"
   
   # Cleanup
   
@@ -25,74 +27,99 @@ try{
   
   # Copy resources
   
-  Copy-Item (Join-Path $projectDir "bld\Resources\CEFSHARP-LICENSE.txt") -Destination $targetDir -Force
+  Copy-Item (Join-Path $projectDir "bld\Resources\LICENSES.txt") -Destination $targetDir -Force
-  Copy-Item (Join-Path $projectDir "LICENSE.md") -Destination (Join-Path $targetDir "LICENSE.txt") -Force      
   
   New-Item -ItemType directory -Path $targetDir -Name "scripts" | Out-Null
   New-Item -ItemType directory -Path $targetDir -Name "plugins" | Out-Null
   New-Item -ItemType directory -Path $targetDir -Name "plugins\official" | Out-Null
   New-Item -ItemType directory -Path $targetDir -Name "plugins\user" | Out-Null
   
-  Copy-Item (Join-Path $projectDir "Resources\Scripts\*") -Destination (Join-Path $targetDir "scripts") -Recurse
+  Copy-Item (Join-Path $projectDir "Resources\Scripts\*") -Recurse -Destination (Join-Path $targetDir "scripts")
-  Copy-Item (Join-Path $projectDir "Resources\Plugins\*") -Exclude ".debug", "emoji-instructions.txt" -Destination (Join-Path $targetDir "plugins\official") -Recurse
+  Copy-Item (Join-Path $projectDir "Resources\Plugins\*") -Recurse -Destination (Join-Path $targetDir "plugins\official") -Exclude ".debug", "emoji-instructions.txt" 
   
-  # Post processing
+  if ($configuration -eq "Debug"){
+    New-Item -ItemType directory -Path $targetDir -Name "plugins\user\.debug" | Out-Null
+    Copy-Item (Join-Path $projectDir "Resources\Plugins\.debug\*") -Recurse -Destination (Join-Path $targetDir "plugins\user\.debug")
+  }
+  
+  # Helper functions
+  
+  function Remove-Empty-Lines{
+    Param([Parameter(Mandatory = $True, Position = 1)] $lines)
+    
+    ForEach($line in $lines){
+      if ($line -ne ''){
+        $line
+      }
+    }
+  }
   
   function Check-Carriage-Return{
-    Param(
+    Param([Parameter(Mandatory = $True, Position = 1)] $file)
-      [Parameter(Mandatory = $True, Position = 1)] $fname
-    )
     
-    $file = @(Get-ChildItem -Path $targetDir -Include $fname -Recurse)[0]
+    if (!(Test-Path $file)){
-    
+      Throw "$file does not exist"
-    if ((Get-Content -Path $file.FullName -Raw).Contains("`r")){
-      Throw "$fname cannot contain carriage return"
     }
     
-    Write-Host "Verified" $file.FullName.Substring($targetDir.Length)
+    if ((Get-Content -Path $file -Raw).Contains("`r")){
+      Throw "$file cannot contain carriage return"
+    }
+    
+    Write-Host "Verified" $file.Substring($targetDir.Length)
   }
   
   function Rewrite-File{
-    [CmdletBinding()]
+    Param([Parameter(Mandatory = $True, Position = 1)] $file,
-    Param(
+          [Parameter(Mandatory = $True, Position = 2)] $lines)
-      [Parameter(Mandatory = $True, ValueFromPipeline = $True)][array] $lines,
-      [Parameter(Mandatory = $True, Position = 1)] $file
-    )
     
+    $lines = Remove-Empty-Lines($lines)
     $relativePath = $file.FullName.Substring($targetDir.Length)
     
     if ($relativePath.StartsWith("scripts\")){
       $lines = (,("#" + $version) + $lines)
     }
     
-    $lines | Where { $_ -ne '' } | Set-Content -Path $file.FullName
+    [IO.File]::WriteAllLines($file.FullName, $lines)
     Write-Host "Processed" $relativePath
   }
   
-  Check-Carriage-Return("emoji-ordering.txt")
+  # Post processing
-
+  
+  Check-Carriage-Return(Join-Path $targetDir "plugins\official\emoji-keyboard\emoji-ordering.txt")
+  
   ForEach($file in Get-ChildItem -Path $targetDir -Filter "*.js" -Exclude "configuration.default.js" -Recurse){
-    $lines = Get-Content -Path $file.FullName
+    $lines = [IO.File]::ReadLines($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
+    Rewrite-File $file $lines
-  }
-
-  ForEach($file in Get-ChildItem -Path $targetDir -Filter "*.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 -Path $targetDir -Filter "*.html" -Recurse){
-    $lines = Get-Content -Path $file.FullName
-    ,($lines | % { $_.TrimStart() }) | Rewrite-File $file
   }
   
-  Write-Host "------------------------------"
+  ForEach($file in Get-ChildItem -Path $targetDir -Filter "*.css" -Recurse){
+    $lines = [IO.File]::ReadLines($file.FullName)
+    $lines = $lines -Replace '\s*/\*.*?\*/', ''
+    $lines = $lines -Replace '^(\S.*) {$', '$1{'
+    $lines = $lines -Replace '^\s+(.+?):\s*(.+?)(?:\s*(!important))?;$', '$1:$2$3;'
+    $lines = @((Remove-Empty-Lines($lines)) -Join ' ')
+    Rewrite-File $file $lines
+  }
+  
+  ForEach($file in Get-ChildItem -Path $targetDir -Filter "*.html" -Recurse){
+    $lines = [IO.File]::ReadLines($file.FullName)
+    $lines = $lines | % { $_.TrimStart() }
+    Rewrite-File $file $lines
+  }
+  
+  ForEach($file in Get-ChildItem -Path (Join-Path $targetDir "plugins") -Filter "*.meta" -Recurse){
+    $lines = [IO.File]::ReadLines($file.FullName)
+    $lines = $lines -Replace '\{version\}', $version
+    Rewrite-File $file $lines
+  }
+  
+  Write-Host "------------------"
+  $sw.Stop()
+  Write-Host "Finished in" $([math]::Round($sw.Elapsed.TotalMilliseconds)) "ms"
+  Write-Host "------------------"
 }catch{
   Write-Host "Encountered an error while running PostBuild.ps1 on line" $_.InvocationInfo.ScriptLineNumber
   Write-Host $_

Resources/PostCefUpdate.ps1

@@ -0,0 +1,18 @@
+$ErrorActionPreference = "Stop"
+
+$MainProj = "..\TweetDuck.csproj"
+$BrowserProj = "..\subprocess\TweetDuck.Browser.csproj"
+
+$Match = Select-String -Path $MainProj '<Import Project="packages\\cef\.redist\.x86\.(.*?)\\'
+$Version = $Match.Matches[0].Groups[1].Value
+
+Copy-Item "..\packages\cef.redist.x86.${Version}\CEF\devtools_resources.pak" -Destination "..\bld\Resources\" -Force
+
+$Match = Select-String -Path $MainProj '<Import Project="packages\\CefSharp\.Common\.(.*?)\\'
+$Version = $Match.Matches[0].Groups[1].Value
+
+$Contents = [IO.File]::ReadAllText($BrowserProj)
+$Contents = $Contents -Replace '(?<=<HintPath>\.\.\\packages\\CefSharp\.Common\.)(.*?)(?=\\)', $Version
+$Contents = $Contents -Replace '(?<=<Reference Include="CefSharp\.BrowserSubprocess\.Core, Version=)(\d+)', $Version.Split(".")[0]
+
+[IO.File]::WriteAllText($BrowserProj, $Contents)

Resources/ScriptLoader.cs

@@ -106,7 +106,7 @@ namespace TweetDuck.Resources{
 
             using(Process process = Process.Start(new ProcessStartInfo{
                 FileName = "powershell",
-                Arguments = $"-ExecutionPolicy Unrestricted -File \"{HotSwapRebuildScript}\" \"{HotSwapTargetDir}\\\" \"{HotSwapProjectRoot}\\\" \"{Program.VersionTag}\"",
+                Arguments = $"-ExecutionPolicy Unrestricted -File \"{HotSwapRebuildScript}\" \"{HotSwapTargetDir}\\\" \"{HotSwapProjectRoot}\\\" \"Debug\" \"{Program.VersionTag}\"",
                 WindowStyle = ProcessWindowStyle.Hidden
             })){
                 // ReSharper disable once PossibleNullReferenceException

Resources/Scripts/code.js

@@ -25,26 +25,23 @@
   const app = $(document.body).children(".js-app");
   
   //
-  // Constant: Column types mapped to their titles.
+  // Constant: Column icon classes mapped to their titles.
   //
-  const columnTypes = {
+  const columnTitles = {
-    "col_home": "Home",
+    "icon-home": "Home",
-    "col_timeline" : "Home",
+    "icon-mention": "Mentions",
-    "col_mentions": "Mentions",
+    "icon-message": "Messages",
-    "col_me": "Mentions",
+    "icon-notifications": "Notifications",
-    "col_inbox": "Messages",
+    "icon-follow": "Followers",
-    "col_messages": "Messages",
+    "icon-activity": "Activity",
-    "col_interactions": "Notifications",
+    "icon-favorite": "Likes",
-    "col_followers": "Followers",
+    "icon-user": "User",
-    "col_activity": "Activity",
+    "icon-search": "Search",
-    "col_favorites": "Likes",
+    "icon-list": "List",
-    "col_usertweets": "User",
+    "icon-custom-timeline": "Timeline",
-    "col_search": "Search",
+    "icon-dataminr": "Dataminr",
-    "col_list": "List",
+    "icon-play-video": "Live video",
-    "col_customtimeline": "Timeline",
+    "icon-schedule": "Scheduled"
-    "col_dataminr": "Dataminr",
-    "col_livevideo": "Live video",
-    "col_scheduled": "Scheduled"
   };
   
   //
@@ -99,10 +96,24 @@
   };
   
   //
-  // Function: Retrieves column name
+  // Block: Fix columns missing any identifiable attributes to allow individual styles.
-  const getColumnName = function(column){
+  //
-    let cached = column._tduck_type || (column._tduck_type = Object.keys(columnTypes).find(type => column.isOfType(type)));
+  $(document).on("uiColumnRendered", function(e, data){
-    return columnTypes[cached] || "";
+    let icon = data.$column.find(".column-type-icon").first();
+    return if icon.length !== 1;
+    
+    let name = Array.prototype.find.call(icon[0].classList, cls => cls.startsWith("icon-"));
+    return if !name;
+    
+    data.$column.attr("data-td-icon", name);
+    data.column._tduck_icon = name;
+  });
+  
+  //
+  // Block: Setup global function to retrieve the column name.
+  //
+  window.TDGF_getColumnName = function(column){
+    return columnTitles[column._tduck_icon] || "";
   };
   
   //
@@ -135,7 +146,7 @@
     };
     
     let fixMedia = (html, media) => {
-      return html.find(".js-media a[data-media-entity-id='"+media.mediaId+"']").css("background-image", 'url("'+media.small()+'")').removeClass("is-zoomable");
+      return html.find("a[data-media-entity-id='"+media.mediaId+"'], .media-item").first().removeClass("is-zoomable").css("background-image", 'url("'+media.small()+'")');
     };
     
     return function(column, tweet){
@@ -170,13 +181,15 @@
         if (previews){
           html.find(".reverse-image-search").remove();
           
+          let container = html.find(".js-media");
+          
           for(let media of tweet.getMedia()){
-            fixMedia(html, media);
+            fixMedia(container, media);
           }
           
           if (tweet.quotedTweet){
             for(let media of tweet.quotedTweet.getMedia()){
-              fixMedia(html, media).addClass("media-size-medium");
+              fixMedia(container, media).addClass("media-size-medium");
             }
           }
         }
@@ -200,6 +213,12 @@
           }
         });
         
+        if (tweet.quotedTweet){
+          html.find("p.txt-mute").filter(function(){
+            return $(this).text() === "Show this thread";
+          }).first().remove();
+        }
+        
         let type = tweet.getChirpType();
         
         if (type === "follow"){
@@ -227,7 +246,7 @@
         let tweetUrl = source ? source.getChirpURL() : "";
         let quoteUrl = source && source.quotedTweet ? source.quotedTweet.getChirpURL() : "";
 
-        $TD.onTweetPopup(column.model.privateState.apiid, chirpId, getColumnName(column), html.html(), duration, tweetUrl, quoteUrl);
+        $TD.onTweetPopup(column.model.privateState.apiid, chirpId, window.TDGF_getColumnName(column), html.html(), duration, tweetUrl, quoteUrl);
       }
 
       if (column.model.getHasSound()){
@@ -669,9 +688,9 @@
       html.find("footer").last().remove(); // apparently withTweetActions breaks for certain tweets, nice
       html.find(".td-screenshot-remove").remove();
       
-      html.find("p.link-complex-target").filter(function(){
+      html.find("p.link-complex-target,p.txt-mute").filter(function(){
         return $(this).text() === "Show this thread";
-      }).first().remove();
+      }).remove();
       
       html.addClass($(document.documentElement).attr("class"));
       html.addClass($(document.body).attr("class"));
@@ -688,6 +707,12 @@
         }
       }
       
+      let gif = html.find(".js-media-gif-container");
+      
+      if (gif.length){
+        gif.css("background-image", 'url("'+chirp.getMedia()[0].small()+'")');
+      }
+      
       let type = chirp.getChirpType();
       
       if ((type.startsWith("favorite") || type.startsWith("retweet")) && chirp.isAboutYou()){
@@ -990,10 +1015,40 @@
     };
   })();
   
+  //
+  // Block: Setup global function to inject custom HTML into mustache templates.
+  //
+  window.TDGF_injectMustache = function(name, operation, search, custom){
+    let replacement;
+    
+    switch(operation){
+      case "replace": replacement = custom; break;
+      case "append": replacement = search+custom; break;
+      case "prepend": replacement = custom+search; break;
+      default: throw "Invalid mustache injection operation. Only 'replace', 'append', 'prepend' are supported.";
+    }
+    
+    let prev = TD.mustaches[name];
+    
+    if (!prev){
+      $TD.crashDebug("Mustache injection is referencing an invalid mustache: "+name);
+      return false;
+    }
+    
+    TD.mustaches[name] = prev.replace(search, replacement);
+    
+    if (prev === TD.mustaches[name]){
+      $TD.crashDebug("Mustache injection had no effect: "+name);
+      return false;
+    }
+    
+    return true;
+  };
+  
   //
   // Block: Let's make retweets lowercase again.
   //
-  TD.mustaches["status/tweet_single.mustache"] = TD.mustaches["status/tweet_single.mustache"].replace("{{_i}} Retweeted{{/i}}", "{{_i}} retweeted{{/i}}");
+  window.TDGF_injectMustache("status/tweet_single.mustache", "replace", "{{_i}} Retweeted{{/i}}", "{{_i}} retweeted{{/i}}");
   
   if (ensurePropertyExists(TD, "services", "TwitterActionRetweet", "prototype", "generateText")){
     TD.services.TwitterActionRetweet.prototype.generateText = appendToFunction(TD.services.TwitterActionRetweet.prototype.generateText, function(){
@@ -1062,7 +1117,8 @@
       }
     });
     
-    TD.mustaches["status/media_thumb.mustache"] = TD.mustaches["status/media_thumb.mustache"].replace("is-gif", "is-gif is-paused");
+    window.TDGF_injectMustache("status/media_thumb.mustache", "append", "is-gif", " is-paused");
+    
     TD.mustaches["media/native_video.mustache"] = '<div class="js-media-gif-container media-item nbfc is-video" style="background-image:url({{imageSrc}})"><video class="js-media-gif media-item-gif full-width block {{#isPossiblySensitive}}is-invisible{{/isPossiblySensitive}}" loop src="{{videoUrl}}"></video><a class="js-gif-play pin-all is-actionable">{{> media/video_overlay}}</a></div>';
     
     if (!ensurePropertyExists(TD, "components", "MediaGallery", "prototype", "_loadTweet") ||
@@ -1318,16 +1374,19 @@
   }
   
   //
-  // Block: Fix columns missing any identifiable attributes to allow individual styles.
+  // Block: Fix broken horizontal scrolling of column container when holding Shift. TODO Fix broken smooth scrolling.
   //
-  TD.mustaches["column.mustache"] = TD.mustaches["column.mustache"].replace("{{columnclass}}\"", "{{columnclass}}\" data-td-icon=\"{{columniconclass}}\"");
+  if (ensurePropertyExists(TD, "ui", "columns", "setupColumnScrollListeners")){
-  
+    TD.ui.columns.setupColumnScrollListeners = appendToFunction(TD.ui.columns.setupColumnScrollListeners, function(column){
-  //
+      let ele = $(".js-column[data-column='"+column.model.getKey()+"']");
-  // Block: Remove column mouse wheel handler, which allows smooth scrolling inside columns, and horizontally scrolling column container when holding Shift.
+      
-  //
+      ele.off("onmousewheel").on("mousewheel", ".scroll-v", function(e){
-  if (ensurePropertyExists(TD, "ui", "columns", "setupColumn")){
+        if (e.shiftKey){
-    TD.ui.columns.setupColumn = appendToFunction(TD.ui.columns.setupColumn, function(e){
+          e.stopImmediatePropagation();
-      $(".js-column[data-column='"+e.model.getKey()+"']").off("mousewheel onmousewheel");
+        }
+      });
+      
+      window.TDGF_prioritizeNewestEvent(ele[0], "mousewheel");
     });
   }
   

Resources/Scripts/introduction.js

@@ -93,12 +93,12 @@
           <label for="td-anonymous-data">Send anonymous usage data</label>
           <label>&nbsp;(<a href="https://github.com/chylex/TweetDuck/wiki/Send-anonymous-data" rel="nofollow">learn more</a>)</label>
         </div>
-        <button class="btn btn-positive" data-guide><span class="label">Show Guide</span></button>
+        <button class="Button--primary" data-guide><span class="label">Show Guide</span></button>
-        <button class="btn btn-positive"><span class="label">Close</span</button>
+        <button class="Button--secondary"><span class="label">Close</span</button>
       </footer>
     </div>
   </div>
-</div>`).appendTo(".js-app"); /* TODO btn-positive is removed, check all files again */
+</div>`).appendTo(".js-app");
     
     let tdUser = null;
     let loadTweetDuckUser = (onSuccess, onError) => {

Resources/Scripts/notification.js

@@ -129,11 +129,10 @@
   // Block: Setup a skip button.
   //
   if (!document.body.hasAttribute("td-example-notification")){
-    document.body.insertAdjacentHTML("afterbegin", `
+    document.body.children[0].insertAdjacentHTML("beforeend", `
 <svg id="td-skip" width="10" height="17" viewBox="0 0 350 600">
   <path fill="#888" d="M0,151.656l102.208-102.22l247.777,247.775L102.208,544.986L0,442.758l145.546-145.547">
-</svg>
+</svg>`);
-`);
     
     document.getElementById("td-skip").addEventListener("click", function(){
       $TD.loadNextNotification();
@@ -150,4 +149,9 @@
   document.body.addEventListener("mouseleave", function(){
     document.body.classList.remove("td-hover");
   });
+  
+  //
+  // Block: Force a reset of scroll position on every load.
+  //
+  history.scrollRestoration = "manual";
 })($TD, $TDX);

Resources/Scripts/plugins.browser.js

@@ -117,7 +117,9 @@
   //
   // Block: Setup bridges to global functions.
   //
+  window.TDPF_getColumnName = window.TDGF_getColumnName;
   window.TDPF_playVideo = window.TDGF_playVideo;
   window.TDPF_reloadColumns = window.TDGF_reloadColumns;
   window.TDPF_prioritizeNewestEvent = window.TDGF_prioritizeNewestEvent;
+  window.TDPF_injectMustache = window.TDGF_injectMustache;
 })();

Resources/Scripts/screenshot.js

@@ -10,6 +10,17 @@
   let avatarBottom = avatar ? avatar.getBoundingClientRect().bottom : 0;
   
   $TD.setHeight(Math.floor(Math.max(contentHeight, avatarBottom+9))).then(() => {
-    setTimeout($TD.triggerScreenshot, document.getElementsByTagName("iframe").length ? 267 : 67);
+    let framesLeft = {frames}; // basic render is done in 1 frame, large media take longer
+    
+    let onNextFrame = function(){
+      if (--framesLeft < 0){
+        $TD.triggerScreenshot();
+      }
+      else{
+        requestAnimationFrame(onNextFrame);
+      }
+    };
+    
+    onNextFrame();
   });
 })($TD_NotificationScreenshot);

Resources/Scripts/styles/browser.css

@@ -150,6 +150,7 @@ button {
 
 .activity-header .icon-user-filled {
   vertical-align: sub !important;
+  margin-right: 4px !important;
 }
 
 html[data-td-theme='light'] .stream-item:not(:hover) .js-user-actions-menu {
@@ -220,6 +221,29 @@ a[data-full-url] {
   bottom: 0 !important;
 }
 
+/**********************************************************/
+/* Prevent column icons from being hidden by column title */
+/**********************************************************/
+
+.column-header-title {
+  overflow: hidden !important;
+}
+
+.column-heading {
+  max-width: 100%;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+
+.column-header-links {
+  max-width: 100% !important;
+}
+
+[data-td-icon="icon-message"] .column-header-links {
+  min-width: 86px;
+}
+
 /*******************************************/
 /* Fix general visual issues or annoyances */
 /*******************************************/
@@ -234,6 +258,31 @@ a[data-full-url] {
   vertical-align: -10% !important;
 }
 
+.column-title {
+  /* fix alignment of everything in column headers */
+  padding-top: 1px !important;
+}
+
+.column-title .attribution {
+  /* fix alignment of usernames in column headers */
+  margin: 0 0 0 6px !important;
+}
+
+.app-navigator .tooltip {
+  /* fix tooltips in navigation */
+  display: none !important;
+}
+
+.column-header-links .icon {
+  /* fix tooltips in column headers */
+  height: calc(1em + 8px) !important;
+}
+
+.js-column-options .btn-options-tray {
+  /* fix underline on buttons in column options */
+  text-decoration: none !important;
+}
+
 #tduck .nav-user-info .hide-condensed {
   /* move login account info */
   margin: 0px !important;
@@ -290,14 +339,14 @@ html[data-td-font='smallest'] .tweet-detail-wrapper .badge-verified:before {
 /* Fix glaring visual issues that twitter hasn't fixed yet smh */
 /***************************************************************/
 
-.column-nav-link .attribution {
+.js-column-nav-list .attribution {
   /* fix cut off account names */
-  position: absolute !important;
+  line-height: 1.1 !important;
 }
 
 #tduck .js-docked-compose .js-drawer-close {
   /* fix close drawer button position */
-  margin: 20px 0 0 !important;
+  margin: 18px 0 0 !important;
 }
 
 .compose-reply-tweet-remove {
@@ -311,25 +360,6 @@ html[data-td-font='smallest'] .tweet-detail-wrapper .badge-verified:before {
   vertical-align: -15% !important;
 }
 
-/************************************************/
-/* Fix tooltips in navigation and column header */
-/************************************************/
-
-.app-navigator .tooltip {
-  display: none !important;
-}
-
-.js-column-header .column-header-link {
-  padding: 0 !important;
-}
-
-.js-column-header .column-header-link .icon {
-  width: calc(1em + 8px);
-  height: 100%;
-  padding: 9px 4px;
-  box-sizing: border-box;
-}
-
 /*******************************************/
 /* Fix one pixel space below column header */
 /*******************************************/
@@ -342,10 +372,6 @@ html[data-td-font='smallest'] .tweet-detail-wrapper .badge-verified:before {
   border-bottom: none !important;
 }
 
-.is-options-open .column-type-icon {
-  bottom: 27px !important;
-}
-
 /********************************************/
 /* Fix cut off usernames in Messages column */
 /********************************************/

Resources/Scripts/styles/notification.css

@@ -2,7 +2,9 @@
 /* General */
 /***********/
 
-body.td-notification {
+html, body {
+  height: auto !important;
+  overflow-x: hidden !important;
   overflow-y: auto !important;
 }
 
@@ -88,6 +90,7 @@ html[data-td-font='smallest'] .badge-verified:before {
 
 .activity-header .icon-user-filled {
   vertical-align: sub !important;
+  margin-right: 4px !important;
 }
       
 .td-notification-padded .item-img {
@@ -136,7 +139,7 @@ html[data-td-font='smallest'] .badge-verified:before {
 
 #td-skip {
   position: fixed;
-  left: 30px;
+  left: 29px;
   bottom: 10px;
   z-index: 1000;
   cursor: pointer;

Resources/Scripts/twitter.js

@@ -60,4 +60,16 @@
       }
     });
   }
+  //
+  // Block: Fix broken Cancel button on logout page.
+  //
+  else if (location.pathname === "/logout"){
+    document.addEventListener("DOMContentLoaded", function(){
+      let cancel = document.querySelector(".buttons .cancel");
+
+      if (cancel && cancel.tagName === "A"){
+        cancel.href = "https://tweetdeck.twitter.com/";
+      }
+    });
+  }
 })();

TweetDuck.csproj

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="packages\CefSharp.WinForms.64.0.0-CI2508\build\CefSharp.WinForms.props" Condition="Exists('packages\CefSharp.WinForms.64.0.0-CI2508\build\CefSharp.WinForms.props')" />
+  <Import Project="packages\CefSharp.WinForms.66.0.0-CI2629\build\CefSharp.WinForms.props" Condition="Exists('packages\CefSharp.WinForms.66.0.0-CI2629\build\CefSharp.WinForms.props')" />
-  <Import Project="packages\CefSharp.Common.64.0.0-CI2508\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.64.0.0-CI2508\build\CefSharp.Common.props')" />
+  <Import Project="packages\CefSharp.Common.66.0.0-CI2629\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.66.0.0-CI2629\build\CefSharp.Common.props')" />
-  <Import Project="packages\cef.redist.x86.3.3282.1731\build\cef.redist.x86.props" Condition="Exists('packages\cef.redist.x86.3.3282.1731\build\cef.redist.x86.props')" />
+  <Import Project="packages\cef.redist.x86.3.3359.1772\build\cef.redist.x86.props" Condition="Exists('packages\cef.redist.x86.3.3359.1772\build\cef.redist.x86.props')" />
-  <Import Project="packages\cef.redist.x64.3.3282.1731\build\cef.redist.x64.props" Condition="Exists('packages\cef.redist.x64.3.3282.1731\build\cef.redist.x64.props')" />
+  <Import Project="packages\cef.redist.x64.3.3359.1772\build\cef.redist.x64.props" Condition="Exists('packages\cef.redist.x64.3.3359.1772\build\cef.redist.x64.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -35,6 +35,9 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+    <StartArguments>-datafolder TweetDuckDebug</StartArguments>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x86\Debug\</OutputPath>
@@ -325,7 +328,6 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Resources\ScriptLoader.cs" />
     <Compile Include="Updates\Events\UpdateEventArgs.cs" />
-    <Compile Include="Updates\UpdaterSettings.cs" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.0,Profile=Client">
@@ -366,30 +368,45 @@
     </ContentWithTargetPath>
   </ItemGroup>
   <ItemGroup>
+    <Content Include="Resources\avatar.png" />
     <None Include="packages.config" />
     <None Include="Resources\icon-small.ico" />
     <None Include="Resources\icon-tray-new.ico" />
     <None Include="Resources\icon-tray.ico" />
-    <None Include="Resources\PostBuild.ps1" />
     <None Include="Resources\spinner.apng" />
-  </ItemGroup>
+    <None Include="Resources\PostBuild.ps1" />
-  <ItemGroup>
+    <None Include="Resources\Plugins\.debug\.meta" />
-    <Folder Include="Resources\Plugins\" />
+    <None Include="Resources\Plugins\.debug\browser.js" />
-  </ItemGroup>
+    <None Include="Resources\Plugins\clear-columns\.meta" />
-  <ItemGroup>
+    <None Include="Resources\Plugins\clear-columns\browser.js" />
-    <Content Include="Resources\avatar.png" />
+    <None Include="Resources\Plugins\edit-design\.meta" />
-    <Content Include="Resources\Scripts\code.js" />
+    <None Include="Resources\Plugins\edit-design\browser.js" />
-    <Content Include="Resources\Scripts\introduction.js" />
+    <None Include="Resources\Plugins\edit-design\modal.html" />
-    <Content Include="Resources\Scripts\notification.js" />
+    <None Include="Resources\Plugins\edit-design\theme.black.css" />
-    <Content Include="Resources\Scripts\pages\error.html" />
+    <None Include="Resources\Plugins\emoji-keyboard\.meta" />
-    <Content Include="Resources\Scripts\pages\example.html" />
+    <None Include="Resources\Plugins\emoji-keyboard\browser.js" />
-    <Content Include="Resources\Scripts\plugins.browser.js" />
+    <None Include="Resources\Plugins\emoji-keyboard\emoji-instructions.txt" />
-    <Content Include="Resources\Scripts\plugins.js" />
+    <None Include="Resources\Plugins\emoji-keyboard\emoji-ordering.txt" />
-    <Content Include="Resources\Scripts\plugins.notification.js" />
+    <None Include="Resources\Plugins\reply-account\.meta" />
-    <Content Include="Resources\Scripts\styles\browser.css" />
+    <None Include="Resources\Plugins\reply-account\browser.js" />
-    <Content Include="Resources\Scripts\styles\notification.css" />
+    <None Include="Resources\Plugins\reply-account\configuration.default.js" />
-    <Content Include="Resources\Scripts\twitter.js" />
+    <None Include="Resources\Plugins\templates\.meta" />
-    <Content Include="Resources\Scripts\update.js" />
+    <None Include="Resources\Plugins\templates\browser.js" />
+    <None Include="Resources\Plugins\timeline-polls\.meta" />
+    <None Include="Resources\Plugins\timeline-polls\browser.js" />
+    <None Include="Resources\Scripts\code.js" />
+    <None Include="Resources\Scripts\introduction.js" />
+    <None Include="Resources\Scripts\notification.js" />
+    <None Include="Resources\Scripts\pages\error.html" />
+    <None Include="Resources\Scripts\pages\example.html" />
+    <None Include="Resources\Scripts\plugins.browser.js" />
+    <None Include="Resources\Scripts\plugins.js" />
+    <None Include="Resources\Scripts\plugins.notification.js" />
+    <None Include="Resources\Scripts\screenshot.js" />
+    <None Include="Resources\Scripts\styles\browser.css" />
+    <None Include="Resources\Scripts\styles\notification.css" />
+    <None Include="Resources\Scripts\twitter.js" />
+    <None Include="Resources\Scripts\update.js" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="subprocess\TweetDuck.Browser.csproj">
@@ -413,20 +430,13 @@ rmdir "$(ProjectDir)bin\Release"
 rmdir "$(TargetDir)scripts" /S /Q
 rmdir "$(TargetDir)plugins" /S /Q
 
-powershell -ExecutionPolicy Unrestricted -File "$(ProjectDir)Resources\PostBuild.ps1" "$(TargetDir)\" "$(ProjectDir)\"
+powershell -ExecutionPolicy Unrestricted -File "$(ProjectDir)Resources\PostBuild.ps1" "$(TargetDir)\" "$(ProjectDir)\" "$(ConfigurationName)"
-
-if $(ConfigurationName) == Debug (
-  rmdir "$(TargetDir)plugins\official\.debug" /S /Q
-  mkdir "$(TargetDir)plugins\user\.debug"
-  xcopy "$(ProjectDir)Resources\Plugins\.debug\*" "$(TargetDir)plugins\user\.debug\" /E /Y
-)
 </PostBuildEvent>
   </PropertyGroup>
   <Target Name="AfterBuild" Condition="$(ConfigurationName) == Release">
     <Exec Command="del &quot;$(TargetDir)*.pdb&quot;" />
     <Exec Command="del &quot;$(TargetDir)*.xml&quot;" />
     <Delete Files="$(TargetDir)CefSharp.BrowserSubprocess.exe" />
-    <Delete Files="$(TargetDir)devtools_resources.pak" />
     <Delete Files="$(TargetDir)widevinecdmadapter.dll" />
   </Target>
   <PropertyGroup>
@@ -436,13 +446,11 @@ if $(ConfigurationName) == Debug (
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('packages\cef.redist.x64.3.3282.1731\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x64.3.3282.1731\build\cef.redist.x64.props'))" />
+    <Error Condition="!Exists('packages\cef.redist.x64.3.3359.1772\build\cef.redist.x64.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x64.3.3359.1772\build\cef.redist.x64.props'))" />
-    <Error Condition="!Exists('packages\cef.redist.x86.3.3282.1731\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x86.3.3282.1731\build\cef.redist.x86.props'))" />
+    <Error Condition="!Exists('packages\cef.redist.x86.3.3359.1772\build\cef.redist.x86.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x86.3.3359.1772\build\cef.redist.x86.props'))" />
-    <Error Condition="!Exists('packages\CefSharp.Common.64.0.0-CI2508\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.64.0.0-CI2508\build\CefSharp.Common.props'))" />
+    <Error Condition="!Exists('packages\CefSharp.Common.66.0.0-CI2629\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.66.0.0-CI2629\build\CefSharp.Common.props'))" />
-    <Error Condition="!Exists('packages\CefSharp.Common.64.0.0-CI2508\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.64.0.0-CI2508\build\CefSharp.Common.targets'))" />
+    <Error Condition="!Exists('packages\CefSharp.Common.66.0.0-CI2629\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.66.0.0-CI2629\build\CefSharp.Common.targets'))" />
-    <Error Condition="!Exists('packages\CefSharp.WinForms.64.0.0-CI2508\build\CefSharp.WinForms.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.64.0.0-CI2508\build\CefSharp.WinForms.props'))" />
+    <Error Condition="!Exists('packages\CefSharp.WinForms.66.0.0-CI2629\build\CefSharp.WinForms.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.66.0.0-CI2629\build\CefSharp.WinForms.props'))" />
-    <Error Condition="!Exists('packages\CefSharp.WinForms.64.0.0-CI2508\build\CefSharp.WinForms.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.64.0.0-CI2508\build\CefSharp.WinForms.targets'))" />
   </Target>
-  <Import Project="packages\CefSharp.Common.64.0.0-CI2508\build\CefSharp.Common.targets" Condition="Exists('packages\CefSharp.Common.64.0.0-CI2508\build\CefSharp.Common.targets')" />
+  <Import Project="packages\CefSharp.Common.66.0.0-CI2629\build\CefSharp.Common.targets" Condition="Exists('packages\CefSharp.Common.66.0.0-CI2629\build\CefSharp.Common.targets')" />
-  <Import Project="packages\CefSharp.WinForms.64.0.0-CI2508\build\CefSharp.WinForms.targets" Condition="Exists('packages\CefSharp.WinForms.64.0.0-CI2508\build\CefSharp.WinForms.targets')" />
 </Project>

Updates/Events/UpdateCheckEventArgs.cs

@@ -5,7 +5,7 @@ namespace TweetDuck.Updates.Events{
     sealed class UpdateCheckEventArgs : EventArgs{
         public int EventId { get; }
         public Result<UpdateInfo> Result { get; }
-
+        
         public UpdateCheckEventArgs(int eventId, Result<UpdateInfo> result){
             this.EventId = eventId;
             this.Result = result;

Updates/FormUpdateDownload.Designer.cs

@@ -32,10 +32,12 @@
             // 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(195, 34);
+            this.btnCancel.AutoSize = true;
+            this.btnCancel.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.btnCancel.Location = new System.Drawing.Point(180, 32);
             this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.btnCancel.Padding = new System.Windows.Forms.Padding(2, 0, 2, 0);
-            this.btnCancel.Size = new System.Drawing.Size(56, 23);
+            this.btnCancel.Size = new System.Drawing.Size(57, 25);
             this.btnCancel.TabIndex = 1;
             this.btnCancel.Text = "Cancel";
             this.btnCancel.UseVisualStyleBackColor = true;
@@ -44,10 +46,11 @@
             // labelDescription
             // 
             this.labelDescription.AutoSize = true;
+            this.labelDescription.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelDescription.Location = new System.Drawing.Point(9, 13);
             this.labelDescription.Margin = new System.Windows.Forms.Padding(3, 0, 3, 3);
             this.labelDescription.Name = "labelDescription";
-            this.labelDescription.Size = new System.Drawing.Size(0, 13);
+            this.labelDescription.Size = new System.Drawing.Size(0, 15);
             this.labelDescription.TabIndex = 2;
             // 
             // timerDownloadCheck
@@ -59,12 +62,12 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(263, 69);
+            this.ClientSize = new System.Drawing.Size(249, 69);
             this.Controls.Add(this.labelDescription);
             this.Controls.Add(this.btnCancel);
             this.DoubleBuffered = true;
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-            this.Icon = Properties.Resources.icon;
+            this.Icon = global::TweetDuck.Properties.Resources.icon;
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "FormUpdateDownload";

Updates/UpdateCheckClient.cs

@@ -11,10 +11,10 @@ namespace TweetDuck.Updates{
         private const string ApiLatestRelease = "https://api.github.com/repos/chylex/TweetDuck/releases/latest";
         private const string UpdaterAssetName = "TweetDuck.Update.exe";
 
-        private readonly UpdaterSettings settings;
+        private readonly string installerFolder;
 
-        public UpdateCheckClient(UpdaterSettings settings){
+        public UpdateCheckClient(string installerFolder){
-            this.settings = settings;
+            this.installerFolder = installerFolder;
         }
 
         public Task<UpdateInfo> Check(){
@@ -57,7 +57,7 @@ namespace TweetDuck.Updates{
             string releaseNotes = (string)root["body"];
             string downloadUrl = ((Array)root["assets"]).Cast<JsonObject>().Where(IsUpdaterAsset).Select(AssetDownloadUrl).FirstOrDefault();
 
-            return new UpdateInfo(settings, versionTag, releaseNotes, downloadUrl);
+            return new UpdateInfo(versionTag, releaseNotes, downloadUrl, installerFolder);
         }
     }
 }

Updates/UpdateHandler.cs

@@ -1,18 +1,20 @@
 using System;
+using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 using TweetDuck.Core.Controls;
 using TweetDuck.Core.Other.Interfaces;
 using TweetDuck.Data;
 using TweetDuck.Updates.Events;
+using Timer = System.Windows.Forms.Timer;
 
 namespace TweetDuck.Updates{
     sealed class UpdateHandler : IDisposable{
         public const int CheckCodeUpdatesDisabled = -1;
         public const int CheckCodeNotOnTweetDeck = -2;
         
-        private readonly UpdaterSettings settings;
         private readonly UpdateCheckClient client;
+        private readonly TaskScheduler scheduler;
         private readonly ITweetDeckBrowser browser;
         private readonly Timer timer;
 
@@ -24,9 +26,9 @@ namespace TweetDuck.Updates{
         private ushort lastEventId;
         private UpdateInfo lastUpdateInfo;
 
-        public UpdateHandler(ITweetDeckBrowser browser, UpdaterSettings settings){
+        public UpdateHandler(ITweetDeckBrowser browser, string installerFolder){
-            this.settings = settings;
+            this.client = new UpdateCheckClient(installerFolder);
-            this.client = new UpdateCheckClient(settings);
+            this.scheduler = TaskScheduler.FromCurrentSynchronizationContext();
             
             this.browser = browser;
             this.browser.RegisterBridge("$TDU", new Bridge(this));
@@ -66,10 +68,6 @@ namespace TweetDuck.Updates{
 
         public int Check(bool force){
             if (Program.UserConfig.EnableUpdateCheck || force){
-                if (force){
-                    settings.DismissedUpdate = null;
-                }
-                
                 if (!browser.IsTweetDeckWebsite){
                     return CheckCodeNotOnTweetDeck;
                 }
@@ -77,8 +75,8 @@ namespace TweetDuck.Updates{
                 int nextEventId = unchecked(++lastEventId);
                 Task<UpdateInfo> checkTask = client.Check();
 
-                checkTask.ContinueWith(task => HandleUpdateCheckSuccessful(nextEventId, task.Result), TaskContinuationOptions.OnlyOnRanToCompletion);
+                checkTask.ContinueWith(task => HandleUpdateCheckSuccessful(nextEventId, task.Result), CancellationToken.None, TaskContinuationOptions.OnlyOnRanToCompletion, scheduler);
-                checkTask.ContinueWith(task => HandleUpdateCheckFailed(nextEventId, task.Exception.InnerException), TaskContinuationOptions.OnlyOnFaulted);
+                checkTask.ContinueWith(task => HandleUpdateCheckFailed(nextEventId, task.Exception.InnerException), CancellationToken.None, TaskContinuationOptions.OnlyOnFaulted, scheduler);
 
                 return nextEventId;
             }
@@ -86,6 +84,12 @@ namespace TweetDuck.Updates{
             return CheckCodeUpdatesDisabled;
         }
 
+        public void PrepareUpdate(UpdateInfo info){
+            CleanupDownload();
+            lastUpdateInfo = info;
+            lastUpdateInfo.BeginSilentDownload();
+        }
+
         public void BeginUpdateDownload(Form ownerForm, UpdateInfo updateInfo, Action<UpdateInfo> onFinished){
             UpdateDownloadStatus status = updateInfo.DownloadStatus;
 
@@ -121,12 +125,6 @@ namespace TweetDuck.Updates{
         }
 
         private void HandleUpdateCheckSuccessful(int eventId, UpdateInfo info){
-            if (info.IsUpdateNew && !info.IsUpdateDismissed){
-                CleanupDownload();
-                lastUpdateInfo = info;
-                lastUpdateInfo.BeginSilentDownload();
-            }
-            
             CheckFinished?.Invoke(this, new UpdateCheckEventArgs(eventId, new Result<UpdateInfo>(info)));
         }
 
@@ -148,9 +146,7 @@ namespace TweetDuck.Updates{
 
         private void TriggerUpdateDismissedEvent(){
             if (lastUpdateInfo != null){
-                settings.DismissedUpdate = lastUpdateInfo.VersionTag;
                 UpdateDismissed?.Invoke(this, new UpdateEventArgs(lastUpdateInfo));
-
                 CleanupDownload();
             }
         }

Updates/UpdateInfo.cs

@@ -8,24 +8,21 @@ namespace TweetDuck.Updates{
         public string VersionTag { get; }
         public string ReleaseNotes { get; }
         public string InstallerPath { get; }
-
+        
-        public bool IsUpdateNew => VersionTag != Program.VersionTag;
-        public bool IsUpdateDismissed => VersionTag == settings.DismissedUpdate;
-
         public UpdateDownloadStatus DownloadStatus { get; private set; }
         public Exception DownloadError { get; private set; }
 
-        private readonly UpdaterSettings settings;
         private readonly string downloadUrl;
+        private readonly string installerFolder;
         private WebClient currentDownload;
 
-        public UpdateInfo(UpdaterSettings settings, string versionTag, string releaseNotes, string downloadUrl){
+        public UpdateInfo(string versionTag, string releaseNotes, string downloadUrl, string installerFolder){
-            this.settings = settings;
             this.downloadUrl = downloadUrl;
+            this.installerFolder = installerFolder;
             
             this.VersionTag = versionTag;
             this.ReleaseNotes = releaseNotes;
-            this.InstallerPath = Path.Combine(settings.InstallerDownloadFolder, "TweetDuck."+versionTag+".exe");
+            this.InstallerPath = Path.Combine(installerFolder, $"TweetDuck.{versionTag}.exe");
         }
 
         public void BeginSilentDownload(){
@@ -39,7 +36,7 @@ namespace TweetDuck.Updates{
                 }
 
                 try{
-                    Directory.CreateDirectory(settings.InstallerDownloadFolder);
+                    Directory.CreateDirectory(installerFolder);
                 }catch(Exception e){
                     DownloadError = e;
                     DownloadStatus = UpdateDownloadStatus.Failed;

Updates/UpdaterSettings.cs

@@ -1,11 +0,0 @@
-namespace TweetDuck.Updates{
-    sealed class UpdaterSettings{
-        public string InstallerDownloadFolder { get; }
-        
-        public string DismissedUpdate { get; set; }
-
-        public UpdaterSettings(string installerDownloadFolder){
-            this.InstallerDownloadFolder = installerDownloadFolder;
-        }
-    }
-}

bld/Resources/CEFSHARP-LICENSE.txt

@@ -1,30 +0,0 @@
-// Copyright <20> 2010-2016 The CefSharp Authors
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//    * Redistributions of source code must retain the above copyright
-//      notice, this list of conditions and the following disclaimer.
-//
-//    * Redistributions in binary form must reproduce the above
-//      copyright notice, this list of conditions and the following disclaimer
-//      in the documentation and/or other materials provided with the
-//      distribution.
-//
-//    * Neither the name of Google Inc. nor the name Chromium Embedded
-//      Framework nor the name CefSharp nor the names of its contributors
-//      may be used to endorse or promote products derived from this software
-//      without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

bld/Resources/LICENSE

@@ -1,9 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2016 
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

bld/Resources/LICENSES.txt

@@ -0,0 +1,98 @@
+===============================================================================
+                                   TweetDuck
+===============================================================================
+
+The MIT License (MIT)
+
+Copyright (c) 2016
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+
+
+===============================================================================
+                                   CefSharp
+===============================================================================
+
+// Copyright © 2010-2017 The CefSharp Authors
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+//      notice, this list of conditions and the following disclaimer.
+//
+//    * Redistributions in binary form must reproduce the above
+//      copyright notice, this list of conditions and the following disclaimer
+//      in the documentation and/or other materials provided with the
+//      distribution.
+//
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+//      Framework nor the name CefSharp nor the names of its contributors
+//      may be used to endorse or promote products derived from this software
+//      without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+
+
+===============================================================================
+                          Chromium Embedded Framework
+===============================================================================
+
+// Copyright (c) 2008-2014 Marshall A. Greenblatt. Portions Copyright (c)
+// 2006-2009 Google Inc. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the name Chromium Embedded
+// Framework nor the names of its contributors may be used to endorse
+// or promote products derived from this software without specific prior
+// written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

bld/gen_full.iss

@@ -24,12 +24,15 @@ DefaultGroupName={#MyAppName}
 OutputBaseFilename={#MyAppName}
 VersionInfoVersion={#MyAppVersion}
 SetupIconFile=.\Resources\icon.ico
+CloseApplicationsFilter=*.exe,*.dll,*.pak
+RestartApplications=False
 Uninstallable=TDIsUninstallable
 UninstallDisplayName={#MyAppName}
 UninstallDisplayIcon={app}\{#MyAppExeName}
-Compression=lzma
+Compression=lzma2/ultra
+LZMADictionarySize=15360
 SolidCompression=yes
-InternalCompressLevel=max
+InternalCompressLevel=normal
 MinVersion=0,6.1
 
 #include <idp.iss>
@@ -38,11 +41,13 @@ MinVersion=0,6.1
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
 [Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalTasks}"; Flags: unchecked
+Name: "devtools"; Description: "{cm:TaskDevTools}"; GroupDescription: "{cm:AdditionalTasks}"; Flags: unchecked
 
 [Files]
 Source: "..\bin\x86\Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\bin\x86\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; Excludes: "*.xml,*.pdb,CefSharp.BrowserSubprocess.exe,devtools_resources.pak,widevinecdmadapter.dll"
+Source: "..\bin\x86\Release\devtools_resources.pak"; DestDir: "{app}"; Flags: ignoreversion; Tasks: devtools
+Source: "..\bin\x86\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; Excludes: "devtools_resources.pak"
 
 [Icons]
 Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Check: TDIsUninstallable
@@ -58,9 +63,14 @@ Type: filesandordirs; Name: "{app}\scripts"
 Type: filesandordirs; Name: "{localappdata}\{#MyAppName}\Cache"
 Type: filesandordirs; Name: "{localappdata}\{#MyAppName}\GPUCache"
 
+[CustomMessages]
+AdditionalTasks=Additional shortcuts and components:
+TaskDevTools=Install dev tools
+
 [Code]
 var UpdatePath: String;
 var ForceRedistPrompt: String;
+var VisitedTasksPage: Boolean;
 
 function TDGetNetFrameworkVersion: Cardinal; forward;
 function TDIsVCMissing: Boolean; forward;
@@ -71,19 +81,20 @@ function InitializeSetup: Boolean;
 begin
   UpdatePath := ExpandConstant('{param:UPDATEPATH}')
   ForceRedistPrompt := ExpandConstant('{param:PROMPTREDIST}')
+  VisitedTasksPage := False
   
   if (TDGetNetFrameworkVersion() < 379893) and (MsgBox('{#MyAppName} requires .NET Framework 4.5.2 or newer,'+#13+#10+'please visit {#MyAppShortURL} for a download link.'+#13+#10+#13+#10'Do you want to proceed with the setup anyway?', mbCriticalError, MB_YESNO or MB_DEFBUTTON2) = IDNO) then
   begin
-    Result := False;
+    Result := False
-    Exit;
+    Exit
   end;
   
   if (TDIsVCMissing() or (ForceRedistPrompt = '1')) and (MsgBox('Microsoft Visual C++ 2015 appears to be missing, would you like to automatically install it?', mbConfirmation, MB_YESNO) = IDYES) then
   begin
-    idpAddFile('https://github.com/{#MyAppPublisher}/{#MyAppName}/{#VCRedistLink}', ExpandConstant('{tmp}\{#MyAppName}.VC.exe'));
+    idpAddFile('https://github.com/{#MyAppPublisher}/{#MyAppName}/{#VCRedistLink}', ExpandConstant('{tmp}\{#MyAppName}.VC.exe'))
   end;
   
-  Result := True;
+  Result := True
 end;
 
 { Set the installation path if updating, and prepare download plugin if there are any files to download. }
@@ -91,12 +102,12 @@ procedure InitializeWizard();
 begin
   if (UpdatePath <> '') then
   begin
-    WizardForm.DirEdit.Text := UpdatePath;
+    WizardForm.DirEdit.Text := UpdatePath
   end;
   
   if (idpFilesCount <> 0) then
   begin
-    idpDownloadAfter(wpReady);
+    idpDownloadAfter(wpReady)
   end;
 end;
 
@@ -106,12 +117,14 @@ begin
   Result := (PageID = wpSelectDir) and (UpdatePath <> '')
 end;
 
-{ Check the desktop icon task if not updating. }
+{ Check the desktop icon task if not updating, and dev tools task if already installed. }
 procedure CurPageChanged(CurPageID: Integer);
 begin
-  if CurPageID = wpSelectTasks then
+  if (CurPageID = wpSelectTasks) and (not VisitedTasksPage) then
   begin
-    WizardForm.TasksList.Checked[WizardForm.TasksList.Items.Count-1] := (UpdatePath = '');
+    WizardForm.TasksList.Checked[WizardForm.TasksList.Items.Count-2] := (UpdatePath = '')
+    WizardForm.TasksList.Checked[WizardForm.TasksList.Items.Count-1] := FileExists(ExpandConstant('{app}\devtools_resources.pak'))
+    VisitedTasksPage := True
   end;
 end;
 
@@ -120,7 +133,7 @@ procedure CurStepChanged(CurStep: TSetupStep);
 begin
   if CurStep = ssInstall then
   begin
-    TDInstallVCRedist();
+    TDInstallVCRedist()
   end;
 end;
 
@@ -137,9 +150,9 @@ begin
     
     if (DirExists(ProfileDataFolder) or DirExists(PluginDataFolder)) and (MsgBox('Do you also want to delete your {#MyAppName} profile and plugins?', mbConfirmation, MB_YESNO or MB_DEFBUTTON2) = IDYES) then
     begin
-      DelTree(ProfileDataFolder, True, True, True);
+      DelTree(ProfileDataFolder, True, True, True)
-      DelTree(PluginDataFolder, True, True, True);
+      DelTree(PluginDataFolder, True, True, True)
-      DelTree(ExpandConstant('{app}'), True, False, False);
+      DelTree(ExpandConstant('{app}'), True, False, False)
     end;
   end;
 end;
@@ -157,11 +170,11 @@ var FrameworkVersion: Cardinal;
 begin
   if RegQueryDWordValue(HKEY_LOCAL_MACHINE, 'Software\Microsoft\NET Framework Setup\NDP\v4\Full', 'Release', FrameworkVersion) then
   begin
-    Result := FrameworkVersion;
+    Result := FrameworkVersion
-    Exit;
+    Exit
   end;
   
-  Result := 0;
+  Result := 0
 end;
 
 { Check if Visual C++ 2015 or 2017 is installed. }
@@ -176,20 +189,20 @@ begin
   begin
     for Index := 0 to GetArrayLength(Keys)-1 do
     begin
-      Key := Keys[Index];
+      Key := Keys[Index]
       
       if RegQueryStringValue(HKEY_LOCAL_MACHINE, 'Software\Classes\Installer\Dependencies\'+Key, 'DisplayName', DisplayName) then
       begin
         if (Pos('Microsoft Visual C++', DisplayName) = 1) and (Pos('(x86)', DisplayName) > 1) and ((Pos(' 2015 ', DisplayName) > 1) or (Pos(' 2017 ', DisplayName) > 1)) then
         begin
-          Result := False;
+          Result := False
-          Exit;
+          Exit
         end;
       end;
     end;
   end;
   
-  Result := True;
+  Result := True
 end;
 
 { Run the Visual C++ installer if downloaded. }
@@ -202,26 +215,26 @@ begin
   
   if FileExists(InstallFile) then
   begin
-    WizardForm.ProgressGauge.Style := npbstMarquee;
+    WizardForm.ProgressGauge.Style := npbstMarquee
     
     try
       if Exec(InstallFile, '/passive /norestart', '', SW_SHOW, ewWaitUntilTerminated, ResultCode) then
       begin
         if ResultCode <> 0 then
         begin
-          DeleteFile(InstallFile);
+          DeleteFile(InstallFile)
-          Exit;
+          Exit
         end;
       end else
       begin
         MsgBox('Could not run the Visual C++ installer, please visit https://github.com/{#MyAppPublisher}/{#MyAppName}/{#VCRedistLink} and download the latest version manually. Error: '+SysErrorMessage(ResultCode), mbCriticalError, MB_OK);
         
-        DeleteFile(InstallFile);
+        DeleteFile(InstallFile)
-        Exit;
+        Exit
       end;
     finally
-      WizardForm.ProgressGauge.Style := npbstNormal;
+      WizardForm.ProgressGauge.Style := npbstNormal
-      DeleteFile(InstallFile);
+      DeleteFile(InstallFile)
     end;
   end;
 end;

bld/gen_port.iss

@@ -24,12 +24,15 @@ DefaultGroupName={#MyAppName}
 OutputBaseFilename={#MyAppName}.Portable
 VersionInfoVersion={#MyAppVersion}
 SetupIconFile=.\Resources\icon.ico
+CloseApplicationsFilter=*.exe,*.dll,*.pak
+RestartApplications=False
 Uninstallable=no
 UsePreviousAppDir=no
 PrivilegesRequired=lowest
-Compression=lzma
+Compression=lzma2/ultra
+LZMADictionarySize=15360
 SolidCompression=yes
-InternalCompressLevel=max
+InternalCompressLevel=normal
 MinVersion=0,6.1
 
 #include <idp.iss>
@@ -37,16 +40,25 @@ MinVersion=0,6.1
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
+[Tasks]
+Name: "devtools"; Description: "{cm:TaskDevTools}"; GroupDescription: "{cm:AdditionalTasks}"; Flags: unchecked
+
 [Files]
 Source: "..\bin\x86\Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\bin\x86\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; Excludes: "*.xml,*.pdb,CefSharp.BrowserSubprocess.exe,devtools_resources.pak,widevinecdmadapter.dll"
+Source: "..\bin\x86\Release\devtools_resources.pak"; DestDir: "{app}"; Flags: ignoreversion; Tasks: devtools
+Source: "..\bin\x86\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; Excludes: "devtools_resources.pak"
 
 [Run]
 Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall shellexec skipifsilent
 
+[CustomMessages]
+AdditionalTasks=Additional components:
+TaskDevTools=Install dev tools
+
 [Code]
 var UpdatePath: String;
 var ForceRedistPrompt: String;
+var VisitedTasksPage: Boolean;
 
 function TDGetNetFrameworkVersion: Cardinal; forward;
 function TDIsVCMissing: Boolean; forward;
@@ -57,19 +69,20 @@ function InitializeSetup: Boolean;
 begin
   UpdatePath := ExpandConstant('{param:UPDATEPATH}')
   ForceRedistPrompt := ExpandConstant('{param:PROMPTREDIST}')
+  VisitedTasksPage := False
   
   if (TDGetNetFrameworkVersion() < 379893) and (MsgBox('{#MyAppName} requires .NET Framework 4.5.2 or newer,'+#13+#10+'please visit {#MyAppShortURL} for a download link.'+#13+#10+#13+#10'Do you want to proceed with the setup anyway?', mbCriticalError, MB_YESNO or MB_DEFBUTTON2) = IDNO) then
   begin
-    Result := False;
+    Result := False
-    Exit;
+    Exit
   end;
   
   if (TDIsVCMissing() or (ForceRedistPrompt = '1')) and (MsgBox('Microsoft Visual C++ 2015 appears to be missing, would you like to automatically install it?', mbConfirmation, MB_YESNO) = IDYES) then
   begin
-    idpAddFile('https://github.com/{#MyAppPublisher}/{#MyAppName}/{#VCRedistLink}', ExpandConstant('{tmp}\{#MyAppName}.VC.exe'));
+    idpAddFile('https://github.com/{#MyAppPublisher}/{#MyAppName}/{#VCRedistLink}', ExpandConstant('{tmp}\{#MyAppName}.VC.exe'))
   end;
   
-  Result := True;
+  Result := True
 end;
 
 { Set the installation path if updating, and prepare download plugin if there are any files to download. }
@@ -77,12 +90,12 @@ procedure InitializeWizard();
 begin
   if (UpdatePath <> '') then
   begin
-    WizardForm.DirEdit.Text := UpdatePath;
+    WizardForm.DirEdit.Text := UpdatePath
   end;
   
   if (idpFilesCount <> 0) then
   begin
-    idpDownloadAfter(wpReady);
+    idpDownloadAfter(wpReady)
   end;
 end;
 
@@ -92,6 +105,16 @@ begin
   Result := (PageID = wpSelectDir) and (UpdatePath <> '')
 end;
 
+{ Check the dev tools task if already installed. }
+procedure CurPageChanged(CurPageID: Integer);
+begin
+  if (CurPageID = wpSelectTasks) and (not VisitedTasksPage) then
+  begin
+    WizardForm.TasksList.Checked[WizardForm.TasksList.Items.Count-1] := FileExists(ExpandConstant('{app}\devtools_resources.pak'))
+    VisitedTasksPage := True
+  end;
+end;
+
 { Install VC++ if downloaded, and create a 'makeportable' file for portable installs. }
 procedure CurStepChanged(CurStep: TSetupStep);
 begin
@@ -104,7 +127,7 @@ begin
     begin
       if MsgBox('Could not create a ''makeportable'' file in the installation folder. If the file is not present, the installation will not be fully portable.', mbCriticalError, MB_RETRYCANCEL) <> IDRETRY then
       begin
-        break;
+        break
       end;
     end;
   end;
@@ -117,11 +140,11 @@ var FrameworkVersion: Cardinal;
 begin
   if RegQueryDWordValue(HKEY_LOCAL_MACHINE, 'Software\Microsoft\NET Framework Setup\NDP\v4\Full', 'Release', FrameworkVersion) then
   begin
-    Result := FrameworkVersion;
+    Result := FrameworkVersion
-    Exit;
+    Exit
   end;
   
-  Result := 0;
+  Result := 0
 end;
 
 { Check if Visual C++ 2015 or 2017 is installed. }
@@ -136,20 +159,20 @@ begin
   begin
     for Index := 0 to GetArrayLength(Keys)-1 do
     begin
-      Key := Keys[Index];
+      Key := Keys[Index]
       
       if RegQueryStringValue(HKEY_LOCAL_MACHINE, 'Software\Classes\Installer\Dependencies\'+Key, 'DisplayName', DisplayName) then
       begin
         if (Pos('Microsoft Visual C++', DisplayName) = 1) and (Pos('(x86)', DisplayName) > 1) and ((Pos(' 2015 ', DisplayName) > 1) or (Pos(' 2017 ', DisplayName) > 1)) then
         begin
-          Result := False;
+          Result := False
-          Exit;
+          Exit
         end;
       end;
     end;
   end;
   
-  Result := True;
+  Result := True
 end;
 
 { Run the Visual C++ installer if downloaded. }
@@ -162,26 +185,26 @@ begin
   
   if FileExists(InstallFile) then
   begin
-    WizardForm.ProgressGauge.Style := npbstMarquee;
+    WizardForm.ProgressGauge.Style := npbstMarquee
     
     try
       if Exec(InstallFile, '/passive /norestart', '', SW_SHOW, ewWaitUntilTerminated, ResultCode) then
       begin
         if ResultCode <> 0 then
         begin
-          DeleteFile(InstallFile);
+          DeleteFile(InstallFile)
-          Exit;
+          Exit
         end;
       end else
       begin
         MsgBox('Could not run the Visual C++ installer, please visit https://github.com/{#MyAppPublisher}/{#MyAppName}/{#VCRedistLink} and download the latest version manually. Error: '+SysErrorMessage(ResultCode), mbCriticalError, MB_OK);
         
-        DeleteFile(InstallFile);
+        DeleteFile(InstallFile)
-        Exit;
+        Exit
       end;
     finally
-      WizardForm.ProgressGauge.Style := npbstNormal;
+      WizardForm.ProgressGauge.Style := npbstNormal
-      DeleteFile(InstallFile);
+      DeleteFile(InstallFile)
     end;
   end;
 end;

bld/gen_upd.iss

@@ -13,7 +13,7 @@
 
 [Setup]
 AppId={{{#MyAppID}}
-AppName={#MyAppName} Update
+AppName={#MyAppName}
 AppVersion={#MyAppVersion}
 AppVerName={#MyAppName} {#MyAppVersion}
 AppPublisher={#MyAppPublisher}
@@ -25,11 +25,14 @@ DefaultGroupName={#MyAppName}
 OutputBaseFilename={#MyAppName}.Update
 VersionInfoVersion={#MyAppVersion}
 SetupIconFile=.\Resources\icon.ico
+CloseApplicationsFilter=*.exe,*.dll,*.pak
+RestartApplications=False
 Uninstallable=TDIsUninstallable
 UninstallDisplayName={#MyAppName}
 UninstallDisplayIcon={app}\{#MyAppExeName}
 PrivilegesRequired=lowest
 Compression=lzma/normal
+LZMADictionarySize=512
 SolidCompression=True
 InternalCompressLevel=normal
 MinVersion=0,6.1
@@ -60,63 +63,10 @@ Type: filesandordirs; Name: "{localappdata}\{#MyAppName}\Cache"
 Type: filesandordirs; Name: "{localappdata}\{#MyAppName}\GPUCache"
 
 [InstallDelete]
-Type: files; Name: "{app}\msvcp120.dll"
+Type: files; Name: "{app}\CEFSHARP-LICENSE.txt"
-Type: files; Name: "{app}\msvcr120.dll"
+Type: files; Name: "{app}\LICENSE.txt"
-Type: files; Name: "{app}\TweetLib.Audio.dll"
 Type: filesandordirs; Name: "{app}\scripts"
 Type: filesandordirs; Name: "{app}\plugins\official"
-Type: files; Name: "{app}\locales\am.pak"
-Type: files; Name: "{app}\locales\ar.pak"
-Type: files; Name: "{app}\locales\bg.pak"
-Type: files; Name: "{app}\locales\bn.pak"
-Type: files; Name: "{app}\locales\ca.pak"
-Type: files; Name: "{app}\locales\cs.pak"
-Type: files; Name: "{app}\locales\da.pak"
-Type: files; Name: "{app}\locales\de.pak"
-Type: files; Name: "{app}\locales\el.pak"
-Type: files; Name: "{app}\locales\en-GB.pak"
-Type: files; Name: "{app}\locales\es-419.pak"
-Type: files; Name: "{app}\locales\es.pak"
-Type: files; Name: "{app}\locales\et.pak"
-Type: files; Name: "{app}\locales\fa.pak"
-Type: files; Name: "{app}\locales\fi.pak"
-Type: files; Name: "{app}\locales\fil.pak"
-Type: files; Name: "{app}\locales\fr.pak"
-Type: files; Name: "{app}\locales\gu.pak"
-Type: files; Name: "{app}\locales\he.pak"
-Type: files; Name: "{app}\locales\hi.pak"
-Type: files; Name: "{app}\locales\hr.pak"
-Type: files; Name: "{app}\locales\hu.pak"
-Type: files; Name: "{app}\locales\id.pak"
-Type: files; Name: "{app}\locales\it.pak"
-Type: files; Name: "{app}\locales\ja.pak"
-Type: files; Name: "{app}\locales\kn.pak"
-Type: files; Name: "{app}\locales\ko.pak"
-Type: files; Name: "{app}\locales\lt.pak"
-Type: files; Name: "{app}\locales\lv.pak"
-Type: files; Name: "{app}\locales\ml.pak"
-Type: files; Name: "{app}\locales\mr.pak"
-Type: files; Name: "{app}\locales\ms.pak"
-Type: files; Name: "{app}\locales\nb.pak"
-Type: files; Name: "{app}\locales\nl.pak"
-Type: files; Name: "{app}\locales\pl.pak"
-Type: files; Name: "{app}\locales\pt-BR.pak"
-Type: files; Name: "{app}\locales\pt-PT.pak"
-Type: files; Name: "{app}\locales\ro.pak"
-Type: files; Name: "{app}\locales\ru.pak"
-Type: files; Name: "{app}\locales\sk.pak"
-Type: files; Name: "{app}\locales\sl.pak"
-Type: files; Name: "{app}\locales\sr.pak"
-Type: files; Name: "{app}\locales\sv.pak"
-Type: files; Name: "{app}\locales\sw.pak"
-Type: files; Name: "{app}\locales\ta.pak"
-Type: files; Name: "{app}\locales\te.pak"
-Type: files; Name: "{app}\locales\th.pak"
-Type: files; Name: "{app}\locales\tr.pak"
-Type: files; Name: "{app}\locales\uk.pak"
-Type: files; Name: "{app}\locales\vi.pak"
-Type: files; Name: "{app}\locales\zh-CN.pak"
-Type: files; Name: "{app}\locales\zh-TW.pak"
 
 [Code]
 function TDIsUninstallable: Boolean; forward;
@@ -139,33 +89,34 @@ begin
   
   if UpdatePath = '' then
   begin
-    MsgBox('{#MyAppName} installation could not be found on your system.', mbCriticalError, MB_OK);
+    MsgBox('{#MyAppName} installation could not be found on your system.', mbCriticalError, MB_OK)
-    Result := False;
+    Result := False
-    Exit;
+    Exit
   end;
   
   if not TDIsMatchingCEFVersion() then
   begin
-    idpAddFile('https://github.com/{#MyAppPublisher}/{#MyAppName}/releases/download/'+TDGetAppVersionClean()+'/'+TDGetFullDownloadFileName(), ExpandConstant('{tmp}\{#MyAppName}.Full.exe'));
+    idpAddFile('https://github.com/{#MyAppPublisher}/{#MyAppName}/releases/download/'+TDGetAppVersionClean()+'/'+TDGetFullDownloadFileName(), ExpandConstant('{tmp}\{#MyAppName}.Full.exe'))
   end;
   
   if (TDGetNetFrameworkVersion() < 379893) and (MsgBox('{#MyAppName} requires .NET Framework 4.5.2 or newer,'+#13+#10+'please visit {#MyAppShortURL} for a download link.'+#13+#10+#13+#10'Do you want to proceed with the setup anyway?', mbCriticalError, MB_YESNO or MB_DEFBUTTON2) = IDNO) then
   begin
-    Result := False;
+    Result := False
-    Exit;
+    Exit
   end;
   
-  Result := True;
+  Result := True
 end;
 
 { Prepare download plugin if there are any files to download, and set the installation path. }
 procedure InitializeWizard();
 begin
-  WizardForm.DirEdit.Text := UpdatePath;
+  WizardForm.Caption := WizardForm.Caption + ' Update'
+  WizardForm.DirEdit.Text := UpdatePath
   
   if idpFilesCount <> 0 then
   begin
-    idpDownloadAfter(wpReady);
+    idpDownloadAfter(wpReady)
   end;
 end;
 
@@ -177,14 +128,14 @@ var PluginDataFolder: String;
 begin
   if CurUninstallStep = usPostUninstall then
   begin
-    ProfileDataFolder := ExpandConstant('{localappdata}\{#MyAppName}');
+    ProfileDataFolder := ExpandConstant('{localappdata}\{#MyAppName}')
-    PluginDataFolder := ExpandConstant('{app}\plugins');
+    PluginDataFolder := ExpandConstant('{app}\plugins')
     
     if (DirExists(ProfileDataFolder) or DirExists(PluginDataFolder)) and (MsgBox('Do you also want to delete your {#MyAppName} profile and plugins?', mbConfirmation, MB_YESNO or MB_DEFBUTTON2) = IDYES) then
     begin
-      DelTree(ProfileDataFolder, True, True, True);
+      DelTree(ProfileDataFolder, True, True, True)
-      DelTree(PluginDataFolder, True, True, True);
+      DelTree(PluginDataFolder, True, True, True)
-      DelTree(ExpandConstant('{app}'), True, False, False);
+      DelTree(ExpandConstant('{app}'), True, False, False)
     end;
   end;
 end;
@@ -194,12 +145,12 @@ procedure CurStepChanged(CurStep: TSetupStep);
 begin
   if CurStep = ssInstall then
   begin
-    TDExecuteFullDownload();
+    TDExecuteFullDownload()
     
     if TDIsUninstallable() then
     begin
-      DeleteFile(ExpandConstant('{app}\unins000.dat'));
+      DeleteFile(ExpandConstant('{app}\unins000.dat'))
-      DeleteFile(ExpandConstant('{app}\unins000.exe'));
+      DeleteFile(ExpandConstant('{app}\unins000.exe'))
     end;
   end;
 end;
@@ -213,6 +164,7 @@ end;
 { Returns a string used for arguments when running the app after update. }
 function TDGetRunArgs(Param: String): String;
 var Args: String;
+
 begin
   Args := ExpandConstant('{param:RUNARGS}')
   StringChangeEx(Args, '::', '"', True)
@@ -254,11 +206,11 @@ var FrameworkVersion: Cardinal;
 begin
   if RegQueryDWordValue(HKEY_LOCAL_MACHINE, 'Software\Microsoft\NET Framework Setup\NDP\v4\Full', 'Release', FrameworkVersion) then
   begin
-    Result := FrameworkVersion;
+    Result := FrameworkVersion
-    Exit;
+    Exit
   end;
   
-  Result := 0;
+  Result := 0
 end;
 
 { Return the name of the full installer file to download from GitHub. }
@@ -270,15 +222,8 @@ end;
 { Return whether the version of the installed libcef.dll library matches internal one. }
 function TDIsMatchingCEFVersion: Boolean;
 var CEFVersion: String;
-var TmpTDVersion: String;
 
 begin
-  if GetVersionNumbersString(UpdatePath+'TweetDuck.exe', TmpTDVersion) and (CompareStr(TmpTDVersion, '1.13.0.0') = 0) then
-  begin
-    Result := False;
-    Exit;
-  end;
-  
   Result := (GetVersionNumbersString(UpdatePath+'libcef.dll', CEFVersion) and (CompareStr(CEFVersion, '{#CefVersion}') = 0))
 end;
 
@@ -292,17 +237,17 @@ begin
   
   while True do
   begin
-    Substr := Copy(CleanVersion, Length(CleanVersion)-1, 2);
+    Substr := Copy(CleanVersion, Length(CleanVersion)-1, 2)
     
     if (CompareStr(Substr, '.0') <> 0) then
     begin
-      break;
+      break
     end;
     
-    CleanVersion := Copy(CleanVersion, 1, Length(CleanVersion)-2);
+    CleanVersion := Copy(CleanVersion, 1, Length(CleanVersion)-2)
   end;
   
-  Result := CleanVersion;
+  Result := CleanVersion
 end;
 
 { Run the full package installer if downloaded. }
@@ -315,28 +260,28 @@ begin
   
   if FileExists(InstallFile) then
   begin
-    WizardForm.ProgressGauge.Style := npbstMarquee;
+    WizardForm.ProgressGauge.Style := npbstMarquee
     
     try
-      if Exec(InstallFile, '/SP- /SILENT /MERGETASKS="!desktopicon" /UPDATEPATH="'+UpdatePath+'"', '', SW_SHOW, ewWaitUntilTerminated, ResultCode) then
+      if Exec(InstallFile, '/SP- /SILENT /FORCECLOSEAPPLICATIONS /UPDATEPATH="'+UpdatePath+'"', '', SW_SHOW, ewWaitUntilTerminated, ResultCode) then
       begin
         if ResultCode <> 0 then
         begin
-          DeleteFile(InstallFile);
+          DeleteFile(InstallFile)
-          Abort();
+          Abort()
-          Exit;
+          Exit
         end;
       end else
       begin
-        MsgBox('Could not run the full installer, please visit {#MyAppURL} and download the latest version manually. Error: '+SysErrorMessage(ResultCode), mbCriticalError, MB_OK);
+        MsgBox('Could not run the full installer, please visit {#MyAppURL} and download the latest version manually. Error: '+SysErrorMessage(ResultCode), mbCriticalError, MB_OK)
         
-        DeleteFile(InstallFile);
+        DeleteFile(InstallFile)
-        Abort();
+        Abort()
-        Exit;
+        Exit
       end;
     finally
-      WizardForm.ProgressGauge.Style := npbstNormal;
+      WizardForm.ProgressGauge.Style := npbstNormal
-      DeleteFile(InstallFile);
+      DeleteFile(InstallFile)
     end;
   end;
 end;

packages.config

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="cef.redist.x64" version="3.3282.1731" targetFramework="net452" xmlns="" />
+  <package id="cef.redist.x64" version="3.3359.1772" targetFramework="net452" />
-  <package id="cef.redist.x86" version="3.3282.1731" targetFramework="net452" xmlns="" />
+  <package id="cef.redist.x86" version="3.3359.1772" targetFramework="net452" />
-  <package id="CefSharp.Common" version="64.0.0-CI2508" targetFramework="net452" xmlns="" />
+  <package id="CefSharp.Common" version="66.0.0-CI2629" targetFramework="net452" />
-  <package id="CefSharp.WinForms" version="64.0.0-CI2508" targetFramework="net452" xmlns="" />
+  <package id="CefSharp.WinForms" version="66.0.0-CI2629" targetFramework="net452" />
 </packages>

subprocess/TweetDuck.Browser.csproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -26,9 +26,9 @@
     <StartupObject />
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CefSharp.BrowserSubprocess.Core, Version=64.0.0.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=x86">
+    <Reference Include="CefSharp.BrowserSubprocess.Core, Version=66.0.0.0, Culture=neutral, PublicKeyToken=40c4b6fc221f4138, processorArchitecture=x86">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\CefSharp.Common.64.0.0-CI2508\CefSharp\x86\CefSharp.BrowserSubprocess.Core.dll</HintPath>
+      <HintPath>..\packages\CefSharp.Common.66.0.0-CI2629\CefSharp\x86\CefSharp.BrowserSubprocess.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
   </ItemGroup>

video/FormPlayer.Designer.cs

@@ -106,10 +106,11 @@
             // labelTime
             // 
             this.labelTime.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.labelTime.Location = new System.Drawing.Point(138, 2);
+            this.labelTime.Font = new System.Drawing.Font("Segoe UI", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelTime.Margin = new System.Windows.Forms.Padding(0, 2, 0, 5);
+            this.labelTime.Location = new System.Drawing.Point(138, 3);
+            this.labelTime.Margin = new System.Windows.Forms.Padding(0, 3, 0, 5);
             this.labelTime.Name = "labelTime";
-            this.labelTime.Size = new System.Drawing.Size(74, 27);
+            this.labelTime.Size = new System.Drawing.Size(74, 26);
             this.labelTime.TabIndex = 1;
             this.labelTime.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
             // 
@@ -121,13 +122,13 @@
             // labelTooltip
             // 
             this.labelTooltip.AutoSize = true;
-            this.labelTooltip.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelTooltip.Font = new System.Drawing.Font("Segoe UI Semibold", 9F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.labelTooltip.ForeColor = System.Drawing.Color.White;
             this.labelTooltip.Location = new System.Drawing.Point(0, 0);
             this.labelTooltip.Margin = new System.Windows.Forms.Padding(0, 2, 0, 0);
             this.labelTooltip.Name = "labelTooltip";
             this.labelTooltip.Padding = new System.Windows.Forms.Padding(4, 2, 2, 2);
-            this.labelTooltip.Size = new System.Drawing.Size(6, 20);
+            this.labelTooltip.Size = new System.Drawing.Size(6, 19);
             this.labelTooltip.TabIndex = 2;
             this.labelTooltip.Visible = false;
             // 

video/Program.cs

@@ -5,7 +5,7 @@ using System.Windows.Forms;
 
 namespace TweetDuck.Video{
     static class Program{
-        internal const string Version = "1.2.2.1";
+        internal const string Version = "1.2.2.2";
 
         // referenced in VideoPlayer
         // set by task manager -- public const int CODE_PROCESS_KILLED = 1;