Fix FormMessage not scaling well with high DPI

Closes #135

Configuration/Arguments.cs

@@ -1,7 +1,7 @@
 using System;
-using TweetDck.Core.Utils;
+using TweetDuck.Core.Utils;
 
-namespace TweetDck.Configuration{
+namespace TweetDuck.Configuration{
     static class Arguments{
         // public args
         public const string ArgDataFolder = "-datafolder";
@@ -12,6 +12,7 @@ namespace TweetDck.Configuration{
         // internal args
         public const string ArgRestart = "-restart";
         public const string ArgImportCookies = "-importcookies";
+        public const string ArgUpdated = "-updated";
 
         // class data and methods
         private static readonly CommandLineArgs Current = CommandLineArgs.FromStringArray('-', Environment.GetCommandLineArgs());
@@ -28,7 +29,18 @@ namespace TweetDck.Configuration{
             CommandLineArgs args = Current.Clone();
             args.RemoveFlag(ArgRestart);
             args.RemoveFlag(ArgImportCookies);
+            args.RemoveFlag(ArgUpdated);
             return args;
         }
+
+        public static CommandLineArgs GetCurrentForInstaller(){
+            CommandLineArgs args = GetCurrentClean();
+            args.AddFlag(ArgUpdated);
+            return args;
+        }
+
+        public static string GetCurrentForInstallerCmd(){
+            return GetCurrentForInstaller().ToString().Replace("\"", "::");
+        }
     }
 }

Configuration/LockManager.cs

@@ -2,9 +2,9 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
-using TweetDck.Core.Utils;
+using TweetDuck.Core.Utils;
 
-namespace TweetDck.Configuration{
+namespace TweetDuck.Configuration{
     sealed class LockManager{
         public enum Result{
             Success, HasProcess, Fail

Configuration/SystemConfig.cs

@@ -0,0 +1,66 @@
+using System;
+using System.IO;
+
+namespace TweetDuck.Configuration{
+    sealed class SystemConfig{
+        public static readonly bool IsHardwareAccelerationSupported = File.Exists(Path.Combine(Program.ProgramPath, "libEGL.dll")) &&
+                                                                      File.Exists(Path.Combine(Program.ProgramPath, "libGLESv2.dll"));
+
+        public bool HardwareAcceleration{
+            get => hardwareAcceleration && IsHardwareAccelerationSupported;
+            set => hardwareAcceleration = value;
+        }
+
+        private readonly string file;
+
+        private bool hardwareAcceleration;
+        
+        private SystemConfig(string file){
+            this.file = file;
+
+            HardwareAcceleration = true;
+        }
+
+        private void WriteToStream(Stream stream){
+            stream.WriteByte((byte)(HardwareAcceleration ? 1 : 0));
+        }
+
+        private void ReadFromStream(Stream stream){
+            HardwareAcceleration = stream.ReadByte() > 0;
+        }
+
+        public bool Save(){
+            try{
+                string directory = Path.GetDirectoryName(file);
+                if (directory == null)return false;
+
+                Directory.CreateDirectory(directory);
+
+                using(Stream stream = new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.None)){
+                    WriteToStream(stream);
+                }
+
+                return true;
+            }catch(Exception e){
+                Program.Reporter.HandleException("Configuration Error", "Could not save the system configuration file.", true, e);
+                return false;
+            }
+        }
+        
+        public static SystemConfig Load(string file){
+            SystemConfig config = new SystemConfig(file);
+            
+            try{
+                using(Stream stream = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read)){
+                    config.ReadFromStream(stream);
+                }
+            }catch(FileNotFoundException){
+            }catch(DirectoryNotFoundException){
+            }catch(Exception e){
+                Program.Reporter.HandleException("Configuration Error", "Could not open the system configuration file. If you continue, you will lose system specific configuration such as Hardware Acceleration.", true, e);
+            }
+
+            return config;
+        }
+    }
+}

Configuration/UserConfig.cs

@@ -3,93 +3,98 @@ using System.Drawing;
 using System.IO;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters.Binary;
-using TweetDck.Core;
+using TweetDuck.Core;
-using TweetDck.Core.Controls;
+using TweetDuck.Core.Controls;
-using TweetDck.Core.Notification;
+using TweetDuck.Core.Notification;
-using TweetDck.Core.Utils;
+using TweetDuck.Core.Utils;
-using TweetDck.Plugins;
 
-namespace TweetDck.Configuration{
+namespace TweetDuck.Configuration{
     [Serializable]
     sealed class UserConfig{
-        private static readonly IFormatter Formatter = new BinaryFormatter();
+        private static readonly IFormatter Formatter = new BinaryFormatter{ Binder = new LegacyBinder() };
 
-        private const int CurrentFileVersion = 7;
+        private class LegacyBinder : SerializationBinder{
+            public override Type BindToType(string assemblyName, string typeName){
+                return Type.GetType(string.Format("{0}, {1}", typeName.Replace("TweetDck", "TweetDuck"), assemblyName.Replace("TweetDck", "TweetDuck")));
+            }
+        }
+
+        private const int CurrentFileVersion = 11;
 
         // START OF CONFIGURATION
 
         public WindowState BrowserWindow { get; set; }
+        public WindowState PluginsWindow { get; set; }
+
         public bool DisplayNotificationColumn { get; set; }
         public bool DisplayNotificationTimer { get; set; }
         public bool NotificationTimerCountDown { get; set; }
         public bool NotificationSkipOnLinkClick { get; set; }
         public bool NotificationNonIntrusiveMode { get; set; }
 
+        public int NotificationIdlePauseSeconds { get; set; }
+        public int NotificationDurationValue { get; set; }
+        public int NotificationScrollSpeed { get; set; }
+
         public TweetNotification.Position NotificationPosition { get; set; }
         public Point CustomNotificationPosition { get; set; }
         public int NotificationEdgeDistance { get; set; }
         public int NotificationDisplay { get; set; }
-        public int NotificationIdlePauseSeconds { get; set; }
+
-        public int NotificationDurationValue { get; set; }
+        public TweetNotification.Size NotificationSize { get; set; }
+        public Size CustomNotificationSize { get; set; }
 
         public bool EnableSpellCheck { get; set; }
         public bool ExpandLinksOnHover { get; set; }
+        public bool SwitchAccountSelectors { get; set; }
         public bool EnableTrayHighlight { get; set; }
 
         public bool EnableUpdateCheck { get; set; }
         public string DismissedUpdate { get; set; }
 
-        public PluginConfig Plugins { get; private set; }
-        public WindowState PluginsWindow { get; set; }
-
         public string CustomCefArgs { get; set; }
         public string CustomBrowserCSS { get; set; }
         public string CustomNotificationCSS { get; set; }
 
-        public bool IsCustomNotificationPositionSet{
+        public bool IsCustomNotificationPositionSet => CustomNotificationPosition != ControlExtensions.InvisibleLocation;
-            get{
+        public bool IsCustomNotificationSizeSet => CustomNotificationSize != Size.Empty;
-                return CustomNotificationPosition != ControlExtensions.InvisibleLocation;
+
-            }
+        public string NotificationSoundPath{
+            get => string.IsNullOrEmpty(notificationSoundPath) ? string.Empty : notificationSoundPath;
+            set => notificationSoundPath = value;
         }
 
         public bool MuteNotifications{
-            get{
+            get => muteNotifications;
-                return muteNotifications;
-            }
 
             set{
-                if (muteNotifications == value)return;
+                if (muteNotifications != value){
-
                     muteNotifications = value;
-
+                    MuteToggled?.Invoke(this, new EventArgs());
-                if (MuteToggled != null){
-                    MuteToggled(this, new EventArgs());
                 }
             }
         }
 
-        public string NotificationSoundPath{
+        public int ZoomLevel{
-            get{
+            get => zoomLevel;
-                return string.IsNullOrEmpty(notificationSoundPath) ? string.Empty : notificationSoundPath;
-            }
 
             set{
-                notificationSoundPath = value;
+                if (zoomLevel != value){
+                    zoomLevel = value;
+                    ZoomLevelChanged?.Invoke(this, new EventArgs());
                 }
             }
+        }
+
+        public double ZoomMultiplier => zoomLevel/100.0;
 
         public TrayIcon.Behavior TrayBehavior{
-            get{
+            get => trayBehavior;
-                return trayBehavior;
-            }
 
             set{
-                if (trayBehavior == value)return;
+                if (trayBehavior != value){
-
                     trayBehavior = value;
-
+                    TrayBehaviorChanged?.Invoke(this, new EventArgs());
-                if (TrayBehaviorChanged != null){
-                    TrayBehaviorChanged(this, new EventArgs());
                 }
             }
         }
@@ -99,6 +104,9 @@ namespace TweetDck.Configuration{
         [field:NonSerialized]
         public event EventHandler MuteToggled;
         
+        [field:NonSerialized]
+        public event EventHandler ZoomLevelChanged;
+        
         [field:NonSerialized]
         public event EventHandler TrayBehaviorChanged;
 
@@ -107,6 +115,7 @@ namespace TweetDck.Configuration{
 
         private int fileVersion;
         private bool muteNotifications;
+        private int zoomLevel;
         private string notificationSoundPath;
         private TrayIcon.Behavior trayBehavior;
 
@@ -114,20 +123,20 @@ namespace TweetDck.Configuration{
             this.file = file;
 
             BrowserWindow = new WindowState();
+            ZoomLevel = 100;
             DisplayNotificationTimer = true;
             NotificationNonIntrusiveMode = true;
             NotificationPosition = TweetNotification.Position.TopRight;
             CustomNotificationPosition = ControlExtensions.InvisibleLocation;
+            NotificationSize = TweetNotification.Size.Auto;
             NotificationEdgeDistance = 8;
             NotificationDurationValue = 25;
+            NotificationScrollSpeed = 100;
             EnableUpdateCheck = true;
             ExpandLinksOnHover = true;
+            SwitchAccountSelectors = true;
             EnableTrayHighlight = true;
-            Plugins = new PluginConfig();
             PluginsWindow = new WindowState();
-
-            Plugins.DisableOfficialFromConfig("clear-columns");
-            Plugins.DisableOfficialFromConfig("reply-account");
         }
 
         private void UpgradeFile(){
@@ -149,7 +158,6 @@ namespace TweetDck.Configuration{
 
             if (fileVersion == 2){
                 BrowserWindow = new WindowState();
-                Plugins = new PluginConfig();
                 PluginsWindow = new WindowState();
                 ++fileVersion;
             }
@@ -161,8 +169,6 @@ namespace TweetDck.Configuration{
             }
 
             if (fileVersion == 4){
-                Plugins.DisableOfficialFromConfig("clear-columns");
-                Plugins.DisableOfficialFromConfig("reply-account");
                 ++fileVersion;
             }
 
@@ -175,6 +181,26 @@ namespace TweetDck.Configuration{
                 ++fileVersion;
             }
 
+            if (fileVersion == 7){
+                ZoomLevel = 100;
+                ++fileVersion;
+            }
+
+            if (fileVersion == 8){
+                SwitchAccountSelectors = true;
+                ++fileVersion;
+            }
+
+            if (fileVersion == 9){
+                NotificationScrollSpeed = 100;
+                ++fileVersion;
+            }
+
+            if (fileVersion == 10){
+                NotificationSize = TweetNotification.Size.Auto;
+                ++fileVersion;
+            }
+
             // update the version
             fileVersion = CurrentFileVersion;
             Save();
@@ -216,10 +242,7 @@ namespace TweetDck.Configuration{
                         }
                     }
 
-                    if (config != null){
+                    config?.UpgradeFile();
-                        config.UpgradeFile();
-                    }
-
                     break;
                 }catch(FileNotFoundException){
                 }catch(DirectoryNotFoundException){
@@ -230,7 +253,7 @@ namespace TweetDck.Configuration{
                         Program.Reporter.Log(e.ToString());
                     }
                     else if (firstException != null){
-                        Program.Reporter.HandleException("Configuration Error", "Could not open the backup configuration file. If you continue, you may lose your settings and list of enabled plugins.", true, e);
+                        Program.Reporter.HandleException("Configuration Error", "Could not open the backup configuration file. If you continue, your program options will be reset.", true, e);
                     }
                 }
             }

Core/Bridge/CallbackBridge.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Windows.Forms;
-using TweetDck.Core.Controls;
+using TweetDuck.Core.Controls;
 
-namespace TweetDck.Core.Bridge{
+namespace TweetDuck.Core.Bridge{
     sealed class CallbackBridge{
         private readonly Control owner;
         private readonly Action safeCallback;

Core/Bridge/PropertyBridge.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Text;
 
-namespace TweetDck.Core.Bridge{
+namespace TweetDuck.Core.Bridge{
     static class PropertyBridge{
         [Flags]
         public enum Properties{
@@ -9,7 +9,8 @@ namespace TweetDck.Core.Bridge{
             MuteNotifications = 2,
             HasCustomNotificationSound = 4,
             SkipOnLinkClick = 8,
-            AllBrowser = ExpandLinksOnHover | MuteNotifications | HasCustomNotificationSound,
+            SwitchAccountSelectors = 16,
+            AllBrowser = ExpandLinksOnHover | SwitchAccountSelectors | MuteNotifications | HasCustomNotificationSound,
             AllNotification = ExpandLinksOnHover | SkipOnLinkClick
         }
 
@@ -21,6 +22,10 @@ namespace TweetDck.Core.Bridge{
                 build.Append("c.expandLinksOnHover=").Append(Program.UserConfig.ExpandLinksOnHover ? "true;" : "false;");
             }
 
+            if (properties.HasFlag(Properties.SwitchAccountSelectors)){
+                build.Append("c.switchAccountSelectors=").Append(Program.UserConfig.SwitchAccountSelectors ? "true;" : "false;");
+            }
+
             if (properties.HasFlag(Properties.MuteNotifications)){
                 build.Append("c.muteNotifications=").Append(Program.UserConfig.MuteNotifications ? "true;" : "false;");
             }

Core/Bridge/TweetDeckBridge.cs

@@ -1,9 +1,9 @@
 using System.Windows.Forms;
-using TweetDck.Core.Controls;
+using TweetDuck.Core.Controls;
-using TweetDck.Core.Notification;
+using TweetDuck.Core.Notification;
-using TweetDck.Core.Utils;
+using TweetDuck.Core.Utils;
 
-namespace TweetDck.Core.Bridge{
+namespace TweetDuck.Core.Bridge{
     sealed class TweetDeckBridge{
         public static string LastRightClickedLink = string.Empty;
         public static string LastHighlightedTweet = string.Empty;
@@ -83,6 +83,10 @@ namespace TweetDck.Core.Bridge{
             form.InvokeAsyncSafe(WindowsUtils.ClipboardStripHtmlStyles);
         }
 
+        public int GetIdleSeconds(){
+            return NativeMethods.GetIdleSeconds();
+        }
+
         public void OpenBrowser(string url){
             BrowserUtils.OpenExternalBrowser(url);
         }
@@ -100,6 +104,13 @@ namespace TweetDck.Core.Bridge{
             MessageBox.Show(contents, Program.BrandName+" Browser Message", MessageBoxButtons.OK, icon);
         }
 
+        public void CrashDebug(string message){
+            #if DEBUG
+            Log(message);
+            System.Diagnostics.Debugger.Break();
+            #endif
+        }
+
         public void Log(string data){
             System.Diagnostics.Debug.WriteLine(data);
         }

Core/Controls/ControlExtensions.cs

@@ -1,9 +1,10 @@
 using System;
 using System.Drawing;
+using System.Linq;
 using System.Windows.Forms;
-using TweetDck.Core.Utils;
+using TweetDuck.Core.Utils;
 
-namespace TweetDck.Core.Controls{
+namespace TweetDuck.Core.Controls{
     static class ControlExtensions{
         public static readonly Point InvisibleLocation = new Point(-32000, -32000);
 
@@ -20,6 +21,16 @@ namespace TweetDck.Core.Controls{
             control.BeginInvoke(func);
         }
 
+        public static float GetDPIScale(this Control control){
+            using(Graphics graphics = control.CreateGraphics()){
+                return graphics.DpiY/96F;
+            }
+        }
+
+        public static bool IsFullyOutsideView(this Form form){
+            return !Screen.AllScreens.Any(screen => screen.WorkingArea.IntersectsWith(form.Bounds));
+        }
+
         public static void MoveToCenter(this Form targetForm, Form parentForm){
             targetForm.Location = new Point(parentForm.Location.X+parentForm.Width/2-targetForm.Width/2, parentForm.Location.Y+parentForm.Height/2-targetForm.Height/2);
         }
@@ -42,6 +53,14 @@ namespace TweetDck.Core.Controls{
             }
         }
 
+        public static bool AlignValueToTick(this TrackBar trackBar){
+            if (trackBar.Value % trackBar.SmallChange != 0){
+                trackBar.Value = trackBar.SmallChange*(int)Math.Floor(((double)trackBar.Value/trackBar.SmallChange)+0.5);
+                return false;
+            }
+            else return true;
+        }
+
         public static void SetElevated(this Button button){
             button.Text = " "+button.Text;
             button.FlatStyle = FlatStyle.System;

Core/Controls/FlatButton.cs

@@ -1,13 +1,9 @@
 using System;
 using System.Windows.Forms;
 
-namespace TweetDck.Core.Controls{
+namespace TweetDuck.Core.Controls{
     class FlatButton : Button{
-        protected override bool ShowFocusCues{
+        protected override bool ShowFocusCues => false;
-            get{
-                return false;
-            }
-        }
 
         public FlatButton(){
             GotFocus += FlatButton_GotFocus;

Core/Controls/FlatProgressBar.cs

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

Core/Controls/LabelVertical.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace TweetDuck.Core.Controls{
+    sealed class LabelVertical : Label{
+        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
+
+            using(Brush brush = new SolidBrush(ForeColor)){
+                foreach(char chr in Text){
+                    string str = chr.ToString();
+                    float x = (ClientRectangle.Width-e.Graphics.MeasureString(str, Font).Width)/2F;
+
+                    e.Graphics.DrawString(str, Font, brush, x, y);
+                    y += LineHeight;
+                }
+            }
+        }
+    }
+}

Core/Controls/TabButton.cs

@@ -1,25 +0,0 @@
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-
-namespace TweetDck.Core.Controls{
-    sealed class TabButton : FlatButton{
-        public Action Callback { get; private set; }
-
-        public void SetupButton(int locationX, int sizeWidth, string title, Action callback){
-            Callback = callback;
-
-            SuspendLayout();
-            FlatAppearance.BorderColor = Color.DimGray;
-            FlatAppearance.MouseDownBackColor = Color.White;
-            FlatAppearance.MouseOverBackColor = Color.White;
-            FlatStyle = FlatStyle.Flat;
-            Location = new Point(locationX, 0);
-            Margin = new Padding(0);
-            Size = new Size(sizeWidth, 30);
-            Text = title;
-            UseVisualStyleBackColor = true;
-            ResumeLayout(true);
-        }
-    }
-}

Core/Controls/TabPanel.Designer.cs

@@ -1,68 +0,0 @@
-namespace TweetDck.Core.Controls {
-    partial class TabPanel {
-        /// <summary> 
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing) {
-            if (disposing && (components != null)) {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Component Designer generated code
-
-        /// <summary> 
-        /// Required method for Designer support - do not modify 
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent() {
-            this.panelButtons = new System.Windows.Forms.Panel();
-            this.panelContent = new System.Windows.Forms.Panel();
-            this.SuspendLayout();
-            // 
-            // panelButtons
-            // 
-            this.panelButtons.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panelButtons.Location = new System.Drawing.Point(0, 0);
-            this.panelButtons.Margin = new System.Windows.Forms.Padding(0);
-            this.panelButtons.Name = "panelButtons";
-            this.panelButtons.Size = new System.Drawing.Size(640, 30);
-            this.panelButtons.TabIndex = 0;
-            // 
-            // panelContent
-            // 
-            this.panelContent.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.panelContent.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.panelContent.Location = new System.Drawing.Point(0, 29);
-            this.panelContent.Margin = new System.Windows.Forms.Padding(0);
-            this.panelContent.Name = "panelContent";
-            this.panelContent.Size = new System.Drawing.Size(640, 451);
-            this.panelContent.TabIndex = 1;
-            // 
-            // TabPanel
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.panelContent);
-            this.Controls.Add(this.panelButtons);
-            this.Name = "TabPanel";
-            this.Size = new System.Drawing.Size(640, 480);
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Panel panelButtons;
-        private System.Windows.Forms.Panel panelContent;
-    }
-}

Core/Controls/TabPanel.cs

@@ -1,62 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Linq;
-using System.Windows.Forms;
-
-namespace TweetDck.Core.Controls{
-    sealed partial class TabPanel : UserControl{
-        public IEnumerable<TabButton> Buttons{
-            get{
-                return panelButtons.Controls.Cast<TabButton>();
-            }
-        }
-
-        public TabButton ActiveButton { get; private set; }
-
-        // ReSharper disable once ConvertToAutoPropertyWithPrivateSetter
-        public Panel Content{
-            get{
-                return panelContent;
-            }
-        }
-
-        private int btnWidth;
-
-        public TabPanel(){
-            InitializeComponent();
-        }
-
-        public void SetupTabPanel(int buttonWidth){
-            this.btnWidth = buttonWidth;
-        }
-
-        public TabButton AddButton(string title, Action callback){
-            TabButton button = new TabButton();
-            button.SetupButton((btnWidth-1)*panelButtons.Controls.Count, btnWidth, title, callback);
-            button.Click += (sender, args) => SelectTab((TabButton)sender);
-
-            panelButtons.Controls.Add(button);
-            return button;
-        }
-
-        public void SelectTab(TabButton button){
-            if (ActiveButton != null){
-                ActiveButton.BackColor = SystemColors.Control;
-            }
-
-            button.BackColor = Color.White;
-            button.Callback();
-
-            ActiveButton = button;
-        }
-
-        public void ReplaceContent(Control newControl){
-            newControl.Dock = DockStyle.Fill;
-            Content.SuspendLayout();
-            Content.Controls.Clear();
-            Content.Controls.Add(newControl);
-            Content.ResumeLayout(true);
-        }
-    }
-}

Core/FormBrowser.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDck.Core {
+namespace TweetDuck.Core {
     sealed partial class FormBrowser {
         /// <summary>
         /// Required designer variable.
@@ -24,23 +24,31 @@
         /// </summary>
         private void InitializeComponent() {
             this.components = new System.ComponentModel.Container();
-            this.trayIcon = new TweetDck.Core.TrayIcon(this.components);
+            this.trayIcon = new TweetDuck.Core.TrayIcon(this.components);
             this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+            this.timerResize = new System.Windows.Forms.Timer(this.components);
             this.SuspendLayout();
             // 
+            // timerResize
+            // 
+            this.timerResize.Interval = 500;
+            this.timerResize.Tick += new System.EventHandler(this.timerResize_Tick);
+            // 
             // FormBrowser
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.BackColor = TweetDck.Core.Utils.BrowserUtils.BackgroundColor;
+            this.BackColor = TweetDuck.Core.Utils.BrowserUtils.BackgroundColor;
             this.ClientSize = new System.Drawing.Size(324, 386);
             this.Icon = Properties.Resources.icon;
-            this.Location = TweetDck.Core.Controls.ControlExtensions.InvisibleLocation;
+            this.Location = TweetDuck.Core.Controls.ControlExtensions.InvisibleLocation;
             this.MinimumSize = new System.Drawing.Size(340, 424);
             this.Name = "FormBrowser";
             this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
             this.Activated += new System.EventHandler(this.FormBrowser_Activated);
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FormBrowser_FormClosing);
+            this.FormClosed += new System.Windows.Forms.FormClosedEventHandler(this.FormBrowser_FormClosed);
+            this.LocationChanged += new System.EventHandler(this.FormBrowser_LocationChanged);
             this.ResizeEnd += new System.EventHandler(this.FormBrowser_ResizeEnd);
             this.Resize += new System.EventHandler(this.FormBrowser_Resize);
             this.ResumeLayout(false);
@@ -51,6 +59,7 @@
 
         private TrayIcon trayIcon;
         private System.Windows.Forms.ToolTip toolTip;
+        private System.Windows.Forms.Timer timerResize;
     }
 }
 

Core/FormBrowser.cs

@@ -1,33 +1,30 @@
-using System;
+using CefSharp;
-using System.Windows.Forms;
-using CefSharp;
 using CefSharp.WinForms;
-using TweetDck.Configuration;
+using System;
-using TweetDck.Core.Handling;
-using TweetDck.Core.Other;
-using TweetDck.Resources;
-using TweetDck.Core.Controls;
-using System.Drawing;
-using TweetDck.Core.Utils;
-using TweetDck.Updates;
-using TweetDck.Plugins;
-using TweetDck.Plugins.Enums;
-using TweetDck.Plugins.Events;
-using TweetDck.Core.Bridge;
-using TweetDck.Core.Notification;
-using TweetDck.Core.Notification.Screenshot;
-using TweetDck.Updates.Events;
 using System.Diagnostics;
+using System.Drawing;
 using System.Linq;
-using TweetDck.Core.Notification.Sound;
+using System.Windows.Forms;
+using TweetDuck.Configuration;
+using TweetDuck.Core.Bridge;
+using TweetDuck.Core.Controls;
+using TweetDuck.Core.Handling;
+using TweetDuck.Core.Notification;
+using TweetDuck.Core.Notification.Screenshot;
+using TweetDuck.Core.Other;
+using TweetDuck.Core.Other.Settings;
+using TweetDuck.Core.Utils;
+using TweetDuck.Plugins;
+using TweetDuck.Plugins.Enums;
+using TweetDuck.Plugins.Events;
+using TweetDuck.Resources;
+using TweetDuck.Updates;
+using TweetDuck.Updates.Events;
+using TweetLib.Audio.Utils;
 
-namespace TweetDck.Core{
+namespace TweetDuck.Core{
     sealed partial class FormBrowser : Form{
-        private static UserConfig Config{
+        private static UserConfig Config => Program.UserConfig;
-            get{
-                return Program.UserConfig;
-            }
-        }
 
         public string UpdateInstallerPath { get; private set; }
 
@@ -42,7 +39,7 @@ namespace TweetDck.Core{
         private FormWindowState prevState;
 
         private TweetScreenshotManager notificationScreenshotManager;
-        private ISoundNotificationPlayer soundNotification;
+        private SoundNotification soundNotification;
 
         public FormBrowser(PluginManager pluginManager, UpdaterSettings updaterSettings){
             InitializeComponent();
@@ -68,7 +65,8 @@ namespace TweetDck.Core{
             this.browser = new ChromiumWebBrowser("https://tweetdeck.twitter.com/"){
                 MenuHandler = new ContextMenuBrowser(this),
                 JsDialogHandler = new JavaScriptDialogHandler(),
-                LifeSpanHandler = new LifeSpanHandler()
+                LifeSpanHandler = new LifeSpanHandler(),
+                RequestHandler = new RequestHandlerBrowser()
             };
 
             #if DEBUG
@@ -93,13 +91,8 @@ namespace TweetDck.Core{
                 browser.Dispose();
                 contextMenu.Dispose();
 
-                if (notificationScreenshotManager != null){
+                notificationScreenshotManager?.Dispose();
-                    notificationScreenshotManager.Dispose();
+                soundNotification?.Dispose();
-                }
-
-                if (soundNotification != null){
-                    soundNotification.Dispose();
-                }
             };
 
             this.trayIcon.ClickRestore += trayIcon_ClickRestore;
@@ -109,8 +102,9 @@ namespace TweetDck.Core{
             UpdateTrayIcon();
 
             Config.MuteToggled += Config_MuteToggled;
+            Config.ZoomLevelChanged += Config_ZoomLevelChanged;
 
-            this.updates = new UpdateHandler(browser, this, updaterSettings);
+            this.updates = new UpdateHandler(browser, updaterSettings);
             this.updates.UpdateAccepted += updates_UpdateAccepted;
             this.updates.UpdateDismissed += updates_UpdateDismissed;
 
@@ -171,10 +165,16 @@ namespace TweetDck.Core{
         }
 
         private void browser_FrameLoadStart(object sender, FrameLoadStartEventArgs e){
-            if (e.Frame.IsMain && BrowserUtils.IsTwitterWebsite(e.Frame)){
+            if (e.Frame.IsMain){
+                if (Config.ZoomLevel != 100){
+                    BrowserUtils.SetZoomLevel(browser.GetBrowser(), Config.ZoomLevel);
+                }
+
+                if (BrowserUtils.IsTwitterWebsite(e.Frame)){
                     ScriptLoader.ExecuteFile(e.Frame, "twitter.js");
                 }
             }
+        }
 
         private void browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
             if (e.Frame.IsMain && BrowserUtils.IsTweetDeckWebsite(e.Frame)){
@@ -208,12 +208,23 @@ namespace TweetDck.Core{
             }
         }
 
+        private void timerResize_Tick(object sender, EventArgs e){
+            FormBrowser_ResizeEnd(this, e); // also stops timer
+        }
+
         private void FormBrowser_Activated(object sender, EventArgs e){
             if (!isLoaded)return;
 
             trayIcon.HasNotifications = false;
         }
 
+        private void FormBrowser_LocationChanged(object sender, EventArgs e){
+            if (!isLoaded)return;
+            
+            timerResize.Stop();
+            timerResize.Start();
+        }
+
         private void FormBrowser_Resize(object sender, EventArgs e){
             if (!isLoaded)return;
 
@@ -229,11 +240,17 @@ namespace TweetDck.Core{
                     FormBrowser_ResizeEnd(sender, e);
                 }
             }
+            else{
+                timerResize.Stop();
+                timerResize.Start();
+            }
         }
 
         private void FormBrowser_ResizeEnd(object sender, EventArgs e){ // also triggers when the window moves
             if (!isLoaded)return;
 
+            timerResize.Stop();
+            
             if (Location != ControlExtensions.InvisibleLocation){
                 Config.BrowserWindow.Save(this);
                 Config.Save();
@@ -249,10 +266,20 @@ namespace TweetDck.Core{
             }
         }
 
+        private void FormBrowser_FormClosed(object sender, FormClosedEventArgs e){
+            if (isLoaded && UpdateInstallerPath == null){
+                updates.CleanupDownload();
+            }
+        }
+
         private void Config_MuteToggled(object sender, EventArgs e){
             UpdateProperties(PropertyBridge.Properties.MuteNotifications);
         }
 
+        private void Config_ZoomLevelChanged(object sender, EventArgs e){
+            BrowserUtils.SetZoomLevel(browser.GetBrowser(), Config.ZoomLevel);
+        }
+
         private void Config_TrayBehaviorChanged(object sender, EventArgs e){
             UpdateTrayIcon();
         }
@@ -274,32 +301,31 @@ namespace TweetDck.Core{
 
         private void plugins_PluginChangedState(object sender, PluginChangedStateEventArgs e){
             browser.ExecuteScriptAsync("window.TDPF_setPluginState", e.Plugin, e.IsEnabled);
-            Config.Save();
         }
 
         private void updates_UpdateAccepted(object sender, UpdateAcceptedEventArgs e){
-            Hide();
+            this.InvokeAsyncSafe(() => {
+                foreach(Form form in Application.OpenForms.Cast<Form>().Reverse()){
+                    if (form is FormSettings || form is FormPlugins || form is FormAbout){
+                        form.Close();
+                    }
+                }
             
-            FormUpdateDownload downloadForm = new FormUpdateDownload(e.UpdateInfo);
+                updates.BeginUpdateDownload(this, e.UpdateInfo, update => {
-            downloadForm.MoveToCenter(this);
+                    if (update.DownloadStatus == UpdateDownloadStatus.Done){
-            downloadForm.ShowDialog();
+                        UpdateInstallerPath = update.InstallerPath;
-            downloadForm.Dispose();
+                    }
 
-            if (downloadForm.UpdateStatus == FormUpdateDownload.Status.Succeeded){
-                UpdateInstallerPath = downloadForm.InstallerPath;
                     ForceClose();
-            }
+                });
-            else if (downloadForm.UpdateStatus == FormUpdateDownload.Status.Manual){
+            });
-                ForceClose();
-            }
-            else{
-                Show();
-            }
         }
 
         private void updates_UpdateDismissed(object sender, UpdateDismissedEventArgs e){
+            this.InvokeAsyncSafe(() => {
                 Config.DismissedUpdate = e.VersionTag;
                 Config.Save();
+            });
         }
 
         private void soundNotification_PlaybackError(object sender, PlaybackErrorEventArgs e){
@@ -308,12 +334,12 @@ namespace TweetDck.Core{
             using(FormMessage form = new FormMessage("Notification Sound Error", "Could not play custom notification sound."+Environment.NewLine+e.Message, MessageBoxIcon.Error)){
                 form.CancelButton = form.AddButton("Ignore");
 
-                Button btnOpenSettings = form.AddButton("Open Settings");
+                Button btnOpenSettings = form.AddButton("View Options");
                 btnOpenSettings.Width += 16;
                 btnOpenSettings.Location = new Point(btnOpenSettings.Location.X-16, btnOpenSettings.Location.Y);
 
                 if (form.ShowDialog() == DialogResult.OK && form.ClickedButton == btnOpenSettings){
-                    OpenSettings(FormSettings.TabIndexNotification);
+                    OpenSettings(typeof(TabSettingsSounds));
                 }
             }
         }
@@ -329,7 +355,7 @@ namespace TweetDck.Core{
                 return;
             }
 
-            if (isBrowserReady && m.Msg == 0x210 && (m.WParam.ToInt32() & 0xFFFF) == 0x020B){ // WM_PARENTNOTIFY, WM_XBUTTONDOWN
+            if (isBrowserReady && m.Msg == NativeMethods.WM_PARENTNOTIFY && (m.WParam.ToInt32() & 0xFFFF) == NativeMethods.WM_XBUTTONDOWN){
                 browser.ExecuteScriptAsync("TDGF_onMouseClickExtra", (m.WParam.ToInt32() >> 16) & 0xFFFF);
                 return;
             }
@@ -354,7 +380,7 @@ namespace TweetDck.Core{
         // javascript calls
 
         public void ReinjectCustomCSS(string css){
-            browser.ExecuteScriptAsync("TDGF_reinjectCustomCSS", css == null ? string.Empty : css.Replace(Environment.NewLine, " "));
+            browser.ExecuteScriptAsync("TDGF_reinjectCustomCSS", css?.Replace(Environment.NewLine, " ") ?? string.Empty);
         }
 
         public void UpdateProperties(PropertyBridge.Properties properties){
@@ -372,14 +398,14 @@ namespace TweetDck.Core{
         }
 
         public void OpenSettings(){
-            OpenSettings(0);
+            OpenSettings(null);
         }
 
-        public void OpenSettings(int tabIndex){
+        public void OpenSettings(Type startTab){
             if (!TryBringToFront<FormSettings>()){
                 bool prevEnableUpdateCheck = Config.EnableUpdateCheck;
 
-                FormSettings form = new FormSettings(this, plugins, updates, tabIndex);
+                FormSettings form = new FormSettings(this, plugins, updates, startTab);
 
                 form.FormClosed += (sender, args) => {
                     if (!prevEnableUpdateCheck && Config.EnableUpdateCheck){
@@ -391,7 +417,9 @@ namespace TweetDck.Core{
                         trayIcon.HasNotifications = false;
                     }
                     
-                    UpdateProperties(PropertyBridge.Properties.ExpandLinksOnHover | PropertyBridge.Properties.HasCustomNotificationSound);
+                    UpdateProperties(PropertyBridge.Properties.ExpandLinksOnHover | PropertyBridge.Properties.SwitchAccountSelectors | PropertyBridge.Properties.HasCustomNotificationSound);
+
+                    notification.RequiresResize = true;
                     form.Dispose();
                 };
 
@@ -423,7 +451,7 @@ namespace TweetDck.Core{
             }
 
             if (soundNotification == null){
-                soundNotification = SoundNotification.New();
+                soundNotification = new SoundNotification();
                 soundNotification.PlaybackError += soundNotification_PlaybackError;
             }
 

Core/FormBrowser.resx

@@ -117,11 +117,13 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <metadata name="trayIcon.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-  <data name="trayIcon.TrayLocation" type="System.Drawing.Point, System.Drawing">
     <value>17, 17</value>
-  </data>
+  </metadata>
-  <data name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing">
+  <metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>112, 17</value>
-  </data>
+  </metadata>
+  <metadata name="timerResize.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>202, 17</value>
+  </metadata>
 </root>

Core/Handling/BrowserProcessHandler.cs

@@ -1,12 +1,11 @@
 using CefSharp;
 using System;
 
-namespace TweetDck.Core.Handling{
+namespace TweetDuck.Core.Handling{
     class BrowserProcessHandler : IBrowserProcessHandler{
         void IBrowserProcessHandler.OnContextInitialized(){
             using(IRequestContext ctx = Cef.GetGlobalRequestContext()){
-                string err;
+                ctx.SetPreference("browser.enable_spellchecking", Program.UserConfig.EnableSpellCheck, out string _);
-                ctx.SetPreference("browser.enable_spellchecking", Program.UserConfig.EnableSpellCheck, out err);
             }
         }
 

Core/Handling/ContextMenuBase.cs

@@ -3,13 +3,14 @@ using System;
 using System.IO;
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
-using TweetDck.Core.Bridge;
+using TweetDuck.Core.Bridge;
-using TweetDck.Core.Controls;
+using TweetDuck.Core.Controls;
-using TweetDck.Core.Utils;
+using TweetDuck.Core.Utils;
 
-namespace TweetDck.Core.Handling{
+namespace TweetDuck.Core.Handling{
     abstract class ContextMenuBase : IContextMenuHandler{
-        private static readonly Regex RegexTwitterAccount = new Regex(@"^https?://twitter\.com/([^/]+)/?$", RegexOptions.Compiled);
+        private static readonly Lazy<Regex> RegexTwitterAccount = new Lazy<Regex>(() => new Regex(@"^https?://twitter\.com/([^/]+)/?$", RegexOptions.Compiled), false);
+        protected static readonly bool HasDevTools = File.Exists(Path.Combine(Program.ProgramPath, "devtools_resources.pak"));
 
         private const int MenuOpenLinkUrl = 26500;
         private const int MenuCopyLinkUrl = 26501;
@@ -17,15 +18,8 @@ namespace TweetDck.Core.Handling{
         private const int MenuOpenImage = 26503;
         private const int MenuSaveImage = 26504;
         private const int MenuCopyImageUrl = 26505;
-
-        #if DEBUG
         private const int MenuOpenDevTools = 26599;
 
-        protected void AddDebugMenuItems(IMenuModel model){
-            model.AddItem((CefMenuCommand)MenuOpenDevTools, "Open dev tools");
-        }
-        #endif
-
         private readonly Form form;
 
         protected ContextMenuBase(Form form){
@@ -34,7 +28,7 @@ namespace TweetDck.Core.Handling{
 
         public virtual void OnBeforeContextMenu(IWebBrowser browserControl, IBrowser browser, IFrame frame, IContextMenuParams parameters, IMenuModel model){
             if (parameters.TypeFlags.HasFlag(ContextMenuType.Link) && !parameters.UnfilteredLinkUrl.EndsWith("tweetdeck.twitter.com/#", StringComparison.Ordinal)){
-                if (RegexTwitterAccount.IsMatch(parameters.UnfilteredLinkUrl)){
+                if (RegexTwitterAccount.Value.IsMatch(parameters.UnfilteredLinkUrl)){
                     model.AddItem((CefMenuCommand)MenuOpenLinkUrl, "Open account in browser");
                     model.AddItem((CefMenuCommand)MenuCopyLinkUrl, "Copy account address");
                     model.AddItem((CefMenuCommand)MenuCopyUsername, "Copy account username");
@@ -85,7 +79,7 @@ namespace TweetDck.Core.Handling{
                     }
 
                     if (saveTarget != null){
-                        BrowserUtils.DownloadFileAsync(parameters.SourceUrl, saveTarget, ex => {
+                        BrowserUtils.DownloadFileAsync(parameters.SourceUrl, saveTarget, null, ex => {
                             MessageBox.Show("An error occurred while downloading the image: "+ex.Message, Program.BrandName+" Has Failed :(", MessageBoxButtons.OK, MessageBoxIcon.Error);
                         });
                     }
@@ -97,15 +91,13 @@ namespace TweetDck.Core.Handling{
                     break;
 
                 case MenuCopyUsername:
-                    Match match = RegexTwitterAccount.Match(parameters.UnfilteredLinkUrl);
+                    Match match = RegexTwitterAccount.Value.Match(parameters.UnfilteredLinkUrl);
                     SetClipboardText(match.Success ? match.Groups[1].Value : parameters.UnfilteredLinkUrl);
                     break;
                     
-                #if DEBUG
                 case MenuOpenDevTools:
                     browserControl.ShowDevTools();
                     break;
-                #endif
             }
 
             return false;
@@ -121,6 +113,10 @@ namespace TweetDck.Core.Handling{
             form.InvokeAsyncSafe(() => WindowsUtils.SetClipboard(text, TextDataFormat.UnicodeText));
         }
         
+        protected void AddDebugMenuItems(IMenuModel model){
+            model.AddItem((CefMenuCommand)MenuOpenDevTools, "Open dev tools");
+        }
+
         protected static void RemoveSeparatorIfLast(IMenuModel model){
             if (model.Count > 0 && model.GetTypeAt(model.Count-1) == MenuItemType.Separator){
                 model.RemoveAt(model.Count-1);

Core/Handling/ContextMenuBrowser.cs

@@ -1,10 +1,10 @@
-using System.Windows.Forms;
+using CefSharp;
-using CefSharp;
+using System.Windows.Forms;
-using TweetDck.Core.Bridge;
+using TweetDuck.Core.Bridge;
-using TweetDck.Core.Controls;
+using TweetDuck.Core.Controls;
-using TweetDck.Core.Utils;
+using TweetDuck.Core.Utils;
 
-namespace TweetDck.Core.Handling{
+namespace TweetDuck.Core.Handling{
     class ContextMenuBrowser : ContextMenuBase{
         private const int MenuGlobal = 26600;
         private const int MenuMute = 26601;
@@ -20,7 +20,7 @@ namespace TweetDck.Core.Handling{
 
         private const string TitleReloadBrowser = "Reload browser";
         private const string TitleMuteNotifications = "Mute notifications";
-        private const string TitleSettings = "Settings";
+        private const string TitleSettings = "Options";
         private const string TitlePlugins = "Plugins";
         private const string TitleAboutProgram = "About "+Program.BrandName;
 
@@ -82,10 +82,10 @@ namespace TweetDck.Core.Handling{
                 globalMenu.AddItem((CefMenuCommand)MenuPlugins, TitlePlugins);
                 globalMenu.AddItem((CefMenuCommand)MenuAbout, TitleAboutProgram);
 
-                #if DEBUG
+                if (HasDevTools){
                     globalMenu.AddSeparator();
                     AddDebugMenuItems(globalMenu);
-                #endif
+                }
             }
 
             RemoveSeparatorIfLast(model);

Core/Handling/ContextMenuNotification.cs

@@ -1,8 +1,8 @@
 using CefSharp;
-using TweetDck.Core.Controls;
+using TweetDuck.Core.Controls;
-using TweetDck.Core.Notification;
+using TweetDuck.Core.Notification;
 
-namespace TweetDck.Core.Handling{
+namespace TweetDuck.Core.Handling{
     class ContextMenuNotification : ContextMenuBase{
         private const int MenuSkipTweet = 26600;
         private const int MenuFreeze = 26601;
@@ -44,9 +44,9 @@ namespace TweetDck.Core.Handling{
                 }
             }
             
-            #if DEBUG
+            if (HasDevTools){
                 AddDebugMenuItems(model);
-            #endif
+            }
 
             RemoveSeparatorIfLast(model);
 

Core/Handling/JavaScriptDialogHandler.cs

@@ -2,10 +2,10 @@
 using CefSharp.WinForms;
 using System.Drawing;
 using System.Windows.Forms;
-using TweetDck.Core.Controls;
+using TweetDuck.Core.Controls;
-using TweetDck.Core.Other;
+using TweetDuck.Core.Other;
 
-namespace TweetDck.Core.Handling {
+namespace TweetDuck.Core.Handling {
     class JavaScriptDialogHandler : IJsDialogHandler{
         bool IJsDialogHandler.OnJSDialog(IWebBrowser browserControl, IBrowser browser, string originUrl, CefJsDialogType dialogType, string messageText, string defaultPromptText, IJsDialogCallback callback, ref bool suppressMessage){
             ((ChromiumWebBrowser)browserControl).InvokeSafe(() => {

Core/Handling/LifeSpanHandler.cs

@@ -1,7 +1,7 @@
 using CefSharp;
-using TweetDck.Core.Utils;
+using TweetDuck.Core.Utils;
 
-namespace TweetDck.Core.Handling{
+namespace TweetDuck.Core.Handling{
     class LifeSpanHandler : ILifeSpanHandler{
         public bool OnBeforePopup(IWebBrowser browserControl, IBrowser browser, IFrame frame, string targetUrl, string targetFrameName, WindowOpenDisposition targetDisposition, bool userGesture, IPopupFeatures popupFeatures, IWindowInfo windowInfo, IBrowserSettings browserSettings, ref bool noJavascriptAccess, out IWebBrowser newBrowser){
             newBrowser = null;

Core/Handling/RequestHandler.cs

@@ -0,0 +1,68 @@
+using System.Security.Cryptography.X509Certificates;
+using CefSharp;
+
+namespace TweetDuck.Core.Handling{
+    abstract class RequestHandler : IRequestHandler{
+        // Browser
+
+        public virtual void OnRenderViewReady(IWebBrowser browserControl, IBrowser browser){}
+
+        public virtual void OnRenderProcessTerminated(IWebBrowser browserControl, IBrowser browser, CefTerminationStatus status){}
+
+        public virtual bool OnBeforeBrowse(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, bool isRedirect){
+            return false;
+        }
+
+        public virtual bool OnOpenUrlFromTab(IWebBrowser browserControl, IBrowser browser, IFrame frame, string targetUrl, WindowOpenDisposition targetDisposition, bool userGesture){
+            return false;
+        }
+
+        public virtual bool OnProtocolExecution(IWebBrowser browserControl, IBrowser browser, string url){
+            return false;
+        }
+
+        // Resources
+
+        public virtual CefReturnValue OnBeforeResourceLoad(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IRequestCallback callback){
+            return CefReturnValue.Continue;
+        }
+
+        public virtual void OnResourceRedirect(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response, ref string newUrl){}
+
+        public virtual bool OnResourceResponse(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response){
+            return false;
+        }
+
+        public virtual IResponseFilter GetResourceResponseFilter(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response){
+            return null;
+        }
+
+        public virtual void OnResourceLoadComplete(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IResponse response, UrlRequestStatus status, long receivedContentLength){}
+
+        // JavaScript & Plugins
+
+        public virtual bool OnQuotaRequest(IWebBrowser browserControl, IBrowser browser, string originUrl, long newSize, IRequestCallback callback){
+            callback.Dispose();
+            return false;
+        }
+
+        public virtual void OnPluginCrashed(IWebBrowser browserControl, IBrowser browser, string pluginPath){}
+
+        // Auth
+
+        public virtual bool GetAuthCredentials(IWebBrowser browserControl, IBrowser browser, IFrame frame, bool isProxy, string host, int port, string realm, string scheme, IAuthCallback callback){
+            callback.Dispose();
+            return false;
+        }
+
+        public virtual bool OnSelectClientCertificate(IWebBrowser browserControl, IBrowser browser, bool isProxy, string host, int port, X509Certificate2Collection certificates, ISelectClientCertificateCallback callback){
+            callback.Dispose();
+            return false;
+        }
+
+        public virtual bool OnCertificateError(IWebBrowser browserControl, IBrowser browser, CefErrorCode errorCode, string requestUrl, ISslInfo sslInfo, IRequestCallback callback){
+            callback.Dispose();
+            return false;
+        }
+    }
+}

Core/Handling/RequestHandlerBrowser.cs

@@ -0,0 +1,17 @@
+using CefSharp;
+
+namespace TweetDuck.Core.Handling{
+    class RequestHandlerBrowser : RequestHandler{
+        public override void OnRenderProcessTerminated(IWebBrowser browserControl, IBrowser browser, CefTerminationStatus status){
+            browser.Reload();
+        }
+
+        public override CefReturnValue OnBeforeResourceLoad(IWebBrowser browserControl, IBrowser browser, IFrame frame, IRequest request, IRequestCallback callback){
+            if (request.ResourceType == ResourceType.Script && request.Url.Contains("analytics.")){
+                return CefReturnValue.Cancel;
+            }
+
+            return CefReturnValue.Continue;
+        }
+    }
+}

Core/Handling/ResourceHandlerNotification.cs

@@ -3,16 +3,13 @@ using System.Collections.Specialized;
 using System.IO;
 using System.Text;
 
-namespace TweetDck.Core.Handling{
+namespace TweetDuck.Core.Handling{
     class ResourceHandlerNotification : IResourceHandler{
         private readonly NameValueCollection headers = new NameValueCollection(0);
         private MemoryStream dataIn;
 
         public void SetHTML(string html){
-            if (dataIn != null){
+            dataIn?.Dispose();
-                dataIn.Dispose();
-            }
-
             dataIn = ResourceHandler.GetMemoryStream(html, Encoding.UTF8);
         }
 
@@ -35,7 +32,7 @@ namespace TweetDck.Core.Handling{
             response.StatusCode = 200;
             response.StatusText = "OK";
             response.ResponseHeaders = headers;
-            responseLength = dataIn != null ? dataIn.Length : -1;
+            responseLength = dataIn?.Length ?? -1;
         }
 
         bool IResourceHandler.ReadResponse(Stream dataOut, out int bytesRead, ICallback callback){

Core/Notification/FormNotificationBase.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDck.Core.Notification {
+namespace TweetDuck.Core.Notification {
     partial class FormNotificationBase {
         /// <summary>
         /// Required designer variable.
@@ -34,7 +34,7 @@
             this.BackColor = System.Drawing.SystemColors.Control;
             this.ClientSize = new System.Drawing.Size(284, 122);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
-            this.Location = TweetDck.Core.Controls.ControlExtensions.InvisibleLocation;
+            this.Location = TweetDuck.Core.Controls.ControlExtensions.InvisibleLocation;
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "FormNotification";

Core/Notification/FormNotificationBase.cs

@@ -1,14 +1,14 @@
-using System;
+using CefSharp;
+using CefSharp.WinForms;
+using System;
 using System.Drawing;
 using System.Windows.Forms;
-using CefSharp;
+using TweetDuck.Configuration;
-using CefSharp.WinForms;
+using TweetDuck.Core.Controls;
-using TweetDck.Configuration;
+using TweetDuck.Core.Handling;
-using TweetDck.Core.Controls;
+using TweetDuck.Core.Utils;
-using TweetDck.Core.Handling;
-using TweetDck.Core.Utils;
 
-namespace TweetDck.Core.Notification{
+namespace TweetDuck.Core.Notification{
     partial class FormNotificationBase : Form{
         protected Point PrimaryLocation{
             get{
@@ -50,43 +50,37 @@ namespace TweetDck.Core.Notification{
             }
         }
 
-        public bool IsNotificationVisible{
+        public bool IsNotificationVisible => Location != ControlExtensions.InvisibleLocation;
-            get{
-                return Location != ControlExtensions.InvisibleLocation;
-            }
-        }
 
         public new Point Location{
-            get{
+            get => base.Location;
-                return base.Location;
-            }
 
             set{
                 Visible = (base.Location = value) != ControlExtensions.InvisibleLocation;
+                FormBorderStyle = GetBorderStyle(CanResizeWindow);
             }
         }
 
-        public Func<bool> CanMoveWindow = () => true;
+        public bool CanResizeWindow{
+            get => FormBorderStyle == FormBorderStyle.Sizable || FormBorderStyle == FormBorderStyle.SizableToolWindow;
+            set => FormBorderStyle = GetBorderStyle(value);
+        }
+        
+        public Func<bool> CanMoveWindow { get; set; } = () => true;
+        protected override bool ShowWithoutActivation => true;
+
+        protected double SizeScale => dpiScale*Program.UserConfig.ZoomMultiplier;
 
         protected readonly Form owner;
         protected readonly ChromiumWebBrowser browser;
         
         private readonly ResourceHandlerNotification resourceHandler = new ResourceHandlerNotification();
+        private readonly float dpiScale;
 
         private string currentColumn;
         private int pauseCounter;
 
-        public bool IsPaused{
+        public bool IsPaused => pauseCounter > 0;
-            get{
-                return pauseCounter > 0;
-            }
-        }
-
-        protected override bool ShowWithoutActivation{
-            get{
-                return true;
-            }
-        }
 
         public bool FreezeTimer { get; set; }
         public bool ContextMenuOpen { get; set; }
@@ -114,6 +108,8 @@ namespace TweetDck.Core.Notification{
             this.browser.ConsoleMessage += BrowserUtils.HandleConsoleMessage;
             #endif
 
+            this.dpiScale = this.GetDPIScale();
+
             DefaultResourceHandlerFactory handlerFactory = (DefaultResourceHandlerFactory)browser.ResourceHandlerFactory;
             handlerFactory.RegisterHandler("https://tweetdeck.twitter.com", this.resourceHandler);
 
@@ -143,8 +139,8 @@ namespace TweetDck.Core.Notification{
         }
 
         private void Browser_IsBrowserInitializedChanged(object sender, IsBrowserInitializedChangedEventArgs e){
-            if (e.IsBrowserInitialized && Initialized != null){
+            if (e.IsBrowserInitialized){
-                Initialized(this, new EventArgs());
+                Initialized?.Invoke(this, new EventArgs());
             }
         }
 
@@ -188,16 +184,7 @@ namespace TweetDck.Core.Notification{
         }
 
         protected virtual void SetNotificationSize(int width, int height){
-            browser.ClientSize = ClientSize = new Size(width, height);
+            browser.ClientSize = ClientSize = new Size(BrowserUtils.Scale(width, SizeScale), BrowserUtils.Scale(height, SizeScale));
-        }
-
-        protected void MoveToVisibleLocation(){
-            bool needsReactivating = Location == ControlExtensions.InvisibleLocation;
-            Location = PrimaryLocation;
-
-            if (needsReactivating){
-                NativeMethods.SetFormPos(this, NativeMethods.HWND_TOPMOST, NativeMethods.SWP_NOACTIVATE);
-            }
         }
 
         protected virtual void OnNotificationReady(){
@@ -208,6 +195,15 @@ namespace TweetDck.Core.Notification{
             Text = string.IsNullOrEmpty(currentColumn) || !Program.UserConfig.DisplayNotificationColumn ? Program.BrandName : Program.BrandName+" - "+currentColumn;
         }
 
+        public void MoveToVisibleLocation(){
+            bool needsReactivating = Location == ControlExtensions.InvisibleLocation;
+            Location = PrimaryLocation;
+
+            if (needsReactivating){
+                NativeMethods.SetFormPos(this, NativeMethods.HWND_TOPMOST, NativeMethods.SWP_NOACTIVATE);
+            }
+        }
+
         public void DisplayTooltip(string text){
             if (string.IsNullOrEmpty(text)){
                 toolTip.Hide(this);
@@ -218,5 +214,14 @@ namespace TweetDck.Core.Notification{
                 toolTip.Show(text, this, position);
             }
         }
+
+        private FormBorderStyle GetBorderStyle(bool sizable){
+            if (WindowsUtils.ShouldAvoidToolWindow && Visible){ // Visible = workaround for alt+tab
+                return sizable ? FormBorderStyle.Sizable : FormBorderStyle.FixedSingle;
+            }
+            else{
+                return sizable ? FormBorderStyle.SizableToolWindow : FormBorderStyle.FixedToolWindow;
+            }
+        }
     }
 }

Core/Notification/FormNotificationMain.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDck.Core.Notification {
+namespace TweetDuck.Core.Notification {
     partial class FormNotificationMain {
         /// <summary>
         /// Required designer variable.
@@ -26,7 +26,7 @@
             this.components = new System.ComponentModel.Container();
             this.timerDisplayDelay = new System.Windows.Forms.Timer(this.components);
             this.timerProgress = new System.Windows.Forms.Timer(this.components);
-            this.progressBarTimer = new TweetDck.Core.Controls.FlatProgressBar();
+            this.progressBarTimer = new TweetDuck.Core.Controls.FlatProgressBar();
             this.SuspendLayout();
             // 
             // timerDisplayDelay
@@ -49,7 +49,7 @@
             this.progressBarTimer.Margin = new System.Windows.Forms.Padding(0);
             this.progressBarTimer.Maximum = 1000;
             this.progressBarTimer.Name = "progressBarTimer";
-            this.progressBarTimer.Size = new System.Drawing.Size(284, 4);
+            this.progressBarTimer.Size = new System.Drawing.Size(284, TimerBarHeight);
             this.progressBarTimer.TabIndex = 1;
             // 
             // FormNotification

Core/Notification/FormNotificationMain.cs

@@ -1,17 +1,18 @@
-using System;
+using CefSharp;
+using System;
 using System.Drawing;
 using System.Windows.Forms;
-using CefSharp;
+using TweetDuck.Core.Bridge;
-using TweetDck.Core.Bridge;
+using TweetDuck.Core.Controls;
-using TweetDck.Core.Controls;
+using TweetDuck.Core.Utils;
-using TweetDck.Core.Utils;
+using TweetDuck.Plugins;
-using TweetDck.Plugins;
+using TweetDuck.Plugins.Enums;
-using TweetDck.Plugins.Enums;
+using TweetDuck.Resources;
-using TweetDck.Resources;
 
-namespace TweetDck.Core.Notification{
+namespace TweetDuck.Core.Notification{
     partial class FormNotificationMain : FormNotificationBase{
         private const string NotificationScriptFile = "notification.js";
+        private const int TimerBarHeight = 4;
 
         private static readonly string NotificationScriptIdentifier = ScriptLoader.GetRootIdentifier(NotificationScriptFile);
         private static readonly string PluginScriptIdentifier = ScriptLoader.GetRootIdentifier(PluginManager.PluginNotificationScriptFile);
@@ -23,20 +24,6 @@ namespace TweetDck.Core.Notification{
             PluginJS = ScriptLoader.LoadResource(PluginManager.PluginNotificationScriptFile);
         }
         
-        private static int BaseClientWidth{
-            get{
-                int level = TweetNotification.FontSizeLevel;
-                return level == 0 ? 284 : (int)Math.Round(284.0*(1.0+0.05*level));
-            }
-        }
-
-        private static int BaseClientHeight{
-            get{
-                int level = TweetNotification.FontSizeLevel;
-                return level == 0 ? 118 : (int)Math.Round(118.0*(1.0+0.075*level));
-            }
-        }
-        
         private readonly PluginManager plugins;
 
         protected int timeLeft, totalTime;
@@ -44,13 +31,14 @@ namespace TweetDck.Core.Notification{
         
         private readonly NativeMethods.HookProc mouseHookDelegate;
         private IntPtr mouseHook;
+        private bool blockXButtonUp;
 
         private bool? prevDisplayTimer;
         private int? prevFontSize;
 
-        private bool RequiresResize{
+        public bool RequiresResize{
             get{
-                return !prevDisplayTimer.HasValue || !prevFontSize.HasValue || prevDisplayTimer != Program.UserConfig.DisplayNotificationTimer || prevFontSize != TweetNotification.FontSizeLevel;
+                return !prevDisplayTimer.HasValue || !prevFontSize.HasValue || prevDisplayTimer != Program.UserConfig.DisplayNotificationTimer || prevFontSize != TweetNotification.FontSizeLevel || CanResizeWindow;
             }
 
             set{
@@ -65,6 +53,34 @@ namespace TweetDck.Core.Notification{
             }
         }
 
+        private int BaseClientWidth{
+            get{
+                switch(Program.UserConfig.NotificationSize){
+                    default:
+                        return BrowserUtils.Scale(284, SizeScale*(1.0+0.05*TweetNotification.FontSizeLevel));
+
+                    case TweetNotification.Size.Custom:
+                        return Program.UserConfig.CustomNotificationSize.Width;
+                }
+            }
+        }
+
+        private int BaseClientHeight{
+            get{
+                switch(Program.UserConfig.NotificationSize){
+                    default:
+                        return BrowserUtils.Scale(118, SizeScale*(1.0+0.075*TweetNotification.FontSizeLevel));
+
+                    case TweetNotification.Size.Custom:
+                        return Program.UserConfig.CustomNotificationSize.Height;
+                }
+            }
+        }
+
+        public Size BrowserSize{
+            get => Program.UserConfig.DisplayNotificationTimer ? new Size(ClientSize.Width, ClientSize.Height-TimerBarHeight) : ClientSize;
+        }
+
         public FormNotificationMain(FormBrowser owner, PluginManager pluginManager, bool enableContextMenu) : base(owner, enableContextMenu){
             InitializeComponent();
 
@@ -77,7 +93,7 @@ namespace TweetDck.Core.Notification{
             browser.FrameLoadEnd += Browser_FrameLoadEnd;
 
             mouseHookDelegate = MouseHookProc;
-            Disposed += (sender, args) => StopMouseHook();
+            Disposed += (sender, args) => StopMouseHook(true);
         }
 
         // mouse wheel hook
@@ -88,18 +104,45 @@ namespace TweetDck.Core.Notification{
             }
         }
 
-        private void StopMouseHook(){
+        private void StopMouseHook(bool force){
-            if (mouseHook != IntPtr.Zero){
+            if (mouseHook != IntPtr.Zero && (force || !blockXButtonUp)){
                 NativeMethods.UnhookWindowsHookEx(mouseHook);
                 mouseHook = IntPtr.Zero;
+                blockXButtonUp = false;
             }
         }
 
         private IntPtr MouseHookProc(int nCode, IntPtr wParam, IntPtr lParam){
-            if (nCode == 0 && wParam.ToInt32() == NativeMethods.WM_MOUSEWHEEL && browser.Bounds.Contains(PointToClient(Cursor.Position)) && !ContainsFocus && !owner.ContainsFocus){
+            if (nCode == 0){
-                browser.SendMouseWheelEvent(0, 0, 0, NativeMethods.GetHookWheelDelta(lParam), CefEventFlags.None);
+                int eventType = wParam.ToInt32();
+
+                if (eventType == NativeMethods.WM_MOUSEWHEEL && browser.Bounds.Contains(PointToClient(Cursor.Position))){
+                    browser.SendMouseWheelEvent(0, 0, 0, BrowserUtils.Scale(NativeMethods.GetMouseHookData(lParam), Program.UserConfig.NotificationScrollSpeed/100.0), CefEventFlags.None);
                     return NativeMethods.HOOK_HANDLED;
                 }
+                else if (eventType == NativeMethods.WM_XBUTTONDOWN && DesktopBounds.Contains(Cursor.Position)){
+                    int extraButton = NativeMethods.GetMouseHookData(lParam);
+
+                    if (extraButton == 2){ // forward button
+                        this.InvokeAsyncSafe(FinishCurrentNotification);
+                    }
+                    else if (extraButton == 1){ // back button
+                        this.InvokeAsyncSafe(Close);
+                    }
+                    
+                    blockXButtonUp = true;
+                    return NativeMethods.HOOK_HANDLED;
+                }
+                else if (eventType == NativeMethods.WM_XBUTTONUP && blockXButtonUp){
+                    blockXButtonUp = false;
+
+                    if (!Visible){
+                        StopMouseHook(false);
+                    }
+
+                    return NativeMethods.HOOK_HANDLED;
+                }
+            }
 
             return NativeMethods.CallNextHookEx(mouseHook, nCode, wParam, lParam);
         }
@@ -145,7 +188,7 @@ namespace TweetDck.Core.Notification{
 
             timeLeft -= timerProgress.Interval;
 
-            int value = (int)Math.Round(1025.0*(totalTime-timeLeft)/totalTime);
+            int value = BrowserUtils.Scale(1025, (totalTime-timeLeft)/(double)totalTime);
             progressBarTimer.SetValueInstant(Math.Min(1000, Math.Max(0, Program.UserConfig.NotificationTimerCountDown ? 1000-value : value)));
 
             if (timeLeft <= 0){
@@ -177,7 +220,7 @@ namespace TweetDck.Core.Notification{
             timerProgress.Stop();
             totalTime = 0;
 
-            StopMouseHook();
+            StopMouseHook(false);
         }
 
         public override void FinishCurrentNotification(){
@@ -188,7 +231,7 @@ namespace TweetDck.Core.Notification{
             if (!IsPaused){
                 pausedDuringNotification = IsNotificationVisible;
                 timerProgress.Stop();
-                StopMouseHook();
+                StopMouseHook(true);
             }
 
             base.PauseNotification();
@@ -223,7 +266,7 @@ namespace TweetDck.Core.Notification{
 
         protected override void SetNotificationSize(int width, int height){
             if (Program.UserConfig.DisplayNotificationTimer){
-                ClientSize = new Size(width, height+4);
+                ClientSize = new Size(width, height+TimerBarHeight);
                 progressBarTimer.Visible = true;
             }
             else{

Core/Notification/FormNotificationTweet.Designer.cs

@@ -1,10 +1,4 @@
-using System;
+namespace TweetDuck.Core.Notification {
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace TweetDck.Core.Notification {
     partial class FormNotificationTweet {
         /// <summary>
         /// Required designer variable.

Core/Notification/FormNotificationTweet.cs

@@ -1,20 +1,16 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
-using TweetDck.Plugins;
+using TweetDuck.Plugins;
 using System.Windows.Forms;
-using TweetDck.Core.Utils;
+using TweetDuck.Core.Utils;
 
-namespace TweetDck.Core.Notification{
+namespace TweetDuck.Core.Notification{
     sealed partial class FormNotificationTweet : FormNotificationMain{
         private const int NonIntrusiveIdleLimit = 30;
         private const int TrimMinimum = 32;
 
-        private bool IsCursorOverNotificationArea{
+        private bool IsCursorOverNotificationArea => new Rectangle(PrimaryLocation, Size).Contains(Cursor.Position);
-            get{
-                return new Rectangle(PrimaryLocation, Size).Contains(Cursor.Position);
-            }
-        }
 
         private readonly Queue<TweetNotification> tweetQueue = new Queue<TweetNotification>(4);
         private bool needsTrim;

Core/Notification/Screenshot/FormNotificationScreenshotable.cs

@@ -1,12 +1,12 @@
 using System;
-using System.Windows.Forms;
-using TweetDck.Core.Bridge;
-using TweetDck.Resources;
 using System.Drawing;
 using System.Drawing.Imaging;
-using TweetDck.Core.Utils;
+using System.Windows.Forms;
+using TweetDuck.Core.Bridge;
+using TweetDuck.Core.Utils;
+using TweetDuck.Resources;
 
-namespace TweetDck.Core.Notification.Screenshot{
+namespace TweetDuck.Core.Notification.Screenshot{
     sealed class FormNotificationScreenshotable : FormNotificationBase{
         public FormNotificationScreenshotable(Action callback, Form owner) : base(owner, false){
             browser.RegisterAsyncJsObject("$TD_NotificationScreenshot", new CallbackBridge(this, callback));

Core/Notification/Screenshot/TweetScreenshotManager.cs

@@ -3,9 +3,9 @@
 
 using System;
 using System.Windows.Forms;
-using TweetDck.Core.Controls;
+using TweetDuck.Core.Controls;
 
-namespace TweetDck.Core.Notification.Screenshot{
+namespace TweetDuck.Core.Notification.Screenshot{
     sealed class TweetScreenshotManager : IDisposable{
         private readonly Form owner;
         private readonly Timer timeout;
@@ -16,7 +16,7 @@ namespace TweetDck.Core.Notification.Screenshot{
         public TweetScreenshotManager(Form owner){
             this.owner = owner;
 
-            this.timeout = new Timer{ Interval = 5000 };
+            this.timeout = new Timer{ Interval = 8000 };
             this.timeout.Tick += timeout_Tick;
 
             this.disposer = new Timer{ Interval = 1 };
@@ -61,6 +61,7 @@ namespace TweetDck.Core.Notification.Screenshot{
             screenshot.Location = ControlExtensions.InvisibleLocation;
             disposer.Start();
             #else
+            screenshot.MoveToVisibleLocation();
             screenshot.FormClosed += (sender, args) => disposer.Start();
             #endif
         }
@@ -68,10 +69,7 @@ namespace TweetDck.Core.Notification.Screenshot{
         public void Dispose(){
             timeout.Dispose();
             disposer.Dispose();
-
+            screenshot?.Dispose();
-            if (screenshot != null){
-                screenshot.Dispose();
-            }
         }
     }
 }

Core/Notification/Sound/ISoundNotificationPlayer.cs

@@ -1,12 +0,0 @@
-using System;
-
-namespace TweetDck.Core.Notification.Sound{
-    interface ISoundNotificationPlayer : IDisposable{
-        string SupportedFormats { get; }
-
-        event EventHandler<PlaybackErrorEventArgs> PlaybackError;
-
-        void Play(string file);
-        void Stop();
-    }
-}

Core/Notification/SoundNotification.cs

@@ -1,28 +1,29 @@
-using System.Runtime.InteropServices;
+using System;
-using TweetDck.Core.Notification.Sound;
+using TweetLib.Audio;
+using TweetLib.Audio.Utils;
 
-namespace TweetDck.Core.Notification{
+namespace TweetDuck.Core.Notification{
-    static class SoundNotification{
+    sealed class SoundNotification : IDisposable{
-        private static bool? IsWMPAvailable;
+        public string SupportedFormats => player.SupportedFormats;
+        public event EventHandler<PlaybackErrorEventArgs> PlaybackError;
 
-        public static ISoundNotificationPlayer New(){
+        private readonly AudioPlayer player;
-            if (IsWMPAvailable.HasValue){
+
-                if (IsWMPAvailable.Value){
+        public SoundNotification(){
-                    return new SoundPlayerImplWMP();
+            this.player = AudioPlayer.New();
-                }
+            this.player.PlaybackError += Player_PlaybackError;
-                else{
-                    return new SoundPlayerImplFallback();
-                }
         }
 
-            try{
+        public void Play(string file){
-                SoundPlayerImplWMP implWMP = new SoundPlayerImplWMP();
+            player.Play(file);
-                IsWMPAvailable = true;
-                return implWMP;
-            }catch(COMException){
-                IsWMPAvailable = false;
-                return new SoundPlayerImplFallback();
         }
+
+        private void Player_PlaybackError(object sender, PlaybackErrorEventArgs e){
+            PlaybackError?.Invoke(this, e);
+        }
+
+        public void Dispose(){
+            player.Dispose();
         }
     }
 }

Core/Notification/TweetNotification.cs

@@ -1,14 +1,14 @@
 using System;
 using System.Text;
-using TweetDck.Resources;
+using TweetDuck.Resources;
 
-namespace TweetDck.Core.Notification{
+namespace TweetDuck.Core.Notification{
     sealed class TweetNotification{
         private static string FontSizeClass { get; set; }
         private static string HeadTag { get; set; }
 
         private const string DefaultFontSizeClass = "medium";
-        private const string DefaultHeadTag = @"<meta charset='utf-8'><meta http-equiv='X-UA-Compatible' content='chrome=1'><link rel='stylesheet' href='https://ton.twimg.com/tweetdeck-web/web/css/font.5ef884f9f9.css'><link rel='stylesheet' href='https://ton.twimg.com/tweetdeck-web/web/css/app-dark.5631e0dd42.css'>";
+        private const string DefaultHeadTag = @"<meta charset='utf-8'><meta http-equiv='X-UA-Compatible' content='chrome=1'><link rel='stylesheet' href='https://ton.twimg.com/tweetdeck-web/web/css/font.5ef884f9f9.css'><link rel='stylesheet' href='https://ton.twimg.com/tweetdeck-web/web/css/app-dark.5631e0dd42.css'><style type='text/css'>body{background:#222426}</style>";
         private const string CustomCSS = @"body:before{content:none}body{overflow-y:auto}.scroll-styled-v::-webkit-scrollbar{width:7px}.scroll-styled-v::-webkit-scrollbar-thumb{border-radius:0}.scroll-styled-v::-webkit-scrollbar-track{border-left:0}#td-skip{opacity:0;cursor:pointer;transition:opacity 0.15s ease}.td-hover #td-skip{opacity:0.75}#td-skip:hover{opacity:1}";
 
         public static int FontSizeLevel{
@@ -31,7 +31,7 @@ namespace TweetDck.Core.Notification{
                     ExampleTweetHTML = ScriptLoader.LoadResource("pages/example.html", true);
 
                     #if DEBUG
-                    ExampleTweetHTML = ExampleTweetHTML.Replace("</p>", @"</p><div style='margin-top:64px'>Scrollbar test padding...</div>");
+                    ExampleTweetHTML = ExampleTweetHTML.Replace("</p>", @"</p><div style='margin-top:256px'>Scrollbar test padding...</div>");
                     #endif
                 }
 
@@ -51,38 +51,26 @@ namespace TweetDck.Core.Notification{
             TopLeft, TopRight, BottomLeft, BottomRight, Custom
         }
 
-        public string Column{
+        public enum Size{
-            get{
+            Auto, Custom
-                return column;
-            }
         }
 
-        public string TweetUrl{
+        public string Column { get; }
-            get{
+        public string TweetUrl { get; }
-                return tweetUrl;
+        public string QuoteUrl { get; }
-            }
-        }
         
-        public string QuoteUrl{
-            get{
-                return quoteUrl;
-            }
-        }
-
-        private readonly string column;
         private readonly string html;
         private readonly int characters;
-        private readonly string tweetUrl;
-        private readonly string quoteUrl;
         private readonly bool isExample;
 
         public TweetNotification(string column, string html, int characters, string tweetUrl, string quoteUrl) : this(column, html, characters, tweetUrl, quoteUrl, false){}
 
         private TweetNotification(string column, string html, int characters, string tweetUrl, string quoteUrl, bool isExample){
-            this.column = column;
+            this.Column = column;
+            this.TweetUrl = tweetUrl;
+            this.QuoteUrl = quoteUrl;
+
             this.html = html;
-            this.tweetUrl = tweetUrl;
-            this.quoteUrl = quoteUrl;
             this.characters = characters;
             this.isExample = isExample;
         }

Core/Other/FormAbout.Designer.cs

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

Core/Other/FormAbout.cs

@@ -1,7 +1,7 @@
 using System.Windows.Forms;
-using TweetDck.Core.Utils;
+using TweetDuck.Core.Utils;
 
-namespace TweetDck.Core.Other{
+namespace TweetDuck.Core.Other{
     sealed partial class FormAbout : Form{
         private const string TipsLink = "https://github.com/chylex/TweetDuck/wiki";
         private const string IssuesLink = "https://github.com/chylex/TweetDuck/issues";

Core/Other/FormMessage.Designer.cs

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

Core/Other/FormMessage.cs

@@ -1,29 +1,27 @@
 using System;
 using System.Drawing;
 using System.Windows.Forms;
+using TweetDuck.Core.Controls;
+using TweetDuck.Core.Utils;
 
-namespace TweetDck.Core.Other{
+namespace TweetDuck.Core.Other{
     sealed partial class FormMessage : Form{
         public Button ClickedButton { get; private set; }
 
-        public int ActionPanelY{
+        public int ActionPanelY => panelActions.Location.Y;
-            get{
-                return panelActions.Location.Y;
-            }
-        }
 
         private int ClientWidth{
-            get{
+            get => ClientSize.Width;
-                return ClientSize.Width;
+            set => ClientSize = new Size(value, ClientSize.Height);
         }
 
-            set{
+        private int ButtonDistance{
-                ClientSize = new Size(value, ClientSize.Height);
+            get => BrowserUtils.Scale(96, dpiScale);
-            }
         }
 
         private readonly Icon icon;
         private readonly bool isReady;
+        private readonly float dpiScale;
 
         private int realFormWidth, minFormWidth;
         private int buttonCount;
@@ -33,9 +31,11 @@ namespace TweetDck.Core.Other{
         public FormMessage(string caption, string text, MessageBoxIcon messageIcon){
             InitializeComponent();
 
+            this.dpiScale = this.GetDPIScale();
+
             this.prevLabelWidth = labelMessage.Width;
             this.prevLabelHeight = labelMessage.Height;
-            this.minFormWidth = 40;
+            this.minFormWidth = BrowserUtils.Scale(40, dpiScale);
 
             switch(messageIcon){
                 case MessageBoxIcon.Information:
@@ -75,7 +75,7 @@ namespace TweetDck.Core.Other{
                 Anchor = AnchorStyles.Bottom,
                 Font = SystemFonts.MessageBoxFont,
                 Location = new Point(0, 12),
-                Size = new Size(88, 26),
+                Size = new Size(BrowserUtils.Scale(88, dpiScale), BrowserUtils.Scale(26, dpiScale)),
                 TabIndex = buttonCount,
                 Text = title,
                 UseVisualStyleBackColor = true
@@ -90,7 +90,7 @@ namespace TweetDck.Core.Other{
             panelActions.Controls.Add(button);
             ++buttonCount;
 
-            minFormWidth += 96;
+            minFormWidth += ButtonDistance;
             ClientWidth = Math.Max(realFormWidth, minFormWidth);
             RecalculateButtonLocation();
 
@@ -100,14 +100,19 @@ namespace TweetDck.Core.Other{
         public void AddActionControl(Control control){
             panelActions.Controls.Add(control);
             
+            control.Size = new Size(BrowserUtils.Scale(control.Width, dpiScale), BrowserUtils.Scale(control.Height, dpiScale));
+
             minFormWidth += control.Width+control.Margin.Horizontal;
             ClientWidth = Math.Max(realFormWidth, minFormWidth);
         }
         
         private void RecalculateButtonLocation(){
+            int dist = ButtonDistance;
+            int start = ClientWidth-dist-BrowserUtils.Scale(1, dpiScale);
+
             for(int index = 0; index < buttonCount; index++){
                 Control control = panelActions.Controls[index];
-                control.Location = new Point(ClientWidth-97-index*96, control.Location.Y);
+                control.Location = new Point(start-index*dist, control.Location.Y);
             }
         }
 
@@ -117,14 +122,15 @@ namespace TweetDck.Core.Other{
             }
 
             bool isMultiline = labelMessage.Height > labelMessage.MinimumSize.Height;
+            int labelOffset = BrowserUtils.Scale(8, dpiScale);
 
             if (isMultiline && !wasLabelMultiline){
-                labelMessage.Location = new Point(labelMessage.Location.X, labelMessage.Location.Y-8);
+                labelMessage.Location = new Point(labelMessage.Location.X, labelMessage.Location.Y-labelOffset);
-                prevLabelHeight += 8;
+                prevLabelHeight += labelOffset;
             }
             else if (!isMultiline && wasLabelMultiline){
-                labelMessage.Location = new Point(labelMessage.Location.X, labelMessage.Location.Y+8);
+                labelMessage.Location = new Point(labelMessage.Location.X, labelMessage.Location.Y+labelOffset);
-                prevLabelHeight -= 8;
+                prevLabelHeight -= labelOffset;
             }
 
             realFormWidth = ClientWidth-(icon == null ? 50 : 0)+labelMessage.Width-prevLabelWidth;

Core/Other/FormPlugins.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDck.Core.Other {
+namespace TweetDuck.Core.Other {
     partial class FormPlugins {
         /// <summary>
         /// Required designer variable.
@@ -26,7 +26,7 @@
             this.btnClose = new System.Windows.Forms.Button();
             this.btnReload = new System.Windows.Forms.Button();
             this.btnOpenFolder = new System.Windows.Forms.Button();
-            this.tabPanelPlugins = new TweetDck.Core.Controls.TabPanel();
+            this.flowLayoutPlugins = new TweetDuck.Plugins.Controls.PluginListFlowLayout();
             this.SuspendLayout();
             // 
             // btnClose
@@ -68,26 +68,30 @@
             this.btnOpenFolder.UseVisualStyleBackColor = true;
             this.btnOpenFolder.Click += new System.EventHandler(this.btnOpenFolder_Click);
             // 
-            // tabPanelPlugins
+            // flowLayoutPlugins
             // 
-            this.tabPanelPlugins.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.flowLayoutPlugins.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.tabPanelPlugins.Location = new System.Drawing.Point(12, 12);
+            this.flowLayoutPlugins.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.tabPanelPlugins.Name = "tabPanelPlugins";
+            this.flowLayoutPlugins.FlowDirection = System.Windows.Forms.FlowDirection.TopDown;
-            this.tabPanelPlugins.Size = new System.Drawing.Size(680, 421);
+            this.flowLayoutPlugins.Location = new System.Drawing.Point(12, 12);
-            this.tabPanelPlugins.TabIndex = 0;
+            this.flowLayoutPlugins.Name = "flowLayoutPlugins";
+            this.flowLayoutPlugins.Size = new System.Drawing.Size(680, 421);
+            this.flowLayoutPlugins.TabIndex = 0;
+            this.flowLayoutPlugins.WrapContents = false;
+            this.flowLayoutPlugins.Resize += new System.EventHandler(this.flowLayoutPlugins_Resize);
             // 
             // 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.Controls.Add(this.tabPanelPlugins);
+            this.Controls.Add(this.flowLayoutPlugins);
             this.Controls.Add(this.btnOpenFolder);
             this.Controls.Add(this.btnReload);
             this.Controls.Add(this.btnClose);
-            this.Icon = global::TweetDck.Properties.Resources.icon;
+            this.Icon = global::TweetDuck.Properties.Resources.icon;
             this.MinimumSize = new System.Drawing.Size(480, 320);
             this.Name = "FormPlugins";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
@@ -101,6 +105,6 @@
         private System.Windows.Forms.Button btnClose;
         private System.Windows.Forms.Button btnReload;
         private System.Windows.Forms.Button btnOpenFolder;
-        private TweetDck.Core.Controls.TabPanel tabPanelPlugins;
+        private Plugins.Controls.PluginListFlowLayout flowLayoutPlugins;
     }
 }

Core/Other/FormPlugins.cs

@@ -3,19 +3,12 @@ using System.Diagnostics;
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
-using TweetDck.Core.Controls;
+using TweetDuck.Plugins;
-using TweetDck.Plugins;
+using TweetDuck.Plugins.Controls;
-using TweetDck.Plugins.Controls;
-using TweetDck.Plugins.Enums;
-using TweetDck.Plugins.Events;
 
-namespace TweetDck.Core.Other{
+namespace TweetDuck.Core.Other{
     sealed partial class FormPlugins : Form{
         private readonly PluginManager pluginManager;
-        private readonly TabButton tabBtnOfficial, tabBtnCustom;
-        private readonly PluginListFlowLayout flowLayoutPlugins;
-
-        private PluginGroup? selectedGroup;
         
         public FormPlugins(){
             InitializeComponent();
@@ -25,66 +18,41 @@ namespace TweetDck.Core.Other{
 
         public FormPlugins(PluginManager pluginManager) : this(){
             this.pluginManager = pluginManager;
-            this.pluginManager.Reloaded += pluginManager_Reloaded;
-
-            this.flowLayoutPlugins = new PluginListFlowLayout();
-            this.flowLayoutPlugins.Resize += flowLayoutPlugins_Resize;
-
-            this.tabPanelPlugins.SetupTabPanel(90);
-            this.tabPanelPlugins.ReplaceContent(flowLayoutPlugins);
-
-            this.tabBtnOfficial = tabPanelPlugins.AddButton("", () => SelectGroup(PluginGroup.Official));
-            this.tabBtnCustom = tabPanelPlugins.AddButton("", () => SelectGroup(PluginGroup.Custom));
-
-            this.pluginManager_Reloaded(pluginManager, null);
 
             Shown += (sender, args) => {
                 Program.UserConfig.PluginsWindow.Restore(this, false);
-                this.tabPanelPlugins.SelectTab(tabBtnOfficial);
+                ReloadPluginList();
             };
 
             FormClosed += (sender, args) => {
                 Program.UserConfig.PluginsWindow.Save(this);
                 Program.UserConfig.Save();
             };
-
-            Disposed += (sender, args) => this.pluginManager.Reloaded -= pluginManager_Reloaded;
         }
 
-        private void SelectGroup(PluginGroup group){
+        private int GetPluginOrderIndex(Plugin plugin){
-            if (selectedGroup.HasValue && selectedGroup == group)return;
+            return !plugin.CanRun ? 0 : pluginManager.Config.IsEnabled(plugin) ? 1 : 2;
-
-            selectedGroup = group;
-            
-            ReloadPluginTab();
         }
 
-        public void ReloadPluginTab(){
+        private void ReloadPluginList(){
-            if (!selectedGroup.HasValue)return;
-
             flowLayoutPlugins.SuspendLayout();
             flowLayoutPlugins.Controls.Clear();
 
-            Plugin[] plugins = pluginManager.GetPluginsByGroup(selectedGroup.Value).OrderBy(plugin => !plugin.CanRun ? 0 : pluginManager.Config.IsEnabled(plugin) ? 1 : 2).ThenBy(plugin => plugin.Name).ToArray();
+            foreach(Plugin plugin in pluginManager.Plugins.OrderBy(GetPluginOrderIndex).ThenBy(plugin => plugin.Name)){
+                flowLayoutPlugins.Controls.Add(new PluginControl(pluginManager, plugin));
 
-            for(int index = 0; index < plugins.Length; index++){
-                flowLayoutPlugins.Controls.Add(new PluginControl(pluginManager, plugins[index]));
-
-                if (index < plugins.Length-1){
                 flowLayoutPlugins.Controls.Add(new Panel{
                     BackColor = Color.DimGray,
+                    Margin = new Padding(0),
                     Size = new Size(1, 1)
                 });
             }
-            }
 
             flowLayoutPlugins.ResumeLayout(true);
-            flowLayoutPlugins_Resize(flowLayoutPlugins, new EventArgs());
-        }
             
-        private void pluginManager_Reloaded(object sender, PluginErrorEventArgs e){
+            // sorry, I guess...
-            tabBtnOfficial.Text = "Official: "+pluginManager.CountPluginByGroup(PluginGroup.Official);
+            Padding = new Padding(Padding.Left, Padding.Top, Padding.Right+1, Padding.Bottom);
-            tabBtnCustom.Text = "Custom: "+pluginManager.CountPluginByGroup(PluginGroup.Custom);
+            Padding = new Padding(Padding.Left, Padding.Top, Padding.Right-1, Padding.Bottom);
         }
 
         private void flowLayoutPlugins_Resize(object sender, EventArgs e){
@@ -103,6 +71,7 @@ namespace TweetDck.Core.Other{
                 control.Width = flowLayoutPlugins.Width-control.Margin.Horizontal-horizontalOffset;
             }
             
+            lastControl.Visible = !showScrollBar;
             flowLayoutPlugins.Focus();
         }
 
@@ -113,7 +82,7 @@ namespace TweetDck.Core.Other{
         private void btnReload_Click(object sender, EventArgs e){
             if (MessageBox.Show("This will also reload the browser window. Do you want to proceed?", "Reloading Plugins", MessageBoxButtons.YesNo, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button2) == DialogResult.Yes){
                 pluginManager.Reload();
-                ReloadPluginTab();
+                ReloadPluginList();
             }
         }
 

Core/Other/FormSettings.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDck.Core.Other {
+namespace TweetDuck.Core.Other {
     sealed partial class FormSettings {
         /// <summary>
         /// Required designer variable.
@@ -24,53 +24,72 @@
         /// </summary>
         private void InitializeComponent() {
             this.btnClose = new System.Windows.Forms.Button();
-            this.labelTip = new System.Windows.Forms.Label();
+            this.panelContents = new System.Windows.Forms.Panel();
-            this.tabPanel = new TweetDck.Core.Controls.TabPanel();
+            this.panelButtons = new System.Windows.Forms.Panel();
+            this.btnManageOptions = new System.Windows.Forms.Button();
             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(443, 349);
+            this.btnClose.Location = new System.Drawing.Point(449, 447);
             this.btnClose.Name = "btnClose";
             this.btnClose.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
             this.btnClose.Size = new System.Drawing.Size(49, 23);
-            this.btnClose.TabIndex = 4;
+            this.btnClose.TabIndex = 3;
             this.btnClose.Text = "Close";
             this.btnClose.UseVisualStyleBackColor = true;
             this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
             // 
-            // labelTip
+            // panelContents
             // 
-            this.labelTip.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.panelContents.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            this.labelTip.AutoSize = true;
-            this.labelTip.Location = new System.Drawing.Point(12, 351);
-            this.labelTip.Name = "labelTip";
-            this.labelTip.Size = new System.Drawing.Size(310, 13);
-            this.labelTip.TabIndex = 5;
-            this.labelTip.Text = "Tip: Move your cursor over an option to see detailed explanation";
-            // 
-            // tabPanel
-            // 
-            this.tabPanel.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.tabPanel.Location = new System.Drawing.Point(12, 12);
+            this.panelContents.AutoScroll = true;
-            this.tabPanel.Name = "tabPanel";
+            this.panelContents.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
-            this.tabPanel.Size = new System.Drawing.Size(480, 331);
+            this.panelContents.Location = new System.Drawing.Point(135, 12);
-            this.tabPanel.TabIndex = 3;
+            this.panelContents.Margin = new System.Windows.Forms.Padding(0, 3, 3, 3);
+            this.panelContents.Name = "panelContents";
+            this.panelContents.Size = new System.Drawing.Size(363, 429);
+            this.panelContents.TabIndex = 1;
+            // 
+            // panelButtons
+            // 
+            this.panelButtons.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left)));
+            this.panelButtons.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle;
+            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, 429);
+            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, 447);
+            this.btnManageOptions.Name = "btnManageOptions";
+            this.btnManageOptions.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.btnManageOptions.Size = new System.Drawing.Size(101, 23);
+            this.btnManageOptions.TabIndex = 4;
+            this.btnManageOptions.Text = "Manage Options";
+            this.btnManageOptions.UseVisualStyleBackColor = true;
+            this.btnManageOptions.Click += new System.EventHandler(this.btnManageOptions_Click);
             // 
             // FormSettings
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(504, 384);
+            this.ClientSize = new System.Drawing.Size(510, 482);
-            this.Controls.Add(this.labelTip);
+            this.Controls.Add(this.btnManageOptions);
+            this.Controls.Add(this.panelContents);
+            this.Controls.Add(this.panelButtons);
             this.Controls.Add(this.btnClose);
-            this.Controls.Add(this.tabPanel);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-            this.Icon = global::TweetDck.Properties.Resources.icon;
+            this.Icon = global::TweetDuck.Properties.Resources.icon;
             this.MaximizeBox = false;
             this.MinimizeBox = false;
             this.Name = "FormSettings";
@@ -82,9 +101,9 @@
         }
 
         #endregion
-
-        private Controls.TabPanel tabPanel;
         private System.Windows.Forms.Button btnClose;
-        private System.Windows.Forms.Label labelTip;
+        private System.Windows.Forms.Panel panelContents;
+        private System.Windows.Forms.Panel panelButtons;
+        private System.Windows.Forms.Button btnManageOptions;
     }
 }

Core/Other/FormSettings.cs

@@ -1,70 +1,151 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
+using System.Drawing;
 using System.Windows.Forms;
-using TweetDck.Core.Other.Settings;
+using TweetDuck.Core.Controls;
-using TweetDck.Plugins;
+using TweetDuck.Core.Other.Settings;
-using TweetDck.Updates;
+using TweetDuck.Core.Other.Settings.Dialogs;
+using TweetDuck.Core.Utils;
+using TweetDuck.Plugins;
+using TweetDuck.Updates;
 
-namespace TweetDck.Core.Other{
+namespace TweetDuck.Core.Other{
     sealed partial class FormSettings : Form{
-        public const int TabIndexNotification = 1;
-
         private readonly FormBrowser browser;
-        private readonly Dictionary<Type, BaseTabSettings> tabs = new Dictionary<Type, BaseTabSettings>(4);
+        private readonly PluginManager plugins;
 
-        public FormSettings(FormBrowser browser, PluginManager plugins, UpdateHandler updates, int startTabIndex = 0){
+        private readonly int buttonHeight;
+
+        private readonly Dictionary<Type, SettingsTab> tabs = new Dictionary<Type, SettingsTab>(4);
+        private SettingsTab currentTab;
+
+        public FormSettings(FormBrowser browser, PluginManager plugins, UpdateHandler updates, Type startTab){
             InitializeComponent();
 
-            Text = Program.BrandName+" Settings";
+            Text = Program.BrandName+" Options";
 
             this.browser = browser;
             this.browser.PauseNotification();
 
-            this.tabPanel.SetupTabPanel(100);
+            this.plugins = plugins;
-            this.tabPanel.AddButton("General", () => SelectTab(() => new TabSettingsGeneral(updates)));
-            this.tabPanel.AddButton("Notifications", () => SelectTab(() => new TabSettingsNotifications(browser.CreateNotificationForm(false))));
-            this.tabPanel.AddButton("Sounds", () => SelectTab(() => new TabSettingsSounds()));
-            this.tabPanel.AddButton("Advanced", () => SelectTab(() => new TabSettingsAdvanced(browser.ReinjectCustomCSS, plugins)));
             
-            this.tabPanel.SelectTab(tabPanel.Buttons.ElementAt(startTabIndex));
+            this.buttonHeight = BrowserUtils.Scale(39, this.GetDPIScale()) | 1;
-        }
 
-        private void SelectTab<T>(Func<T> constructor) where T : BaseTabSettings{
+            AddButton("General", () => new TabSettingsGeneral(updates));
-            BaseTabSettings control;
+            AddButton("Notifications", () => new TabSettingsNotifications(browser.CreateNotificationForm(false)));
+            AddButton("Sounds", () => new TabSettingsSounds());
+            AddButton("Advanced", () => new TabSettingsAdvanced(browser.ReinjectCustomCSS));
 
-            if (tabs.TryGetValue(typeof(T), out control)){
+            SelectTab(tabs[startTab ?? typeof(TabSettingsGeneral)]);
-                tabPanel.ReplaceContent(control);
-            }
-            else{
-                control = tabs[typeof(T)] = constructor();
-                control.OnReady();
-                tabPanel.ReplaceContent(control);
-            }
         }
 
         private void FormSettings_FormClosing(object sender, FormClosingEventArgs e){
-            foreach(BaseTabSettings control in tabs.Values){
+            foreach(SettingsTab tab in tabs.Values){
-                control.OnClosing();
+                if (tab.IsInitialized){
+                    tab.Control.OnClosing();
+                    tab.Control.Dispose();
+                }
             }
             
             Program.UserConfig.Save();
-
+            browser.ResumeNotification();
-            foreach(BaseTabSettings control in tabs.Values){
-                control.Dispose();
         }
 
-            browser.ResumeNotification();
+        private void btnManageOptions_Click(object sender, EventArgs e){
+            using(DialogSettingsManage dialog = new DialogSettingsManage(plugins)){
+                if (dialog.ShowDialog() == DialogResult.OK && dialog.ShouldReloadUI){
+                    foreach(SettingsTab tab in tabs.Values){
+                        tab.Control = null;
+                    }
+
+                    SelectTab(currentTab);
+                }
+            }
         }
 
         private void btnClose_Click(object sender, EventArgs e){
             Close();
         }
 
-        public void ReloadUI(){
+        private void AddButton<T>(string title, Func<T> constructor) where T : BaseTabSettings{
-            tabs.Clear();
+            FlatButton btn = new FlatButton{
-            tabPanel.Content.Controls.Clear();
+                BackColor = SystemColors.Control,
-            tabPanel.ActiveButton.Callback();
+                FlatStyle = FlatStyle.Flat,
+                Location = new Point(0, (buttonHeight+1)*(panelButtons.Controls.Count/2)),
+                Margin = new Padding(0),
+                Size = new Size(panelButtons.Width, buttonHeight),
+                Text = title,
+                UseVisualStyleBackColor = true
+            };
+
+            btn.FlatAppearance.BorderSize = 0;
+            btn.FlatAppearance.MouseDownBackColor = Color.FromArgb(179, 213, 232);
+            btn.FlatAppearance.MouseOverBackColor = Color.FromArgb(216, 230, 237);
+            
+            panelButtons.Controls.Add(btn);
+
+            panelButtons.Controls.Add(new Panel{
+                BackColor = Color.DimGray,
+                Location = new Point(0, panelButtons.Controls[panelButtons.Controls.Count-1].Location.Y+buttonHeight),
+                Margin = new Padding(0),
+                Size = new Size(panelButtons.Width, 1)
+            });
+
+            tabs.Add(typeof(T), new SettingsTab(btn, constructor));
+
+            btn.Click += (sender, args) => SelectTab<T>();
+        }
+
+        private void SelectTab<T>() where T : BaseTabSettings{
+            SelectTab(tabs[typeof(T)]);
+        }
+
+        private void SelectTab(SettingsTab tab){
+            if (currentTab != null){
+                currentTab.Button.BackColor = SystemColors.Control;
+            }
+            
+            tab.Button.BackColor = tab.Button.FlatAppearance.MouseDownBackColor;
+
+            if (!tab.IsInitialized){
+                foreach(Control control in tab.Control.InteractiveControls){
+                    control.MouseLeave += control_MouseLeave;
+                }
+
+                tab.Control.OnReady();
+            }
+            
+            panelContents.SuspendLayout();
+            panelContents.VerticalScroll.Value = 0; // https://gfycat.com/GrotesqueTastyAstarte
+            panelContents.Controls.Clear();
+            panelContents.Controls.Add(tab.Control);
+            panelContents.ResumeLayout(true);
+            panelContents.Focus();
+
+            currentTab = tab;
+        }
+
+        private void control_MouseLeave(object sender, EventArgs e){
+            panelContents.Focus();
+        }
+
+        private class SettingsTab{
+            public Button Button { get; }
+
+            public BaseTabSettings Control{
+                get => control ?? (control = constructor());
+                set => control = value;
+            }
+
+            public bool IsInitialized => control != null;
+
+            private readonly Func<BaseTabSettings> constructor;
+            private BaseTabSettings control;
+
+            public SettingsTab(Button button, Func<BaseTabSettings> constructor){
+                this.Button = button;
+                this.constructor = constructor;
+            }
         }
     }
 }

Core/Other/Settings/BaseTabSettings.cs

@@ -1,11 +1,19 @@
-using System.Windows.Forms;
+using System.Collections.Generic;
-using TweetDck.Configuration;
+using System.Linq;
+using System.Windows.Forms;
+using TweetDuck.Configuration;
 
-namespace TweetDck.Core.Other.Settings{
+namespace TweetDuck.Core.Other.Settings{
     class BaseTabSettings : UserControl{
-        protected static UserConfig Config{
+        protected static UserConfig Config => Program.UserConfig;
+
+        public IEnumerable<Control> InteractiveControls{
             get{
-                return Program.UserConfig;
+                foreach(Panel panel in Controls.OfType<Panel>()){
+                    foreach(Control control in panel.Controls){
+                        yield return control;
+                    }
+                }
             }
         }
 
@@ -17,7 +25,7 @@ namespace TweetDck.Core.Other.Settings{
         public virtual void OnClosing(){}
 
         protected static void PromptRestart(){
-            if (MessageBox.Show("The application must restart for the setting to take place. Do you want to restart now?", Program.BrandName+" Settings", MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.Yes){
+            if (MessageBox.Show("The application must restart for the option to take place. Do you want to restart now?", Program.BrandName+" Options", MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.Yes){
                 Program.Restart();
             }
         }

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

@@ -1,4 +1,4 @@
-namespace TweetDck.Core.Other.Settings.Dialogs {
+namespace TweetDuck.Core.Other.Settings.Dialogs {
     partial class DialogSettingsCSS {
         /// <summary>
         /// Required designer variable.
@@ -42,16 +42,14 @@
             // 
             // textBoxBrowserCSS
             // 
-            this.textBoxBrowserCSS.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.textBoxBrowserCSS.Dock = System.Windows.Forms.DockStyle.Bottom;
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
             this.textBoxBrowserCSS.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.textBoxBrowserCSS.Location = new System.Drawing.Point(0, 16);
             this.textBoxBrowserCSS.Margin = new System.Windows.Forms.Padding(0, 3, 0, 0);
             this.textBoxBrowserCSS.Multiline = true;
             this.textBoxBrowserCSS.Name = "textBoxBrowserCSS";
             this.textBoxBrowserCSS.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.textBoxBrowserCSS.Size = new System.Drawing.Size(373, 253);
+            this.textBoxBrowserCSS.Size = new System.Drawing.Size(378, 253);
             this.textBoxBrowserCSS.TabIndex = 1;
             this.textBoxBrowserCSS.WordWrap = false;
             this.textBoxBrowserCSS.KeyUp += new System.Windows.Forms.KeyEventHandler(this.textBoxBrowserCSS_KeyUp);
@@ -100,7 +98,7 @@
             this.splitContainer.Panel2.Controls.Add(this.textBoxNotificationCSS);
             this.splitContainer.Panel2MinSize = 64;
             this.splitContainer.Size = new System.Drawing.Size(760, 269);
-            this.splitContainer.SplitterDistance = 373;
+            this.splitContainer.SplitterDistance = 378;
             this.splitContainer.SplitterWidth = 5;
             this.splitContainer.TabIndex = 0;
             // 
@@ -126,16 +124,14 @@
             // 
             // textBoxNotificationCSS
             // 
-            this.textBoxNotificationCSS.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            this.textBoxNotificationCSS.Dock = System.Windows.Forms.DockStyle.Bottom;
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
             this.textBoxNotificationCSS.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
             this.textBoxNotificationCSS.Location = new System.Drawing.Point(0, 16);
             this.textBoxNotificationCSS.Margin = new System.Windows.Forms.Padding(0, 3, 0, 0);
             this.textBoxNotificationCSS.Multiline = true;
             this.textBoxNotificationCSS.Name = "textBoxNotificationCSS";
             this.textBoxNotificationCSS.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.textBoxNotificationCSS.Size = new System.Drawing.Size(372, 253);
+            this.textBoxNotificationCSS.Size = new System.Drawing.Size(377, 253);
             this.textBoxNotificationCSS.TabIndex = 1;
             this.textBoxNotificationCSS.WordWrap = false;
             // 
@@ -152,7 +148,6 @@
             // btnOpenWiki
             // 
             this.btnOpenWiki.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.btnOpenWiki.AutoSize = true;
             this.btnOpenWiki.Location = new System.Drawing.Point(12, 287);
             this.btnOpenWiki.Name = "btnOpenWiki";
             this.btnOpenWiki.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);

Core/Other/Settings/Dialogs/DialogSettingsCSS.cs

@@ -1,28 +1,19 @@
 using System;
 using System.Windows.Forms;
-using TweetDck.Core.Controls;
+using TweetDuck.Core.Controls;
-using TweetDck.Core.Utils;
+using TweetDuck.Core.Utils;
 
-namespace TweetDck.Core.Other.Settings.Dialogs{
+namespace TweetDuck.Core.Other.Settings.Dialogs{
     sealed partial class DialogSettingsCSS : Form{
-        public string BrowserCSS{
+        public string BrowserCSS => textBoxBrowserCSS.Text;
-            get{
+        public string NotificationCSS => textBoxNotificationCSS.Text;
-                return textBoxBrowserCSS.Text;
-            }
-        }
-        
-        public string NotificationCSS{
-            get{
-                return textBoxNotificationCSS.Text;
-            }
-        }
 
         private readonly Action<string> reinjectBrowserCSS;
 
         public DialogSettingsCSS(Action<string> reinjectBrowserCSS){
             InitializeComponent();
             
-            Text = Program.BrandName+" Settings - CSS";
+            Text = Program.BrandName+" Options - CSS";
 
             this.reinjectBrowserCSS = reinjectBrowserCSS;
             

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

@@ -1,4 +1,4 @@
-namespace TweetDck.Core.Other.Settings.Dialogs {
+namespace TweetDuck.Core.Other.Settings.Dialogs {
     partial class DialogSettingsCefArgs {
         /// <summary>
         /// Required designer variable.
@@ -69,7 +69,6 @@
             // btnHelp
             // 
             this.btnHelp.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
-            this.btnHelp.AutoSize = true;
             this.btnHelp.Location = new System.Drawing.Point(12, 227);
             this.btnHelp.Name = "btnHelp";
             this.btnHelp.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);

Core/Other/Settings/Dialogs/DialogSettingsCefArgs.cs

@@ -1,20 +1,16 @@
 using System;
 using System.Windows.Forms;
-using TweetDck.Core.Controls;
+using TweetDuck.Core.Controls;
-using TweetDck.Core.Utils;
+using TweetDuck.Core.Utils;
 
-namespace TweetDck.Core.Other.Settings.Dialogs{
+namespace TweetDuck.Core.Other.Settings.Dialogs{
     sealed partial class DialogSettingsCefArgs : Form{
-        public string CefArgs{
+        public string CefArgs => textBoxArgs.Text;
-            get{
-                return textBoxArgs.Text;
-            }
-        }
 
         public DialogSettingsCefArgs(){
             InitializeComponent();
             
-            Text = Program.BrandName+" Settings - CEF Arguments";
+            Text = Program.BrandName+" Options - CEF Arguments";
             
             textBoxArgs.EnableMultilineShortcuts();
             textBoxArgs.Text = Program.UserConfig.CustomCefArgs ?? "";
@@ -35,7 +31,7 @@ namespace TweetDck.Core.Other.Settings.Dialogs{
             }
 
             int count = CommandLineArgsParser.ReadCefArguments(CefArgs).Count;
-            string prompt = count == 0 && !string.IsNullOrWhiteSpace(prevArgs) ? "All arguments will be removed from the settings. Continue?" : count+(count == 1 ? " argument" : " arguments")+" will be added to the settings. Continue?";
+            string prompt = count == 0 && !string.IsNullOrWhiteSpace(prevArgs) ? "All current arguments will be removed. Continue?" : count+(count == 1 ? " argument was" : " arguments were")+" detected. Continue?";
 
             if (MessageBox.Show(prompt, "Confirm CEF Arguments", MessageBoxButtons.OKCancel, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) == DialogResult.OK){
                 DialogResult = DialogResult.OK;

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

@@ -1,130 +0,0 @@
-namespace TweetDck.Core.Other.Settings.Dialogs {
-    partial class DialogSettingsExport {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing) {
-            if (disposing && (components != null)) {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent() {
-            this.components = new System.ComponentModel.Container();
-            this.btnCancel = new System.Windows.Forms.Button();
-            this.btnApply = new System.Windows.Forms.Button();
-            this.cbConfig = new System.Windows.Forms.CheckBox();
-            this.cbSession = new System.Windows.Forms.CheckBox();
-            this.cbPluginData = new System.Windows.Forms.CheckBox();
-            this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-            this.SuspendLayout();
-            // 
-            // btnCancel
-            // 
-            this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnCancel.AutoSize = true;
-            this.btnCancel.Location = new System.Drawing.Point(176, 97);
-            this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
-            this.btnCancel.Size = new System.Drawing.Size(56, 23);
-            this.btnCancel.TabIndex = 4;
-            this.btnCancel.Text = "Cancel";
-            this.btnCancel.UseVisualStyleBackColor = true;
-            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
-            // 
-            // btnApply
-            // 
-            this.btnApply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnApply.AutoSize = true;
-            this.btnApply.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnApply.Location = new System.Drawing.Point(144, 97);
-            this.btnApply.Name = "btnApply";
-            this.btnApply.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
-            this.btnApply.Size = new System.Drawing.Size(26, 23);
-            this.btnApply.TabIndex = 3;
-            this.btnApply.Text = " ";
-            this.btnApply.UseVisualStyleBackColor = true;
-            this.btnApply.Click += new System.EventHandler(this.btnApply_Click);
-            // 
-            // cbConfig
-            // 
-            this.cbConfig.AutoSize = true;
-            this.cbConfig.Location = new System.Drawing.Point(13, 13);
-            this.cbConfig.Name = "cbConfig";
-            this.cbConfig.Size = new System.Drawing.Size(106, 17);
-            this.cbConfig.TabIndex = 0;
-            this.cbConfig.Text = "Program Settings";
-            this.toolTip.SetToolTip(this.cbConfig, "Interface, notification, and update settings.\r\nIncludes a list of disabled plugin" +
-        "s.");
-            this.cbConfig.UseVisualStyleBackColor = true;
-            this.cbConfig.CheckedChanged += new System.EventHandler(this.cbConfig_CheckedChanged);
-            // 
-            // cbSession
-            // 
-            this.cbSession.AutoSize = true;
-            this.cbSession.Location = new System.Drawing.Point(13, 37);
-            this.cbSession.Name = "cbSession";
-            this.cbSession.Size = new System.Drawing.Size(92, 17);
-            this.cbSession.TabIndex = 1;
-            this.cbSession.Text = "Login Session";
-            this.toolTip.SetToolTip(this.cbSession, "A token that allows logging into the\r\ncurrent TweetDeck account.");
-            this.cbSession.UseVisualStyleBackColor = true;
-            this.cbSession.CheckedChanged += new System.EventHandler(this.cbSession_CheckedChanged);
-            // 
-            // cbPluginData
-            // 
-            this.cbPluginData.AutoSize = true;
-            this.cbPluginData.Location = new System.Drawing.Point(13, 61);
-            this.cbPluginData.Name = "cbPluginData";
-            this.cbPluginData.Size = new System.Drawing.Size(81, 17);
-            this.cbPluginData.TabIndex = 2;
-            this.cbPluginData.Text = "Plugin Data";
-            this.toolTip.SetToolTip(this.cbPluginData, "Data files generated by plugins.\r\nDoes not include the plugins themselves.");
-            this.cbPluginData.UseVisualStyleBackColor = true;
-            this.cbPluginData.CheckedChanged += new System.EventHandler(this.cbPluginData_CheckedChanged);
-            // 
-            // DialogSettingsExport
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(244, 132);
-            this.Controls.Add(this.cbPluginData);
-            this.Controls.Add(this.cbSession);
-            this.Controls.Add(this.cbConfig);
-            this.Controls.Add(this.btnApply);
-            this.Controls.Add(this.btnCancel);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.MinimumSize = new System.Drawing.Size(200, 170);
-            this.Name = "DialogSettingsExport";
-            this.ShowIcon = false;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Button btnCancel;
-        private System.Windows.Forms.Button btnApply;
-        private System.Windows.Forms.CheckBox cbConfig;
-        private System.Windows.Forms.CheckBox cbSession;
-        private System.Windows.Forms.CheckBox cbPluginData;
-        private System.Windows.Forms.ToolTip toolTip;
-    }
-}

Core/Other/Settings/Dialogs/DialogSettingsExport.cs

@@ -1,82 +0,0 @@
-using System;
-using System.Windows.Forms;
-using TweetDck.Core.Other.Settings.Export;
-
-namespace TweetDck.Core.Other.Settings.Dialogs{
-    sealed partial class DialogSettingsExport : Form{
-        public static DialogSettingsExport Import(ExportFileFlags flags){
-            return new DialogSettingsExport(flags);
-        }
-
-        public static DialogSettingsExport Export(){
-            return new DialogSettingsExport(ExportFileFlags.None);
-        }
-
-        public ExportFileFlags Flags{
-            get{
-                return selectedFlags;
-            }
-
-            set{
-                // this will call events and SetFlag, which also updates the UI
-                cbConfig.Checked = value.HasFlag(ExportFileFlags.Config);
-                cbSession.Checked = value.HasFlag(ExportFileFlags.Session);
-                cbPluginData.Checked = value.HasFlag(ExportFileFlags.PluginData);
-            }
-        }
-        
-        private readonly bool isExporting;
-        private ExportFileFlags selectedFlags = ExportFileFlags.None;
-
-        private DialogSettingsExport(ExportFileFlags importFlags){
-            InitializeComponent();
-
-            this.isExporting = importFlags == ExportFileFlags.None;
-
-            if (isExporting){
-                Text = "Export Profile";
-                btnApply.Text = "Export Profile";
-                Flags = ExportFileFlags.All & ~ExportFileFlags.Session;
-            }
-            else{
-                Text = "Import Profile";
-                Flags = importFlags;
-
-                cbConfig.Enabled = cbConfig.Checked;
-                cbSession.Enabled = cbSession.Checked;
-                cbPluginData.Enabled = cbPluginData.Checked;
-            }
-        }
-
-        private void SetFlag(ExportFileFlags flag, bool enable){
-            selectedFlags = enable ? selectedFlags | flag : selectedFlags & ~flag;
-            btnApply.Enabled = selectedFlags != ExportFileFlags.None;
-
-            if (!isExporting){
-                btnApply.Text = selectedFlags.HasFlag(ExportFileFlags.Session) ? "Import && Restart" : "Import Profile";
-            }
-        }
-
-        private void cbConfig_CheckedChanged(object sender, EventArgs e){
-            SetFlag(ExportFileFlags.Config, cbConfig.Checked);
-        }
-
-        private void cbSession_CheckedChanged(object sender, EventArgs e){
-            SetFlag(ExportFileFlags.Session, cbSession.Checked);
-        }
-
-        private void cbPluginData_CheckedChanged(object sender, EventArgs e){
-            SetFlag(ExportFileFlags.PluginData, cbPluginData.Checked);
-        }
-
-        private void btnApply_Click(object sender, EventArgs e){
-            DialogResult = DialogResult.OK;
-            Close();
-        }
-
-        private void btnCancel_Click(object sender, EventArgs e){
-            DialogResult = DialogResult.Cancel;
-            Close();
-        }
-    }
-}

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

@@ -0,0 +1,201 @@
+namespace TweetDuck.Core.Other.Settings.Dialogs {
+    partial class DialogSettingsManage {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing) {
+            if (disposing && (components != null)) {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent() {
+            this.components = new System.ComponentModel.Container();
+            this.btnCancel = new System.Windows.Forms.Button();
+            this.btnContinue = new System.Windows.Forms.Button();
+            this.cbConfig = new System.Windows.Forms.CheckBox();
+            this.cbSession = new System.Windows.Forms.CheckBox();
+            this.cbPluginData = new System.Windows.Forms.CheckBox();
+            this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+            this.panelExport = new System.Windows.Forms.Panel();
+            this.panelDecision = new System.Windows.Forms.Panel();
+            this.radioReset = new System.Windows.Forms.RadioButton();
+            this.radioExport = new System.Windows.Forms.RadioButton();
+            this.radioImport = new System.Windows.Forms.RadioButton();
+            this.panelExport.SuspendLayout();
+            this.panelDecision.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
+            this.btnCancel.Location = new System.Drawing.Point(176, 97);
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.btnCancel.Size = new System.Drawing.Size(56, 23);
+            this.btnCancel.TabIndex = 4;
+            this.btnCancel.Text = "Cancel";
+            this.btnCancel.UseVisualStyleBackColor = true;
+            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+            // 
+            // btnContinue
+            // 
+            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(125, 97);
+            this.btnContinue.Name = "btnContinue";
+            this.btnContinue.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.btnContinue.Size = new System.Drawing.Size(45, 23);
+            this.btnContinue.TabIndex = 3;
+            this.btnContinue.Text = "Next";
+            this.btnContinue.UseVisualStyleBackColor = true;
+            this.btnContinue.Click += new System.EventHandler(this.btnContinue_Click);
+            // 
+            // cbConfig
+            // 
+            this.cbConfig.AutoSize = true;
+            this.cbConfig.Location = new System.Drawing.Point(0, 3);
+            this.cbConfig.Name = "cbConfig";
+            this.cbConfig.Size = new System.Drawing.Size(104, 17);
+            this.cbConfig.TabIndex = 0;
+            this.cbConfig.Text = "Program Options";
+            this.toolTip.SetToolTip(this.cbConfig, "Interface, notification, and update options.");
+            this.cbConfig.UseVisualStyleBackColor = true;
+            this.cbConfig.CheckedChanged += new System.EventHandler(this.cbConfig_CheckedChanged);
+            // 
+            // cbSession
+            // 
+            this.cbSession.AutoSize = true;
+            this.cbSession.Location = new System.Drawing.Point(0, 27);
+            this.cbSession.Name = "cbSession";
+            this.cbSession.Size = new System.Drawing.Size(92, 17);
+            this.cbSession.TabIndex = 1;
+            this.cbSession.Text = "Login Session";
+            this.toolTip.SetToolTip(this.cbSession, "A token that allows logging into the\r\ncurrent TweetDeck account.");
+            this.cbSession.UseVisualStyleBackColor = true;
+            this.cbSession.CheckedChanged += new System.EventHandler(this.cbSession_CheckedChanged);
+            // 
+            // cbPluginData
+            // 
+            this.cbPluginData.AutoSize = true;
+            this.cbPluginData.Location = new System.Drawing.Point(0, 51);
+            this.cbPluginData.Name = "cbPluginData";
+            this.cbPluginData.Size = new System.Drawing.Size(81, 17);
+            this.cbPluginData.TabIndex = 2;
+            this.cbPluginData.Text = "Plugin Data";
+            this.toolTip.SetToolTip(this.cbPluginData, "Data files generated by plugins.\r\nDoes not include the plugins themselves.");
+            this.cbPluginData.UseVisualStyleBackColor = true;
+            this.cbPluginData.CheckedChanged += new System.EventHandler(this.cbPluginData_CheckedChanged);
+            // 
+            // panelExport
+            // 
+            this.panelExport.Controls.Add(this.cbConfig);
+            this.panelExport.Controls.Add(this.cbPluginData);
+            this.panelExport.Controls.Add(this.cbSession);
+            this.panelExport.Location = new System.Drawing.Point(12, 12);
+            this.panelExport.Name = "panelExport";
+            this.panelExport.Size = new System.Drawing.Size(220, 79);
+            this.panelExport.TabIndex = 5;
+            this.panelExport.Visible = false;
+            // 
+            // panelDecision
+            // 
+            this.panelDecision.Controls.Add(this.radioReset);
+            this.panelDecision.Controls.Add(this.radioExport);
+            this.panelDecision.Controls.Add(this.radioImport);
+            this.panelDecision.Location = new System.Drawing.Point(12, 12);
+            this.panelDecision.Name = "panelDecision";
+            this.panelDecision.Size = new System.Drawing.Size(220, 79);
+            this.panelDecision.TabIndex = 6;
+            // 
+            // radioReset
+            // 
+            this.radioReset.AutoSize = true;
+            this.radioReset.Location = new System.Drawing.Point(3, 49);
+            this.radioReset.Name = "radioReset";
+            this.radioReset.Size = new System.Drawing.Size(104, 17);
+            this.radioReset.TabIndex = 2;
+            this.radioReset.TabStop = true;
+            this.radioReset.Text = "Restore Defaults";
+            this.radioReset.UseVisualStyleBackColor = true;
+            this.radioReset.CheckedChanged += new System.EventHandler(this.radioDecision_CheckedChanged);
+            // 
+            // radioExport
+            // 
+            this.radioExport.AutoSize = true;
+            this.radioExport.Location = new System.Drawing.Point(3, 26);
+            this.radioExport.Name = "radioExport";
+            this.radioExport.Size = new System.Drawing.Size(87, 17);
+            this.radioExport.TabIndex = 1;
+            this.radioExport.TabStop = true;
+            this.radioExport.Text = "Export Profile";
+            this.radioExport.UseVisualStyleBackColor = true;
+            this.radioExport.CheckedChanged += new System.EventHandler(this.radioDecision_CheckedChanged);
+            // 
+            // radioImport
+            // 
+            this.radioImport.AutoSize = true;
+            this.radioImport.Location = new System.Drawing.Point(3, 3);
+            this.radioImport.Name = "radioImport";
+            this.radioImport.Size = new System.Drawing.Size(86, 17);
+            this.radioImport.TabIndex = 0;
+            this.radioImport.TabStop = true;
+            this.radioImport.Text = "Import Profile";
+            this.radioImport.UseVisualStyleBackColor = true;
+            this.radioImport.CheckedChanged += new System.EventHandler(this.radioDecision_CheckedChanged);
+            // 
+            // DialogSettingsManage
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(244, 132);
+            this.Controls.Add(this.panelDecision);
+            this.Controls.Add(this.panelExport);
+            this.Controls.Add(this.btnContinue);
+            this.Controls.Add(this.btnCancel);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.MinimumSize = new System.Drawing.Size(200, 170);
+            this.Name = "DialogSettingsManage";
+            this.ShowIcon = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+            this.Text = "Manage Options";
+            this.panelExport.ResumeLayout(false);
+            this.panelExport.PerformLayout();
+            this.panelDecision.ResumeLayout(false);
+            this.panelDecision.PerformLayout();
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Button btnCancel;
+        private System.Windows.Forms.Button btnContinue;
+        private System.Windows.Forms.CheckBox cbConfig;
+        private System.Windows.Forms.CheckBox cbSession;
+        private System.Windows.Forms.CheckBox cbPluginData;
+        private System.Windows.Forms.ToolTip toolTip;
+        private System.Windows.Forms.Panel panelExport;
+        private System.Windows.Forms.Panel panelDecision;
+        private System.Windows.Forms.RadioButton radioReset;
+        private System.Windows.Forms.RadioButton radioExport;
+        private System.Windows.Forms.RadioButton radioImport;
+    }
+}

Core/Other/Settings/Dialogs/DialogSettingsManage.cs

@@ -0,0 +1,170 @@
+using System;
+using System.Windows.Forms;
+using TweetDuck.Core.Other.Settings.Export;
+using TweetDuck.Plugins;
+
+namespace TweetDuck.Core.Other.Settings.Dialogs{
+    sealed partial class DialogSettingsManage : Form{
+        private enum State{
+            Deciding, Import, Export
+        }
+
+        public ExportFileFlags Flags{
+            get => selectedFlags;
+
+            set{
+                // this will call events and SetFlag, which also updates the UI
+                cbConfig.Checked = value.HasFlag(ExportFileFlags.Config);
+                cbSession.Checked = value.HasFlag(ExportFileFlags.Session);
+                cbPluginData.Checked = value.HasFlag(ExportFileFlags.PluginData);
+            }
+        }
+
+        public bool ShouldReloadUI { get; private set; }
+        
+        private readonly PluginManager plugins;
+        private State currentState;
+
+        private ExportManager importManager;
+        private ExportFileFlags selectedFlags = ExportFileFlags.None;
+
+        public DialogSettingsManage(PluginManager plugins){
+            InitializeComponent();
+
+            this.plugins = plugins;
+            this.currentState = State.Deciding;
+        }
+
+        private void radioDecision_CheckedChanged(object sender, EventArgs e){
+            btnContinue.Enabled = true;
+        }
+
+        private void cbConfig_CheckedChanged(object sender, EventArgs e){
+            SetFlag(ExportFileFlags.Config, cbConfig.Checked);
+        }
+
+        private void cbSession_CheckedChanged(object sender, EventArgs e){
+            SetFlag(ExportFileFlags.Session, cbSession.Checked);
+        }
+
+        private void cbPluginData_CheckedChanged(object sender, EventArgs e){
+            SetFlag(ExportFileFlags.PluginData, cbPluginData.Checked);
+        }
+
+        private void btnContinue_Click(object sender, EventArgs e){
+            string file;
+
+            switch(currentState){
+                case State.Deciding:
+                    // Reset
+                    if (radioReset.Checked){
+                        if (MessageBox.Show("This will reset all of your program options. Plugins will not be affected. Do you want to proceed?", "Reset "+Program.BrandName+" Options", MessageBoxButtons.YesNo, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button2) == DialogResult.Yes){
+                            Program.ResetConfig();
+
+                            ShouldReloadUI = true;
+                            DialogResult = DialogResult.OK;
+                            Close();
+                        }
+
+                        return;
+                    }
+
+                    // Import
+                    else if (radioImport.Checked){
+                        using(OpenFileDialog dialog = new OpenFileDialog{
+                            AutoUpgradeEnabled = true,
+                            DereferenceLinks = true,
+                            Title = "Import "+Program.BrandName+" Profile",
+                            Filter = Program.BrandName+" Profile (*.tdsettings)|*.tdsettings"
+                        }){
+                            if (dialog.ShowDialog() != DialogResult.OK){
+                                return;
+                            }
+
+                            file = dialog.FileName;
+                        }
+
+                        importManager = new ExportManager(file, plugins);
+                        currentState = State.Import;
+
+                        Text = "Import Profile";
+                        Flags = importManager.GetImportFlags();
+
+                        cbConfig.Enabled = cbConfig.Checked;
+                        cbSession.Enabled = cbSession.Checked;
+                        cbPluginData.Enabled = cbPluginData.Checked;
+                    }
+
+                    // Export
+                    else if (radioExport.Checked){
+                        currentState = State.Export;
+
+                        Text = "Export Profile";
+                        btnContinue.Text = "Export Profile";
+                        Flags = ExportFileFlags.All & ~ExportFileFlags.Session;
+                    }
+                    
+                    // Continue...
+                    panelDecision.Visible = false;
+                    panelExport.Visible = true;
+                    break;
+
+                case State.Import:
+                    if (importManager.Import(Flags)){
+                        if (!importManager.IsRestarting){
+                            ShouldReloadUI = true;
+                        }
+                    }
+                    else{
+                        Program.Reporter.HandleException("Profile Import Error", "An exception happened while importing "+Program.BrandName+" profile.", true, importManager.LastException);
+                    }
+                    
+                    DialogResult = DialogResult.OK;
+                    Close();
+                    break;
+
+                case State.Export:
+                    using(SaveFileDialog dialog = new SaveFileDialog{
+                        AddExtension = true,
+                        AutoUpgradeEnabled = true,
+                        OverwritePrompt = true,
+                        DefaultExt = "tdsettings",
+                        FileName = Program.BrandName+".tdsettings",
+                        Title = "Export "+Program.BrandName+" Profile",
+                        Filter = Program.BrandName+" Profile (*.tdsettings)|*.tdsettings"
+                    }){
+                        if (dialog.ShowDialog() != DialogResult.OK){
+                            return;
+                        }
+
+                        file = dialog.FileName;
+                    }
+
+                    Program.UserConfig.Save();
+                    ExportManager manager = new ExportManager(file, plugins);
+
+                    if (!manager.Export(Flags)){
+                        Program.Reporter.HandleException("Profile Export Error", "An exception happened while exporting "+Program.BrandName+" profile.", true, manager.LastException);
+                    }
+
+                    DialogResult = DialogResult.OK;
+                    Close();
+                    break;
+            }
+        }
+
+        private void btnCancel_Click(object sender, EventArgs e){
+            DialogResult = DialogResult.Cancel;
+            Close();
+        }
+
+        private void SetFlag(ExportFileFlags flag, bool enable){
+            selectedFlags = enable ? selectedFlags | flag : selectedFlags & ~flag;
+            btnContinue.Enabled = selectedFlags != ExportFileFlags.None;
+
+            if (currentState == State.Import){
+                btnContinue.Text = selectedFlags.HasFlag(ExportFileFlags.Session) ? "Import && Restart" : "Import Profile";
+            }
+        }
+    }
+}

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

@@ -1,4 +1,4 @@
-namespace TweetDck.Core.Other.Settings.Dialogs {
+namespace TweetDuck.Core.Other.Settings.Dialogs {
     partial class DialogSettingsRestart {
         /// <summary>
         /// Required designer variable.
@@ -38,7 +38,6 @@
             // btnCancel
             // 
             this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnCancel.AutoSize = true;
             this.btnCancel.Location = new System.Drawing.Point(160, 171);
             this.btnCancel.Name = "btnCancel";
             this.btnCancel.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
@@ -51,7 +50,6 @@
             // btnRestart
             // 
             this.btnRestart.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnRestart.AutoSize = true;
             this.btnRestart.Location = new System.Drawing.Point(97, 171);
             this.btnRestart.Name = "btnRestart";
             this.btnRestart.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);

Core/Other/Settings/Dialogs/DialogSettingsRestart.cs

@@ -2,10 +2,10 @@
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
-using TweetDck.Configuration;
+using TweetDuck.Configuration;
-using TweetDck.Core.Utils;
+using TweetDuck.Core.Utils;
 
-namespace TweetDck.Core.Other.Settings.Dialogs{
+namespace TweetDuck.Core.Other.Settings.Dialogs{
     sealed partial class DialogSettingsRestart : Form{
         private const string DefaultLocale = "en-US";
 

Core/Other/Settings/Export/CombinedFileStream.cs

@@ -2,7 +2,7 @@
 using System.IO;
 using System.Text;
 
-namespace TweetDck.Core.Other.Settings.Export{
+namespace TweetDuck.Core.Other.Settings.Export{
     class CombinedFileStream : IDisposable{
         public const char KeySeparator = '|';
 
@@ -92,7 +92,7 @@ namespace TweetDck.Core.Other.Settings.Export{
         }
 
         public class Entry{
-            public string Identifier { get; private set; }
+            public string Identifier { get; }
 
             public string KeyName{
                 get{

Core/Other/Settings/Export/ExportFileFlags.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace TweetDck.Core.Other.Settings.Export{
+namespace TweetDuck.Core.Other.Settings.Export{
     [Flags]
     enum ExportFileFlags{
         None = 0,

Core/Other/Settings/Export/ExportManager.cs

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
-using TweetDck.Configuration;
+using TweetDuck.Configuration;
-using TweetDck.Plugins;
+using TweetDuck.Plugins;
-using TweetDck.Plugins.Enums;
+using TweetDuck.Plugins.Enums;
 
-namespace TweetDck.Core.Other.Settings.Export{
+namespace TweetDuck.Core.Other.Settings.Export{
     sealed class ExportManager{
         private static readonly string CookiesPath = Path.Combine(Program.StoragePath, "Cookies");
         private static readonly string TempCookiesPath = Path.Combine(Program.StoragePath, "CookiesTmp");
@@ -27,10 +27,12 @@ namespace TweetDck.Core.Other.Settings.Export{
             try{
                 using(CombinedFileStream stream = new CombinedFileStream(new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.None))){
                     if (flags.HasFlag(ExportFileFlags.Config)){
-                        stream.WriteFile("config", Program.ConfigFilePath);
+                        stream.WriteFile("config", Program.UserConfigFilePath);
                     }
 
                     if (flags.HasFlag(ExportFileFlags.PluginData)){
+                        stream.WriteFile("plugin.config", Program.PluginConfigFilePath);
+
                         foreach(Plugin plugin in plugins.Plugins){
                             foreach(PathInfo path in EnumerateFilesRelative(plugin.GetPluginFolder(PluginFolder.Data))){
                                 try{
@@ -69,6 +71,7 @@ namespace TweetDck.Core.Other.Settings.Export{
                                 flags |= ExportFileFlags.Config;
                                 break;
 
+                            case "plugin.config":
                             case "plugin.data":
                                 flags |= ExportFileFlags.PluginData;
                                 break;
@@ -98,7 +101,14 @@ namespace TweetDck.Core.Other.Settings.Export{
                         switch(entry.KeyName){
                             case "config":
                                 if (flags.HasFlag(ExportFileFlags.Config)){
-                                    entry.WriteToFile(Program.ConfigFilePath);
+                                    entry.WriteToFile(Program.UserConfigFilePath);
+                                }
+
+                                break;
+
+                            case "plugin.config":
+                                if (flags.HasFlag(ExportFileFlags.PluginData)){
+                                    entry.WriteToFile(Program.PluginConfigFilePath);
                                 }
 
                                 break;
@@ -132,7 +142,7 @@ namespace TweetDck.Core.Other.Settings.Export{
                 }
 
                 if (IsRestarting){
-                    Program.Restart(new string[]{ Arguments.ArgImportCookies });
+                    Program.Restart(Arguments.ArgImportCookies);
                 }
                 else{
                     Program.ReloadConfig();

Core/Other/Settings/TabSettingsAdvanced.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDck.Core.Other.Settings {
+namespace TweetDuck.Core.Other.Settings {
     partial class TabSettingsAdvanced {
         /// <summary> 
         /// Required designer variable.
@@ -33,22 +33,23 @@
             this.btnRestart = new System.Windows.Forms.Button();
             this.btnOpenAppFolder = new System.Windows.Forms.Button();
             this.btnOpenDataFolder = new System.Windows.Forms.Button();
-            this.btnReset = new System.Windows.Forms.Button();
+            this.labelApp = new System.Windows.Forms.Label();
-            this.btnImport = new System.Windows.Forms.Button();
+            this.panelApp = new System.Windows.Forms.Panel();
-            this.btnExport = new System.Windows.Forms.Button();
+            this.labelPerformance = new System.Windows.Forms.Label();
-            this.groupPerformance = new System.Windows.Forms.GroupBox();
+            this.panelPerformance = new System.Windows.Forms.Panel();
-            this.groupConfiguration = new System.Windows.Forms.GroupBox();
+            this.panelConfiguration = new System.Windows.Forms.Panel();
-            this.groupApp = new System.Windows.Forms.GroupBox();
+            this.labelConfiguration = new System.Windows.Forms.Label();
-            this.groupPerformance.SuspendLayout();
+            this.panelApp.SuspendLayout();
-            this.groupConfiguration.SuspendLayout();
+            this.panelPerformance.SuspendLayout();
-            this.groupApp.SuspendLayout();
+            this.panelConfiguration.SuspendLayout();
             this.SuspendLayout();
             // 
             // btnClearCache
             // 
-            this.btnClearCache.Location = new System.Drawing.Point(6, 44);
+            this.btnClearCache.Location = new System.Drawing.Point(5, 28);
+            this.btnClearCache.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.btnClearCache.Name = "btnClearCache";
-            this.btnClearCache.Size = new System.Drawing.Size(171, 23);
+            this.btnClearCache.Size = new System.Drawing.Size(144, 23);
             this.btnClearCache.TabIndex = 1;
             this.btnClearCache.Text = "Clear Cache (calculating)";
             this.toolTip.SetToolTip(this.btnClearCache, "Clearing cache will free up space taken by downloaded images and other resources." +
@@ -58,7 +59,7 @@
             // checkHardwareAcceleration
             // 
             this.checkHardwareAcceleration.AutoSize = true;
-            this.checkHardwareAcceleration.Location = new System.Drawing.Point(9, 21);
+            this.checkHardwareAcceleration.Location = new System.Drawing.Point(6, 5);
             this.checkHardwareAcceleration.Margin = new System.Windows.Forms.Padding(6, 5, 3, 3);
             this.checkHardwareAcceleration.Name = "checkHardwareAcceleration";
             this.checkHardwareAcceleration.Size = new System.Drawing.Size(134, 17);
@@ -70,9 +71,10 @@
             // 
             // btnEditCefArgs
             // 
-            this.btnEditCefArgs.Location = new System.Drawing.Point(6, 19);
+            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(171, 23);
+            this.btnEditCefArgs.Size = new System.Drawing.Size(144, 23);
             this.btnEditCefArgs.TabIndex = 0;
             this.btnEditCefArgs.Text = "Edit CEF Arguments";
             this.toolTip.SetToolTip(this.btnEditCefArgs, "Set custom command line arguments for Chromium Embedded Framework.");
@@ -80,9 +82,9 @@
             // 
             // btnEditCSS
             // 
-            this.btnEditCSS.Location = new System.Drawing.Point(6, 48);
+            this.btnEditCSS.Location = new System.Drawing.Point(155, 3);
             this.btnEditCSS.Name = "btnEditCSS";
-            this.btnEditCSS.Size = new System.Drawing.Size(171, 23);
+            this.btnEditCSS.Size = new System.Drawing.Size(144, 23);
             this.btnEditCSS.TabIndex = 1;
             this.btnEditCSS.Text = "Edit CSS";
             this.toolTip.SetToolTip(this.btnEditCSS, "Set custom CSS for browser and notification windows.");
@@ -90,9 +92,9 @@
             // 
             // btnRestartArgs
             // 
-            this.btnRestartArgs.Location = new System.Drawing.Point(6, 106);
+            this.btnRestartArgs.Location = new System.Drawing.Point(155, 32);
             this.btnRestartArgs.Name = "btnRestartArgs";
-            this.btnRestartArgs.Size = new System.Drawing.Size(171, 23);
+            this.btnRestartArgs.Size = new System.Drawing.Size(144, 23);
             this.btnRestartArgs.TabIndex = 3;
             this.btnRestartArgs.Text = "Restart with Arguments";
             this.toolTip.SetToolTip(this.btnRestartArgs, "Restarts the program with customizable\r\ncommand line arguments.");
@@ -100,9 +102,9 @@
             // 
             // btnRestart
             // 
-            this.btnRestart.Location = new System.Drawing.Point(6, 77);
+            this.btnRestart.Location = new System.Drawing.Point(155, 3);
             this.btnRestart.Name = "btnRestart";
-            this.btnRestart.Size = new System.Drawing.Size(171, 23);
+            this.btnRestart.Size = new System.Drawing.Size(144, 23);
             this.btnRestart.TabIndex = 2;
             this.btnRestart.Text = "Restart the Program";
             this.toolTip.SetToolTip(this.btnRestart, "Restarts the program using the same command\r\nline arguments that were used at lau" +
@@ -111,9 +113,10 @@
             // 
             // btnOpenAppFolder
             // 
-            this.btnOpenAppFolder.Location = new System.Drawing.Point(6, 19);
+            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(171, 23);
+            this.btnOpenAppFolder.Size = new System.Drawing.Size(144, 23);
             this.btnOpenAppFolder.TabIndex = 0;
             this.btnOpenAppFolder.Text = "Open Program Folder";
             this.toolTip.SetToolTip(this.btnOpenAppFolder, "Opens the folder where the app is located.");
@@ -121,102 +124,99 @@
             // 
             // btnOpenDataFolder
             // 
-            this.btnOpenDataFolder.Location = new System.Drawing.Point(6, 48);
+            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(171, 23);
+            this.btnOpenDataFolder.Size = new System.Drawing.Size(144, 23);
             this.btnOpenDataFolder.TabIndex = 1;
             this.btnOpenDataFolder.Text = "Open Data Folder";
             this.toolTip.SetToolTip(this.btnOpenDataFolder, "Opens the folder where your profile data is located.");
             this.btnOpenDataFolder.UseVisualStyleBackColor = true;
             // 
-            // btnReset
+            // labelApp
             // 
-            this.btnReset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.labelApp.AutoSize = true;
-            this.btnReset.AutoSize = true;
+            this.labelApp.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.btnReset.Location = new System.Drawing.Point(190, 268);
+            this.labelApp.Location = new System.Drawing.Point(6, 8);
-            this.btnReset.Name = "btnReset";
+            this.labelApp.Margin = new System.Windows.Forms.Padding(0, 2, 0, 0);
-            this.btnReset.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.labelApp.Name = "labelApp";
-            this.btnReset.Size = new System.Drawing.Size(102, 23);
+            this.labelApp.Size = new System.Drawing.Size(38, 20);
-            this.btnReset.TabIndex = 5;
+            this.labelApp.TabIndex = 0;
-            this.btnReset.Text = "Restore Defaults";
+            this.labelApp.Text = "App";
-            this.btnReset.UseVisualStyleBackColor = true;
             // 
-            // btnImport
+            // panelApp
             // 
-            this.btnImport.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.panelApp.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            this.btnImport.AutoSize = true;
+            | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnImport.Location = new System.Drawing.Point(100, 268);
+            this.panelApp.Controls.Add(this.btnOpenDataFolder);
-            this.btnImport.Name = "btnImport";
+            this.panelApp.Controls.Add(this.btnOpenAppFolder);
-            this.btnImport.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.panelApp.Controls.Add(this.btnRestart);
-            this.btnImport.Size = new System.Drawing.Size(84, 23);
+            this.panelApp.Controls.Add(this.btnRestartArgs);
-            this.btnImport.TabIndex = 4;
+            this.panelApp.Location = new System.Drawing.Point(9, 31);
-            this.btnImport.Text = "Import Profile";
+            this.panelApp.Name = "panelApp";
-            this.btnImport.UseVisualStyleBackColor = true;
+            this.panelApp.Size = new System.Drawing.Size(322, 59);
+            this.panelApp.TabIndex = 1;
             // 
-            // btnExport
+            // labelPerformance
             // 
-            this.btnExport.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
+            this.labelPerformance.AutoSize = true;
-            this.btnExport.AutoSize = true;
+            this.labelPerformance.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.btnExport.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
+            this.labelPerformance.Location = new System.Drawing.Point(6, 114);
-            this.btnExport.Location = new System.Drawing.Point(9, 268);
+            this.labelPerformance.Margin = new System.Windows.Forms.Padding(0, 21, 0, 0);
-            this.btnExport.Name = "btnExport";
+            this.labelPerformance.Name = "labelPerformance";
-            this.btnExport.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
+            this.labelPerformance.Size = new System.Drawing.Size(100, 20);
-            this.btnExport.Size = new System.Drawing.Size(85, 23);
+            this.labelPerformance.TabIndex = 2;
-            this.btnExport.TabIndex = 3;
+            this.labelPerformance.Text = "Performance";
-            this.btnExport.Text = "Export Profile";
-            this.btnExport.UseVisualStyleBackColor = true;
             // 
-            // groupPerformance
+            // panelPerformance
             // 
-            this.groupPerformance.Controls.Add(this.checkHardwareAcceleration);
+            this.panelPerformance.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            this.groupPerformance.Controls.Add(this.btnClearCache);
+            | System.Windows.Forms.AnchorStyles.Right)));
-            this.groupPerformance.Location = new System.Drawing.Point(9, 9);
+            this.panelPerformance.Controls.Add(this.checkHardwareAcceleration);
-            this.groupPerformance.Name = "groupPerformance";
+            this.panelPerformance.Controls.Add(this.btnClearCache);
-            this.groupPerformance.Size = new System.Drawing.Size(183, 74);
+            this.panelPerformance.Location = new System.Drawing.Point(9, 137);
-            this.groupPerformance.TabIndex = 0;
+            this.panelPerformance.Name = "panelPerformance";
-            this.groupPerformance.TabStop = false;
+            this.panelPerformance.Size = new System.Drawing.Size(322, 54);
-            this.groupPerformance.Text = "Performance";
+            this.panelPerformance.TabIndex = 3;
             // 
-            // groupConfiguration
+            // panelConfiguration
             // 
-            this.groupConfiguration.Controls.Add(this.btnEditCSS);
+            this.panelConfiguration.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            this.groupConfiguration.Controls.Add(this.btnEditCefArgs);
+            | System.Windows.Forms.AnchorStyles.Right)));
-            this.groupConfiguration.Location = new System.Drawing.Point(9, 89);
+            this.panelConfiguration.Controls.Add(this.btnEditCSS);
-            this.groupConfiguration.Name = "groupConfiguration";
+            this.panelConfiguration.Controls.Add(this.btnEditCefArgs);
-            this.groupConfiguration.Size = new System.Drawing.Size(183, 77);
+            this.panelConfiguration.Location = new System.Drawing.Point(9, 238);
-            this.groupConfiguration.TabIndex = 1;
+            this.panelConfiguration.Name = "panelConfiguration";
-            this.groupConfiguration.TabStop = false;
+            this.panelConfiguration.Size = new System.Drawing.Size(322, 29);
-            this.groupConfiguration.Text = "Configuration";
+            this.panelConfiguration.TabIndex = 5;
             // 
-            // groupApp
+            // labelConfiguration
             // 
-            this.groupApp.Controls.Add(this.btnOpenDataFolder);
+            this.labelConfiguration.AutoSize = true;
-            this.groupApp.Controls.Add(this.btnOpenAppFolder);
+            this.labelConfiguration.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.groupApp.Controls.Add(this.btnRestartArgs);
+            this.labelConfiguration.Location = new System.Drawing.Point(6, 215);
-            this.groupApp.Controls.Add(this.btnRestart);
+            this.labelConfiguration.Margin = new System.Windows.Forms.Padding(0, 21, 0, 0);
-            this.groupApp.Location = new System.Drawing.Point(198, 9);
+            this.labelConfiguration.Name = "labelConfiguration";
-            this.groupApp.Name = "groupApp";
+            this.labelConfiguration.Size = new System.Drawing.Size(104, 20);
-            this.groupApp.Size = new System.Drawing.Size(183, 135);
+            this.labelConfiguration.TabIndex = 4;
-            this.groupApp.TabIndex = 2;
+            this.labelConfiguration.Text = "Configuration";
-            this.groupApp.TabStop = false;
-            this.groupApp.Text = "App";
             // 
             // TabSettingsAdvanced
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.groupApp);
+            this.Controls.Add(this.labelConfiguration);
-            this.Controls.Add(this.groupConfiguration);
+            this.Controls.Add(this.panelConfiguration);
-            this.Controls.Add(this.groupPerformance);
+            this.Controls.Add(this.panelPerformance);
-            this.Controls.Add(this.btnReset);
+            this.Controls.Add(this.labelPerformance);
-            this.Controls.Add(this.btnImport);
+            this.Controls.Add(this.panelApp);
-            this.Controls.Add(this.btnExport);
+            this.Controls.Add(this.labelApp);
             this.Name = "TabSettingsAdvanced";
-            this.Size = new System.Drawing.Size(478, 300);
+            this.Size = new System.Drawing.Size(340, 277);
-            this.groupPerformance.ResumeLayout(false);
+            this.panelApp.ResumeLayout(false);
-            this.groupPerformance.PerformLayout();
+            this.panelPerformance.ResumeLayout(false);
-            this.groupConfiguration.ResumeLayout(false);
+            this.panelPerformance.PerformLayout();
-            this.groupApp.ResumeLayout(false);
+            this.panelConfiguration.ResumeLayout(false);
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -227,17 +227,17 @@
         private System.Windows.Forms.Button btnClearCache;
         private System.Windows.Forms.CheckBox checkHardwareAcceleration;
         private System.Windows.Forms.ToolTip toolTip;
-        private System.Windows.Forms.Button btnReset;
-        private System.Windows.Forms.Button btnImport;
-        private System.Windows.Forms.Button btnExport;
-        private System.Windows.Forms.GroupBox groupPerformance;
-        private System.Windows.Forms.GroupBox groupConfiguration;
         private System.Windows.Forms.Button btnEditCefArgs;
         private System.Windows.Forms.Button btnEditCSS;
-        private System.Windows.Forms.GroupBox groupApp;
         private System.Windows.Forms.Button btnRestartArgs;
         private System.Windows.Forms.Button btnRestart;
         private System.Windows.Forms.Button btnOpenAppFolder;
         private System.Windows.Forms.Button btnOpenDataFolder;
+        private System.Windows.Forms.Label labelApp;
+        private System.Windows.Forms.Panel panelApp;
+        private System.Windows.Forms.Label labelPerformance;
+        private System.Windows.Forms.Panel panelPerformance;
+        private System.Windows.Forms.Panel panelConfiguration;
+        private System.Windows.Forms.Label labelConfiguration;
     }
 }

Core/Other/Settings/TabSettingsAdvanced.cs

@@ -1,25 +1,27 @@
 using System;
 using System.Diagnostics;
 using System.Windows.Forms;
-using TweetDck.Configuration;
+using TweetDuck.Configuration;
-using TweetDck.Core.Controls;
+using TweetDuck.Core.Controls;
-using TweetDck.Core.Other.Settings.Dialogs;
+using TweetDuck.Core.Other.Settings.Dialogs;
-using TweetDck.Core.Other.Settings.Export;
+using TweetDuck.Core.Utils;
-using TweetDck.Core.Utils;
-using TweetDck.Plugins;
 
-namespace TweetDck.Core.Other.Settings{
+namespace TweetDuck.Core.Other.Settings{
     partial class TabSettingsAdvanced : BaseTabSettings{
         private readonly Action<string> reinjectBrowserCSS;
-        private readonly PluginManager plugins;
 
-        public TabSettingsAdvanced(Action<string> reinjectBrowserCSS, PluginManager plugins){
+        public TabSettingsAdvanced(Action<string> reinjectBrowserCSS){
             InitializeComponent();
 
             this.reinjectBrowserCSS = reinjectBrowserCSS;
-            this.plugins = plugins;
 
-            checkHardwareAcceleration.Checked = HardwareAcceleration.IsEnabled;
+            if (SystemConfig.IsHardwareAccelerationSupported){
+                checkHardwareAcceleration.Checked = Program.SystemConfig.HardwareAcceleration;
+            }
+            else{
+                checkHardwareAcceleration.Enabled = false;
+                checkHardwareAcceleration.Checked = false;
+            }
 
             BrowserCache.CalculateCacheSize(bytes => this.InvokeSafe(() => {
                 if (bytes == -1L){
@@ -38,10 +40,6 @@ namespace TweetDck.Core.Other.Settings{
             btnEditCefArgs.Click += btnEditCefArgs_Click;
             btnEditCSS.Click += btnEditCSS_Click;
             
-            btnExport.Click += btnExport_Click;
-            btnImport.Click += btnImport_Click;
-            btnReset.Click += btnReset_Click;
-            
             btnOpenAppFolder.Click += btnOpenAppFolder_Click;
             btnOpenDataFolder.Click += btnOpenDataFolder_Click;
             btnRestart.Click += btnRestart_Click;
@@ -56,134 +54,54 @@ namespace TweetDck.Core.Other.Settings{
         }
 
         private void checkHardwareAcceleration_CheckedChanged(object sender, EventArgs e){
-            bool succeeded = false;
+            Program.SystemConfig.HardwareAcceleration = checkHardwareAcceleration.Checked;
-
+            Program.SystemConfig.Save();
-            if (checkHardwareAcceleration.Checked){
-                if (HardwareAcceleration.CanEnable){
-                    succeeded = HardwareAcceleration.Enable();
-                }
-                else{
-                    MessageBox.Show("Cannot enable hardware acceleration, the libraries libEGL.dll and libGLESv2.dll could not be restored.", Program.BrandName+" Settings", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                }
-            }
-            else{
-                succeeded = HardwareAcceleration.Disable();
-            }
-
-            if (succeeded){
             PromptRestart();
         }
-            else{
-                checkHardwareAcceleration.CheckedChanged -= checkHardwareAcceleration_CheckedChanged;
-                checkHardwareAcceleration.Checked = HardwareAcceleration.IsEnabled;
-                checkHardwareAcceleration.CheckedChanged += checkHardwareAcceleration_CheckedChanged;
-            }
-        }
 
         private void btnEditCefArgs_Click(object sender, EventArgs e){
             DialogSettingsCefArgs form = new DialogSettingsCefArgs();
 
-            if (form.ShowDialog(ParentForm) == DialogResult.OK){
+            form.VisibleChanged += (sender2, args2) => {
+                form.MoveToCenter(ParentForm);
+            };
+
+            form.FormClosed += (sender2, args2) => {
+                NativeMethods.SetFormDisabled(ParentForm, false);
+
+                if (form.DialogResult == DialogResult.OK){
                     Config.CustomCefArgs = form.CefArgs;
-                form.Dispose();
                     PromptRestart();
-            }
-            else{
                     form.Dispose();
                 }
+                else form.Dispose();
+            };
+            
+            form.Show(ParentForm);
+            NativeMethods.SetFormDisabled(ParentForm, true);
         }
 
         private void btnEditCSS_Click(object sender, EventArgs e){
-            using(DialogSettingsCSS form = new DialogSettingsCSS(reinjectBrowserCSS)){
+            DialogSettingsCSS form = new DialogSettingsCSS(reinjectBrowserCSS);
-                if (form.ShowDialog(ParentForm) == DialogResult.OK){
+
+            form.VisibleChanged += (sender2, args2) => {
+                form.MoveToCenter(ParentForm);
+            };
+
+            form.FormClosed += (sender2, args2) => {
+                NativeMethods.SetFormDisabled(ParentForm, false);
+
+                if (form.DialogResult == DialogResult.OK){
                     Config.CustomBrowserCSS = form.BrowserCSS;
                     Config.CustomNotificationCSS = form.NotificationCSS;
                 }
 
                 reinjectBrowserCSS(Config.CustomBrowserCSS); // reinject on cancel too, because the CSS is updated while typing
-            }
+                form.Dispose();
-        }
+            };
             
-        private void btnExport_Click(object sender, EventArgs e){
+            form.Show(ParentForm);
-            ExportFileFlags flags;
+            NativeMethods.SetFormDisabled(ParentForm, true);
-
-            using(DialogSettingsExport dialog = DialogSettingsExport.Export()){
-                if (dialog.ShowDialog() != DialogResult.OK){
-                    return;
-                }
-
-                flags = dialog.Flags;
-            }
-
-            string file;
-
-            using(SaveFileDialog dialog = new SaveFileDialog{
-                AddExtension = true,
-                AutoUpgradeEnabled = true,
-                OverwritePrompt = true,
-                DefaultExt = "tdsettings",
-                FileName = Program.BrandName+".tdsettings",
-                Title = "Export "+Program.BrandName+" Settings",
-                Filter = Program.BrandName+" Settings (*.tdsettings)|*.tdsettings"
-            }){
-                if (dialog.ShowDialog() != DialogResult.OK){
-                    return;
-                }
-
-                file = dialog.FileName;
-            }
-
-            Program.UserConfig.Save();
-
-            ExportManager manager = new ExportManager(file, plugins);
-            
-            if (!manager.Export(flags)){
-                Program.Reporter.HandleException("Profile Export Error", "An exception happened while exporting "+Program.BrandName+" settings.", true, manager.LastException);
-            }
-        }
-
-        private void btnImport_Click(object sender, EventArgs e){
-            string file;
-
-            using(OpenFileDialog dialog = new OpenFileDialog{
-                AutoUpgradeEnabled = true,
-                DereferenceLinks = true,
-                Title = "Import "+Program.BrandName+" Settings",
-                Filter = Program.BrandName+" Settings (*.tdsettings)|*.tdsettings"
-            }){
-                if (dialog.ShowDialog() != DialogResult.OK){
-                    return;
-                }
-
-                file = dialog.FileName;
-            }
-
-            ExportManager manager = new ExportManager(file, plugins);
-            ExportFileFlags flags;
-
-            using(DialogSettingsExport dialog = DialogSettingsExport.Import(manager.GetImportFlags())){
-                if (dialog.ShowDialog() != DialogResult.OK){
-                    return;
-                }
-
-                flags = dialog.Flags;
-            }
-
-            if (manager.Import(flags)){
-                if (!manager.IsRestarting){
-                    ((FormSettings)ParentForm).ReloadUI();
-                }
-            }
-            else{
-                Program.Reporter.HandleException("Profile Import Error", "An exception happened while importing "+Program.BrandName+" settings.", true, manager.LastException);
-            }
-        }
-
-        private void btnReset_Click(object sender, EventArgs e){
-            if (MessageBox.Show("This will reset all of your settings, including disabled plugins. Do you want to proceed?", "Reset "+Program.BrandName+" Settings", MessageBoxButtons.YesNo, MessageBoxIcon.Warning, MessageBoxDefaultButton.Button2) == DialogResult.Yes){
-                Program.ResetConfig();
-                ((FormSettings)ParentForm).ReloadUI();
-            }
         }
 
         private void btnOpenAppFolder_Click(object sender, EventArgs e){

Core/Other/Settings/TabSettingsGeneral.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDck.Core.Other.Settings {
+namespace TweetDuck.Core.Other.Settings {
     partial class TabSettingsGeneral {
         /// <summary> 
         /// Required designer variable.
@@ -31,19 +31,28 @@
             this.checkSpellCheck = new System.Windows.Forms.CheckBox();
             this.checkUpdateNotifications = new System.Windows.Forms.CheckBox();
             this.btnCheckUpdates = new System.Windows.Forms.Button();
-            this.groupTray = new System.Windows.Forms.GroupBox();
+            this.labelZoomValue = new System.Windows.Forms.Label();
+            this.checkSwitchAccountSelectors = new System.Windows.Forms.CheckBox();
             this.labelTrayIcon = new System.Windows.Forms.Label();
-            this.groupInterface = new System.Windows.Forms.GroupBox();
+            this.trackBarZoom = new System.Windows.Forms.TrackBar();
-            this.groupUpdates = new System.Windows.Forms.GroupBox();
+            this.labelZoom = new System.Windows.Forms.Label();
-            this.groupTray.SuspendLayout();
+            this.zoomUpdateTimer = new System.Windows.Forms.Timer(this.components);
-            this.groupInterface.SuspendLayout();
+            this.labelUI = new System.Windows.Forms.Label();
-            this.groupUpdates.SuspendLayout();
+            this.panelUI = new System.Windows.Forms.Panel();
+            this.labelTray = new System.Windows.Forms.Label();
+            this.panelUpdates = new System.Windows.Forms.Panel();
+            this.panelTray = new System.Windows.Forms.Panel();
+            this.labelUpdates = new System.Windows.Forms.Label();
+            ((System.ComponentModel.ISupportInitialize)(this.trackBarZoom)).BeginInit();
+            this.panelUI.SuspendLayout();
+            this.panelUpdates.SuspendLayout();
+            this.panelTray.SuspendLayout();
             this.SuspendLayout();
             // 
             // checkExpandLinks
             // 
             this.checkExpandLinks.AutoSize = true;
-            this.checkExpandLinks.Location = new System.Drawing.Point(9, 21);
+            this.checkExpandLinks.Location = new System.Drawing.Point(6, 5);
             this.checkExpandLinks.Margin = new System.Windows.Forms.Padding(6, 5, 3, 3);
             this.checkExpandLinks.Name = "checkExpandLinks";
             this.checkExpandLinks.Size = new System.Drawing.Size(166, 17);
@@ -57,16 +66,17 @@
             // 
             this.comboBoxTrayType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBoxTrayType.FormattingEnabled = true;
-            this.comboBoxTrayType.Location = new System.Drawing.Point(6, 19);
+            this.comboBoxTrayType.Location = new System.Drawing.Point(5, 5);
+            this.comboBoxTrayType.Margin = new System.Windows.Forms.Padding(5, 5, 3, 3);
             this.comboBoxTrayType.Name = "comboBoxTrayType";
-            this.comboBoxTrayType.Size = new System.Drawing.Size(171, 21);
+            this.comboBoxTrayType.Size = new System.Drawing.Size(144, 21);
             this.comboBoxTrayType.TabIndex = 0;
             this.toolTip.SetToolTip(this.comboBoxTrayType, "Changes behavior of the Tray icon.\r\nRight-click the icon for an action menu.");
             // 
             // checkTrayHighlight
             // 
             this.checkTrayHighlight.AutoSize = true;
-            this.checkTrayHighlight.Location = new System.Drawing.Point(9, 70);
+            this.checkTrayHighlight.Location = new System.Drawing.Point(6, 56);
             this.checkTrayHighlight.Margin = new System.Windows.Forms.Padding(6, 5, 3, 3);
             this.checkTrayHighlight.Name = "checkTrayHighlight";
             this.checkTrayHighlight.Size = new System.Drawing.Size(103, 17);
@@ -79,11 +89,11 @@
             // checkSpellCheck
             // 
             this.checkSpellCheck.AutoSize = true;
-            this.checkSpellCheck.Location = new System.Drawing.Point(9, 44);
+            this.checkSpellCheck.Location = new System.Drawing.Point(6, 51);
             this.checkSpellCheck.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
             this.checkSpellCheck.Name = "checkSpellCheck";
             this.checkSpellCheck.Size = new System.Drawing.Size(119, 17);
-            this.checkSpellCheck.TabIndex = 1;
+            this.checkSpellCheck.TabIndex = 2;
             this.checkSpellCheck.Text = "Enable Spell Check";
             this.toolTip.SetToolTip(this.checkSpellCheck, "Underlines words that are spelled incorrectly.");
             this.checkSpellCheck.UseVisualStyleBackColor = true;
@@ -91,7 +101,7 @@
             // checkUpdateNotifications
             // 
             this.checkUpdateNotifications.AutoSize = true;
-            this.checkUpdateNotifications.Location = new System.Drawing.Point(9, 21);
+            this.checkUpdateNotifications.Location = new System.Drawing.Point(6, 5);
             this.checkUpdateNotifications.Margin = new System.Windows.Forms.Padding(6, 5, 3, 3);
             this.checkUpdateNotifications.Name = "checkUpdateNotifications";
             this.checkUpdateNotifications.Size = new System.Drawing.Size(165, 17);
@@ -103,74 +113,172 @@
             // 
             // btnCheckUpdates
             // 
-            this.btnCheckUpdates.Location = new System.Drawing.Point(6, 44);
+            this.btnCheckUpdates.Location = new System.Drawing.Point(5, 28);
+            this.btnCheckUpdates.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.btnCheckUpdates.Name = "btnCheckUpdates";
-            this.btnCheckUpdates.Size = new System.Drawing.Size(171, 23);
+            this.btnCheckUpdates.Size = new System.Drawing.Size(144, 23);
             this.btnCheckUpdates.TabIndex = 1;
             this.btnCheckUpdates.Text = "Check Updates Now";
             this.toolTip.SetToolTip(this.btnCheckUpdates, "Forces an update check, even for updates that had been dismissed.");
             this.btnCheckUpdates.UseVisualStyleBackColor = true;
             // 
-            // groupTray
+            // labelZoomValue
             // 
-            this.groupTray.Controls.Add(this.checkTrayHighlight);
+            this.labelZoomValue.BackColor = System.Drawing.Color.Transparent;
-            this.groupTray.Controls.Add(this.labelTrayIcon);
+            this.labelZoomValue.Location = new System.Drawing.Point(141, 100);
-            this.groupTray.Controls.Add(this.comboBoxTrayType);
+            this.labelZoomValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
-            this.groupTray.Location = new System.Drawing.Point(9, 82);
+            this.labelZoomValue.Name = "labelZoomValue";
-            this.groupTray.Name = "groupTray";
+            this.labelZoomValue.Size = new System.Drawing.Size(38, 13);
-            this.groupTray.Size = new System.Drawing.Size(183, 93);
+            this.labelZoomValue.TabIndex = 5;
-            this.groupTray.TabIndex = 1;
+            this.labelZoomValue.Text = "100%";
-            this.groupTray.TabStop = false;
+            this.labelZoomValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
-            this.groupTray.Text = "System Tray";
+            this.toolTip.SetToolTip(this.labelZoomValue, "Changes the zoom level.\r\nAlso affects notifications and screenshots.");
+            // 
+            // checkSwitchAccountSelectors
+            // 
+            this.checkSwitchAccountSelectors.AutoSize = true;
+            this.checkSwitchAccountSelectors.Location = new System.Drawing.Point(6, 28);
+            this.checkSwitchAccountSelectors.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
+            this.checkSwitchAccountSelectors.Name = "checkSwitchAccountSelectors";
+            this.checkSwitchAccountSelectors.Size = new System.Drawing.Size(172, 17);
+            this.checkSwitchAccountSelectors.TabIndex = 1;
+            this.checkSwitchAccountSelectors.Text = "Shift Selects Multiple Accounts";
+            this.toolTip.SetToolTip(this.checkSwitchAccountSelectors, "When (re)tweeting, click to select a single account or hold Shift to\r\nselect mult" +
+        "iple accounts, instead of TweetDeck\'s default behavior.");
+            this.checkSwitchAccountSelectors.UseVisualStyleBackColor = true;
             // 
             // labelTrayIcon
             // 
             this.labelTrayIcon.AutoSize = true;
-            this.labelTrayIcon.Location = new System.Drawing.Point(6, 52);
+            this.labelTrayIcon.Location = new System.Drawing.Point(3, 38);
             this.labelTrayIcon.Margin = new System.Windows.Forms.Padding(3, 9, 3, 0);
             this.labelTrayIcon.Name = "labelTrayIcon";
             this.labelTrayIcon.Size = new System.Drawing.Size(52, 13);
             this.labelTrayIcon.TabIndex = 1;
             this.labelTrayIcon.Text = "Tray Icon";
             // 
-            // groupInterface
+            // trackBarZoom
             // 
-            this.groupInterface.Controls.Add(this.checkSpellCheck);
+            this.trackBarZoom.AutoSize = false;
-            this.groupInterface.Controls.Add(this.checkExpandLinks);
+            this.trackBarZoom.BackColor = System.Drawing.SystemColors.Control;
-            this.groupInterface.Location = new System.Drawing.Point(9, 9);
+            this.trackBarZoom.LargeChange = 25;
-            this.groupInterface.Name = "groupInterface";
+            this.trackBarZoom.Location = new System.Drawing.Point(3, 99);
-            this.groupInterface.Size = new System.Drawing.Size(183, 67);
+            this.trackBarZoom.Maximum = 200;
-            this.groupInterface.TabIndex = 0;
+            this.trackBarZoom.Minimum = 50;
-            this.groupInterface.TabStop = false;
+            this.trackBarZoom.Name = "trackBarZoom";
-            this.groupInterface.Text = "User Interface";
+            this.trackBarZoom.Size = new System.Drawing.Size(148, 30);
+            this.trackBarZoom.SmallChange = 5;
+            this.trackBarZoom.TabIndex = 4;
+            this.trackBarZoom.TickFrequency = 25;
+            this.trackBarZoom.Value = 100;
             // 
-            // groupUpdates
+            // labelZoom
             // 
-            this.groupUpdates.Controls.Add(this.checkUpdateNotifications);
+            this.labelZoom.AutoSize = true;
-            this.groupUpdates.Controls.Add(this.btnCheckUpdates);
+            this.labelZoom.Location = new System.Drawing.Point(3, 83);
-            this.groupUpdates.Location = new System.Drawing.Point(198, 9);
+            this.labelZoom.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
-            this.groupUpdates.Name = "groupUpdates";
+            this.labelZoom.Name = "labelZoom";
-            this.groupUpdates.Size = new System.Drawing.Size(183, 75);
+            this.labelZoom.Size = new System.Drawing.Size(34, 13);
-            this.groupUpdates.TabIndex = 2;
+            this.labelZoom.TabIndex = 3;
-            this.groupUpdates.TabStop = false;
+            this.labelZoom.Text = "Zoom";
-            this.groupUpdates.Text = "Updates";
+            // 
+            // zoomUpdateTimer
+            // 
+            this.zoomUpdateTimer.Interval = 250;
+            this.zoomUpdateTimer.Tick += new System.EventHandler(this.zoomUpdateTimer_Tick);
+            // 
+            // 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.Location = new System.Drawing.Point(6, 8);
+            this.labelUI.Margin = new System.Windows.Forms.Padding(0, 2, 0, 0);
+            this.labelUI.Name = "labelUI";
+            this.labelUI.Size = new System.Drawing.Size(111, 20);
+            this.labelUI.TabIndex = 0;
+            this.labelUI.Text = "User Interface";
+            // 
+            // panelUI
+            // 
+            this.panelUI.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelUI.Controls.Add(this.checkExpandLinks);
+            this.panelUI.Controls.Add(this.checkSwitchAccountSelectors);
+            this.panelUI.Controls.Add(this.checkSpellCheck);
+            this.panelUI.Controls.Add(this.labelZoom);
+            this.panelUI.Controls.Add(this.labelZoomValue);
+            this.panelUI.Controls.Add(this.trackBarZoom);
+            this.panelUI.Location = new System.Drawing.Point(9, 31);
+            this.panelUI.Name = "panelUI";
+            this.panelUI.Size = new System.Drawing.Size(322, 134);
+            this.panelUI.TabIndex = 1;
+            // 
+            // labelTray
+            // 
+            this.labelTray.AutoSize = true;
+            this.labelTray.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelTray.Location = new System.Drawing.Point(5, 189);
+            this.labelTray.Margin = new System.Windows.Forms.Padding(0, 21, 0, 0);
+            this.labelTray.Name = "labelTray";
+            this.labelTray.Size = new System.Drawing.Size(96, 20);
+            this.labelTray.TabIndex = 2;
+            this.labelTray.Text = "System Tray";
+            // 
+            // panelUpdates
+            // 
+            this.panelUpdates.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelUpdates.Controls.Add(this.checkUpdateNotifications);
+            this.panelUpdates.Controls.Add(this.btnCheckUpdates);
+            this.panelUpdates.Location = new System.Drawing.Point(9, 335);
+            this.panelUpdates.Name = "panelUpdates";
+            this.panelUpdates.Size = new System.Drawing.Size(322, 55);
+            this.panelUpdates.TabIndex = 5;
+            // 
+            // panelTray
+            // 
+            this.panelTray.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelTray.Controls.Add(this.checkTrayHighlight);
+            this.panelTray.Controls.Add(this.comboBoxTrayType);
+            this.panelTray.Controls.Add(this.labelTrayIcon);
+            this.panelTray.Location = new System.Drawing.Point(9, 212);
+            this.panelTray.Name = "panelTray";
+            this.panelTray.Size = new System.Drawing.Size(322, 76);
+            this.panelTray.TabIndex = 3;
+            // 
+            // labelUpdates
+            // 
+            this.labelUpdates.AutoSize = true;
+            this.labelUpdates.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelUpdates.Location = new System.Drawing.Point(6, 312);
+            this.labelUpdates.Margin = new System.Windows.Forms.Padding(0, 21, 0, 0);
+            this.labelUpdates.Name = "labelUpdates";
+            this.labelUpdates.Size = new System.Drawing.Size(70, 20);
+            this.labelUpdates.TabIndex = 4;
+            this.labelUpdates.Text = "Updates";
             // 
             // TabSettingsGeneral
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.groupUpdates);
+            this.Controls.Add(this.labelUpdates);
-            this.Controls.Add(this.groupInterface);
+            this.Controls.Add(this.panelTray);
-            this.Controls.Add(this.groupTray);
+            this.Controls.Add(this.panelUpdates);
+            this.Controls.Add(this.labelTray);
+            this.Controls.Add(this.panelUI);
+            this.Controls.Add(this.labelUI);
             this.Name = "TabSettingsGeneral";
-            this.Size = new System.Drawing.Size(478, 300);
+            this.Size = new System.Drawing.Size(340, 400);
-            this.groupTray.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.trackBarZoom)).EndInit();
-            this.groupTray.PerformLayout();
+            this.panelUI.ResumeLayout(false);
-            this.groupInterface.ResumeLayout(false);
+            this.panelUI.PerformLayout();
-            this.groupInterface.PerformLayout();
+            this.panelUpdates.ResumeLayout(false);
-            this.groupUpdates.ResumeLayout(false);
+            this.panelUpdates.PerformLayout();
-            this.groupUpdates.PerformLayout();
+            this.panelTray.ResumeLayout(false);
+            this.panelTray.PerformLayout();
             this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
 
@@ -179,13 +287,21 @@
         private System.Windows.Forms.CheckBox checkExpandLinks;
         private System.Windows.Forms.ComboBox comboBoxTrayType;
         private System.Windows.Forms.ToolTip toolTip;
-        private System.Windows.Forms.GroupBox groupTray;
-        private System.Windows.Forms.GroupBox groupInterface;
         private System.Windows.Forms.Label labelTrayIcon;
         private System.Windows.Forms.CheckBox checkTrayHighlight;
         private System.Windows.Forms.CheckBox checkSpellCheck;
-        private System.Windows.Forms.GroupBox groupUpdates;
         private System.Windows.Forms.CheckBox checkUpdateNotifications;
         private System.Windows.Forms.Button btnCheckUpdates;
+        private System.Windows.Forms.Label labelZoom;
+        private System.Windows.Forms.Label labelZoomValue;
+        private System.Windows.Forms.TrackBar trackBarZoom;
+        private System.Windows.Forms.Timer zoomUpdateTimer;
+        private System.Windows.Forms.CheckBox checkSwitchAccountSelectors;
+        private System.Windows.Forms.Label labelUI;
+        private System.Windows.Forms.Panel panelUI;
+        private System.Windows.Forms.Label labelTray;
+        private System.Windows.Forms.Panel panelUpdates;
+        private System.Windows.Forms.Panel panelTray;
+        private System.Windows.Forms.Label labelUpdates;
     }
 }

Core/Other/Settings/TabSettingsGeneral.cs

@@ -1,9 +1,10 @@
 using System;
 using System.Windows.Forms;
-using TweetDck.Updates;
+using TweetDuck.Core.Controls;
-using TweetDck.Updates.Events;
+using TweetDuck.Updates;
+using TweetDuck.Updates.Events;
 
-namespace TweetDck.Core.Other.Settings{
+namespace TweetDuck.Core.Other.Settings{
     partial class TabSettingsGeneral : BaseTabSettings{
         private readonly UpdateHandler updates;
         private int updateCheckEventId = -1;
@@ -22,7 +23,12 @@ namespace TweetDck.Core.Other.Settings{
             comboBoxTrayType.Items.Add("Combined");
             comboBoxTrayType.SelectedIndex = Math.Min(Math.Max((int)Config.TrayBehavior, 0), comboBoxTrayType.Items.Count-1);
             
+            toolTip.SetToolTip(trackBarZoom, toolTip.GetToolTip(labelZoomValue));
+            trackBarZoom.SetValueSafe(Config.ZoomLevel);
+            labelZoomValue.Text = trackBarZoom.Value+"%";
+
             checkExpandLinks.Checked = Config.ExpandLinksOnHover;
+            checkSwitchAccountSelectors.Checked = Config.SwitchAccountSelectors;
             checkSpellCheck.Checked = Config.EnableSpellCheck;
             checkTrayHighlight.Checked = Config.EnableTrayHighlight;
 
@@ -31,7 +37,9 @@ namespace TweetDck.Core.Other.Settings{
 
         public override void OnReady(){
             checkExpandLinks.CheckedChanged += checkExpandLinks_CheckedChanged;
+            checkSwitchAccountSelectors.CheckedChanged += checkSwitchAccountSelectors_CheckedChanged;
             checkSpellCheck.CheckedChanged += checkSpellCheck_CheckedChanged;
+            trackBarZoom.ValueChanged += trackBarZoom_ValueChanged;
 
             comboBoxTrayType.SelectedIndexChanged += comboBoxTrayType_SelectedIndexChanged;
             checkTrayHighlight.CheckedChanged += checkTrayHighlight_CheckedChanged;
@@ -40,15 +48,31 @@ namespace TweetDck.Core.Other.Settings{
             btnCheckUpdates.Click += btnCheckUpdates_Click;
         }
 
+        public override void OnClosing(){
+            Config.ZoomLevel = trackBarZoom.Value;
+        }
+
         private void checkExpandLinks_CheckedChanged(object sender, EventArgs e){
             Config.ExpandLinksOnHover = checkExpandLinks.Checked;
         }
 
+        private void checkSwitchAccountSelectors_CheckedChanged(object sender, EventArgs e){
+            Config.SwitchAccountSelectors = checkSwitchAccountSelectors.Checked;
+        }
+
         private void checkSpellCheck_CheckedChanged(object sender, EventArgs e){
             Config.EnableSpellCheck = checkSpellCheck.Checked;
             PromptRestart();
         }
 
+        private void trackBarZoom_ValueChanged(object sender, EventArgs e){
+            if (trackBarZoom.AlignValueToTick()){
+                zoomUpdateTimer.Stop();
+                zoomUpdateTimer.Start();
+                labelZoomValue.Text = trackBarZoom.Value+"%";
+            }
+        }
+
         private void comboBoxTrayType_SelectedIndexChanged(object sender, EventArgs e){
             Config.TrayBehavior = (TrayIcon.Behavior)comboBoxTrayType.SelectedIndex;
         }
@@ -74,6 +98,7 @@ namespace TweetDck.Core.Other.Settings{
         }
 
         private void updates_CheckFinished(object sender, UpdateCheckEventArgs e){
+            this.InvokeAsyncSafe(() => {
                 if (e.EventId == updateCheckEventId){
                     btnCheckUpdates.Enabled = true;
 
@@ -81,6 +106,12 @@ namespace TweetDck.Core.Other.Settings{
                         MessageBox.Show("Your version of "+Program.BrandName+" is up to date.", "No Updates Available", MessageBoxButtons.OK, MessageBoxIcon.Information);
                     }
                 }
+            });
+        }
+
+        private void zoomUpdateTimer_Tick(object sender, EventArgs e){
+            Config.ZoomLevel = trackBarZoom.Value;
+            zoomUpdateTimer.Stop();
         }
     }
 }

Core/Other/Settings/TabSettingsNotifications.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDck.Core.Other.Settings {
+namespace TweetDuck.Core.Other.Settings {
     partial class TabSettingsNotifications {
         /// <summary> 
         /// Required designer variable.
@@ -24,7 +24,6 @@
         /// </summary>
         private void InitializeComponent() {
             this.components = new System.ComponentModel.Container();
-            this.groupNotificationLocation = new System.Windows.Forms.GroupBox();
             this.labelEdgeDistanceValue = new System.Windows.Forms.Label();
             this.labelDisplay = new System.Windows.Forms.Label();
             this.comboBoxDisplay = new System.Windows.Forms.ComboBox();
@@ -35,53 +34,48 @@
             this.radioLocTR = new System.Windows.Forms.RadioButton();
             this.radioLocTL = new System.Windows.Forms.RadioButton();
             this.trackBarEdgeDistance = new System.Windows.Forms.TrackBar();
-            this.groupNotificationDuration = new System.Windows.Forms.GroupBox();
             this.tableLayoutDurationButtons = new System.Windows.Forms.TableLayoutPanel();
-            this.btnDurationMedium = new TweetDck.Core.Controls.FlatButton();
+            this.btnDurationMedium = new TweetDuck.Core.Controls.FlatButton();
-            this.btnDurationLong = new TweetDck.Core.Controls.FlatButton();
+            this.btnDurationLong = new TweetDuck.Core.Controls.FlatButton();
-            this.btnDurationShort = new TweetDck.Core.Controls.FlatButton();
+            this.btnDurationShort = new TweetDuck.Core.Controls.FlatButton();
             this.labelDurationValue = new System.Windows.Forms.Label();
             this.trackBarDuration = new System.Windows.Forms.TrackBar();
-            this.groupUserInterface = new System.Windows.Forms.GroupBox();
             this.checkSkipOnLinkClick = new System.Windows.Forms.CheckBox();
             this.checkColumnName = new System.Windows.Forms.CheckBox();
             this.labelIdlePause = new System.Windows.Forms.Label();
             this.comboBoxIdlePause = new System.Windows.Forms.ComboBox();
             this.checkNonIntrusive = new System.Windows.Forms.CheckBox();
-            this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-            this.checkNotificationTimer = new System.Windows.Forms.CheckBox();
             this.checkTimerCountDown = new System.Windows.Forms.CheckBox();
-            this.groupNotificationLocation.SuspendLayout();
+            this.checkNotificationTimer = new System.Windows.Forms.CheckBox();
+            this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+            this.radioSizeAuto = new System.Windows.Forms.RadioButton();
+            this.radioSizeCustom = new System.Windows.Forms.RadioButton();
+            this.labelGeneral = new System.Windows.Forms.Label();
+            this.panelGeneral = new System.Windows.Forms.Panel();
+            this.labelScrollSpeedValue = new System.Windows.Forms.Label();
+            this.trackBarScrollSpeed = new System.Windows.Forms.TrackBar();
+            this.labelScrollSpeed = new System.Windows.Forms.Label();
+            this.labelLocation = new System.Windows.Forms.Label();
+            this.panelLocation = new System.Windows.Forms.Panel();
+            this.panelTimer = new System.Windows.Forms.Panel();
+            this.labelDuration = new System.Windows.Forms.Label();
+            this.labelTimer = new System.Windows.Forms.Label();
+            this.labelSize = new System.Windows.Forms.Label();
+            this.panelMiscellaneous = new System.Windows.Forms.Panel();
+            this.durationUpdateTimer = new System.Windows.Forms.Timer(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.trackBarEdgeDistance)).BeginInit();
-            this.groupNotificationDuration.SuspendLayout();
             this.tableLayoutDurationButtons.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.trackBarDuration)).BeginInit();
-            this.groupUserInterface.SuspendLayout();
+            this.panelGeneral.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.trackBarScrollSpeed)).BeginInit();
+            this.panelLocation.SuspendLayout();
+            this.panelTimer.SuspendLayout();
+            this.panelMiscellaneous.SuspendLayout();
             this.SuspendLayout();
             // 
-            // groupNotificationLocation
-            // 
-            this.groupNotificationLocation.Controls.Add(this.labelEdgeDistanceValue);
-            this.groupNotificationLocation.Controls.Add(this.labelDisplay);
-            this.groupNotificationLocation.Controls.Add(this.comboBoxDisplay);
-            this.groupNotificationLocation.Controls.Add(this.labelEdgeDistance);
-            this.groupNotificationLocation.Controls.Add(this.radioLocCustom);
-            this.groupNotificationLocation.Controls.Add(this.radioLocBR);
-            this.groupNotificationLocation.Controls.Add(this.radioLocBL);
-            this.groupNotificationLocation.Controls.Add(this.radioLocTR);
-            this.groupNotificationLocation.Controls.Add(this.radioLocTL);
-            this.groupNotificationLocation.Controls.Add(this.trackBarEdgeDistance);
-            this.groupNotificationLocation.Location = new System.Drawing.Point(198, 9);
-            this.groupNotificationLocation.Name = "groupNotificationLocation";
-            this.groupNotificationLocation.Size = new System.Drawing.Size(183, 282);
-            this.groupNotificationLocation.TabIndex = 2;
-            this.groupNotificationLocation.TabStop = false;
-            this.groupNotificationLocation.Text = "Location";
-            // 
             // labelEdgeDistanceValue
             // 
-            this.labelEdgeDistanceValue.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
+            this.labelEdgeDistanceValue.Location = new System.Drawing.Point(147, 129);
-            this.labelEdgeDistanceValue.Location = new System.Drawing.Point(143, 217);
             this.labelEdgeDistanceValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelEdgeDistanceValue.Name = "labelEdgeDistanceValue";
             this.labelEdgeDistanceValue.Size = new System.Drawing.Size(34, 13);
@@ -92,7 +86,7 @@
             // labelDisplay
             // 
             this.labelDisplay.AutoSize = true;
-            this.labelDisplay.Location = new System.Drawing.Point(5, 144);
+            this.labelDisplay.Location = new System.Drawing.Point(3, 60);
             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);
@@ -105,15 +99,16 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.comboBoxDisplay.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBoxDisplay.FormattingEnabled = true;
-            this.comboBoxDisplay.Location = new System.Drawing.Point(8, 160);
+            this.comboBoxDisplay.Location = new System.Drawing.Point(5, 76);
+            this.comboBoxDisplay.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.comboBoxDisplay.Name = "comboBoxDisplay";
-            this.comboBoxDisplay.Size = new System.Drawing.Size(171, 21);
+            this.comboBoxDisplay.Size = new System.Drawing.Size(144, 21);
             this.comboBoxDisplay.TabIndex = 6;
             // 
             // labelEdgeDistance
             // 
             this.labelEdgeDistance.AutoSize = true;
-            this.labelEdgeDistance.Location = new System.Drawing.Point(5, 196);
+            this.labelEdgeDistance.Location = new System.Drawing.Point(3, 112);
             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);
@@ -122,24 +117,22 @@
             // 
             // radioLocCustom
             // 
-            this.radioLocCustom.AutoSize = true;
+            this.radioLocCustom.Location = new System.Drawing.Point(205, 4);
-            this.radioLocCustom.Location = new System.Drawing.Point(8, 112);
+            this.radioLocCustom.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
-            this.radioLocCustom.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.radioLocCustom.Name = "radioLocCustom";
-            this.radioLocCustom.Size = new System.Drawing.Size(60, 17);
+            this.radioLocCustom.Size = new System.Drawing.Size(65, 41);
             this.radioLocCustom.TabIndex = 4;
             this.radioLocCustom.TabStop = true;
             this.radioLocCustom.Text = "Custom";
-            this.toolTip.SetToolTip(this.radioLocCustom, "Drag the notification window to the desired location.");
+            this.toolTip.SetToolTip(this.radioLocCustom, "Drag the example notification window to the desired location.");
             this.radioLocCustom.UseVisualStyleBackColor = true;
             // 
             // radioLocBR
             // 
-            this.radioLocBR.AutoSize = true;
+            this.radioLocBR.Location = new System.Drawing.Point(105, 28);
-            this.radioLocBR.Location = new System.Drawing.Point(8, 89);
+            this.radioLocBR.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
-            this.radioLocBR.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.radioLocBR.Name = "radioLocBR";
-            this.radioLocBR.Size = new System.Drawing.Size(86, 17);
+            this.radioLocBR.Size = new System.Drawing.Size(92, 17);
             this.radioLocBR.TabIndex = 3;
             this.radioLocBR.TabStop = true;
             this.radioLocBR.Text = "Bottom Right";
@@ -147,11 +140,10 @@
             // 
             // radioLocBL
             // 
-            this.radioLocBL.AutoSize = true;
+            this.radioLocBL.Location = new System.Drawing.Point(5, 28);
-            this.radioLocBL.Location = new System.Drawing.Point(8, 66);
+            this.radioLocBL.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
-            this.radioLocBL.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.radioLocBL.Name = "radioLocBL";
-            this.radioLocBL.Size = new System.Drawing.Size(79, 17);
+            this.radioLocBL.Size = new System.Drawing.Size(92, 17);
             this.radioLocBL.TabIndex = 2;
             this.radioLocBL.TabStop = true;
             this.radioLocBL.Text = "Bottom Left";
@@ -159,11 +151,10 @@
             // 
             // radioLocTR
             // 
-            this.radioLocTR.AutoSize = true;
+            this.radioLocTR.Location = new System.Drawing.Point(105, 4);
-            this.radioLocTR.Location = new System.Drawing.Point(8, 43);
+            this.radioLocTR.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
-            this.radioLocTR.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.radioLocTR.Name = "radioLocTR";
-            this.radioLocTR.Size = new System.Drawing.Size(72, 17);
+            this.radioLocTR.Size = new System.Drawing.Size(92, 17);
             this.radioLocTR.TabIndex = 1;
             this.radioLocTR.TabStop = true;
             this.radioLocTR.Text = "Top Right";
@@ -171,11 +162,10 @@
             // 
             // radioLocTL
             // 
-            this.radioLocTL.AutoSize = true;
+            this.radioLocTL.Location = new System.Drawing.Point(5, 4);
-            this.radioLocTL.Location = new System.Drawing.Point(8, 20);
             this.radioLocTL.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
             this.radioLocTL.Name = "radioLocTL";
-            this.radioLocTL.Size = new System.Drawing.Size(65, 17);
+            this.radioLocTL.Size = new System.Drawing.Size(92, 17);
             this.radioLocTL.TabIndex = 0;
             this.radioLocTL.TabStop = true;
             this.radioLocTL.Text = "Top Left";
@@ -183,35 +173,20 @@
             // 
             // trackBarEdgeDistance
             // 
-            this.trackBarEdgeDistance.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            this.trackBarEdgeDistance.AutoSize = false;
-            | System.Windows.Forms.AnchorStyles.Right)));
             this.trackBarEdgeDistance.LargeChange = 8;
-            this.trackBarEdgeDistance.Location = new System.Drawing.Point(8, 212);
+            this.trackBarEdgeDistance.Location = new System.Drawing.Point(5, 128);
             this.trackBarEdgeDistance.Maximum = 40;
             this.trackBarEdgeDistance.Minimum = 8;
             this.trackBarEdgeDistance.Name = "trackBarEdgeDistance";
-            this.trackBarEdgeDistance.Size = new System.Drawing.Size(141, 45);
+            this.trackBarEdgeDistance.Size = new System.Drawing.Size(148, 30);
             this.trackBarEdgeDistance.SmallChange = 2;
             this.trackBarEdgeDistance.TabIndex = 8;
             this.trackBarEdgeDistance.TickFrequency = 4;
             this.trackBarEdgeDistance.Value = 8;
             // 
-            // groupNotificationDuration
-            // 
-            this.groupNotificationDuration.Controls.Add(this.tableLayoutDurationButtons);
-            this.groupNotificationDuration.Controls.Add(this.labelDurationValue);
-            this.groupNotificationDuration.Controls.Add(this.trackBarDuration);
-            this.groupNotificationDuration.Location = new System.Drawing.Point(9, 202);
-            this.groupNotificationDuration.Name = "groupNotificationDuration";
-            this.groupNotificationDuration.Size = new System.Drawing.Size(183, 89);
-            this.groupNotificationDuration.TabIndex = 1;
-            this.groupNotificationDuration.TabStop = false;
-            this.groupNotificationDuration.Text = "Duration";
-            // 
             // tableLayoutDurationButtons
             // 
-            this.tableLayoutDurationButtons.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
             this.tableLayoutDurationButtons.ColumnCount = 3;
             this.tableLayoutDurationButtons.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 32F));
             this.tableLayoutDurationButtons.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 36F));
@@ -219,12 +194,12 @@
             this.tableLayoutDurationButtons.Controls.Add(this.btnDurationMedium, 0, 0);
             this.tableLayoutDurationButtons.Controls.Add(this.btnDurationLong, 1, 0);
             this.tableLayoutDurationButtons.Controls.Add(this.btnDurationShort, 0, 0);
-            this.tableLayoutDurationButtons.Location = new System.Drawing.Point(6, 56);
+            this.tableLayoutDurationButtons.Location = new System.Drawing.Point(3, 113);
             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.TabIndex = 2;
+            this.tableLayoutDurationButtons.TabIndex = 5;
             // 
             // btnDurationMedium
             // 
@@ -273,54 +248,36 @@
             // 
             // labelDurationValue
             // 
-            this.labelDurationValue.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.labelDurationValue.BackColor = System.Drawing.Color.Transparent;
-            this.labelDurationValue.Location = new System.Drawing.Point(129, 20);
+            this.labelDurationValue.Location = new System.Drawing.Point(147, 77);
             this.labelDurationValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
             this.labelDurationValue.Name = "labelDurationValue";
             this.labelDurationValue.Size = new System.Drawing.Size(48, 13);
-            this.labelDurationValue.TabIndex = 1;
+            this.labelDurationValue.TabIndex = 4;
             this.labelDurationValue.Text = "0 ms/c";
             this.labelDurationValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
             this.toolTip.SetToolTip(this.labelDurationValue, "Milliseconds per character.");
             // 
             // trackBarDuration
             // 
-            this.trackBarDuration.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            this.trackBarDuration.AutoSize = false;
-            | System.Windows.Forms.AnchorStyles.Right)));
+            this.trackBarDuration.Location = new System.Drawing.Point(3, 76);
-            this.trackBarDuration.Location = new System.Drawing.Point(6, 19);
             this.trackBarDuration.Maximum = 60;
             this.trackBarDuration.Minimum = 10;
             this.trackBarDuration.Name = "trackBarDuration";
-            this.trackBarDuration.Size = new System.Drawing.Size(128, 45);
+            this.trackBarDuration.Size = new System.Drawing.Size(148, 30);
-            this.trackBarDuration.TabIndex = 0;
+            this.trackBarDuration.TabIndex = 3;
             this.trackBarDuration.TickFrequency = 5;
             this.trackBarDuration.Value = 25;
             // 
-            // groupUserInterface
-            // 
-            this.groupUserInterface.Controls.Add(this.checkSkipOnLinkClick);
-            this.groupUserInterface.Controls.Add(this.checkColumnName);
-            this.groupUserInterface.Controls.Add(this.labelIdlePause);
-            this.groupUserInterface.Controls.Add(this.comboBoxIdlePause);
-            this.groupUserInterface.Controls.Add(this.checkNonIntrusive);
-            this.groupUserInterface.Controls.Add(this.checkTimerCountDown);
-            this.groupUserInterface.Controls.Add(this.checkNotificationTimer);
-            this.groupUserInterface.Location = new System.Drawing.Point(9, 9);
-            this.groupUserInterface.Name = "groupUserInterface";
-            this.groupUserInterface.Size = new System.Drawing.Size(183, 187);
-            this.groupUserInterface.TabIndex = 0;
-            this.groupUserInterface.TabStop = false;
-            this.groupUserInterface.Text = "General";
-            // 
             // checkSkipOnLinkClick
             // 
             this.checkSkipOnLinkClick.AutoSize = true;
-            this.checkSkipOnLinkClick.Location = new System.Drawing.Point(9, 90);
+            this.checkSkipOnLinkClick.Location = new System.Drawing.Point(6, 28);
             this.checkSkipOnLinkClick.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
             this.checkSkipOnLinkClick.Name = "checkSkipOnLinkClick";
             this.checkSkipOnLinkClick.Size = new System.Drawing.Size(113, 17);
-            this.checkSkipOnLinkClick.TabIndex = 3;
+            this.checkSkipOnLinkClick.TabIndex = 1;
             this.checkSkipOnLinkClick.Text = "Skip On Link Click";
             this.toolTip.SetToolTip(this.checkSkipOnLinkClick, "Skips current notification when a link\r\ninside the notification is clicked.");
             this.checkSkipOnLinkClick.UseVisualStyleBackColor = true;
@@ -328,7 +285,7 @@
             // checkColumnName
             // 
             this.checkColumnName.AutoSize = true;
-            this.checkColumnName.Location = new System.Drawing.Point(9, 21);
+            this.checkColumnName.Location = new System.Drawing.Point(6, 5);
             this.checkColumnName.Margin = new System.Windows.Forms.Padding(6, 5, 3, 3);
             this.checkColumnName.Name = "checkColumnName";
             this.checkColumnName.Size = new System.Drawing.Size(129, 17);
@@ -340,9 +297,8 @@
             // 
             // labelIdlePause
             // 
-            this.labelIdlePause.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.labelIdlePause.AutoSize = true;
-            this.labelIdlePause.Location = new System.Drawing.Point(3, 141);
+            this.labelIdlePause.Location = new System.Drawing.Point(3, 83);
             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);
@@ -351,78 +307,263 @@
             // 
             // comboBoxIdlePause
             // 
-            this.comboBoxIdlePause.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
             this.comboBoxIdlePause.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.comboBoxIdlePause.FormattingEnabled = true;
-            this.comboBoxIdlePause.Location = new System.Drawing.Point(6, 157);
+            this.comboBoxIdlePause.Location = new System.Drawing.Point(5, 99);
+            this.comboBoxIdlePause.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
             this.comboBoxIdlePause.Name = "comboBoxIdlePause";
-            this.comboBoxIdlePause.Size = new System.Drawing.Size(171, 21);
+            this.comboBoxIdlePause.Size = new System.Drawing.Size(144, 21);
             this.comboBoxIdlePause.TabIndex = 4;
             this.toolTip.SetToolTip(this.comboBoxIdlePause, "Pauses new notifications after going idle for a set amount of time.");
             // 
             // checkNonIntrusive
             // 
             this.checkNonIntrusive.AutoSize = true;
-            this.checkNonIntrusive.Location = new System.Drawing.Point(9, 113);
+            this.checkNonIntrusive.Location = new System.Drawing.Point(6, 51);
             this.checkNonIntrusive.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
             this.checkNonIntrusive.Name = "checkNonIntrusive";
             this.checkNonIntrusive.Size = new System.Drawing.Size(128, 17);
-            this.checkNonIntrusive.TabIndex = 4;
+            this.checkNonIntrusive.TabIndex = 2;
             this.checkNonIntrusive.Text = "Non-Intrusive Popups";
             this.toolTip.SetToolTip(this.checkNonIntrusive, "When not idle and the cursor is within the notification window area,\r\nit will be " +
         "delayed until the cursor moves away to prevent accidental clicks.");
             this.checkNonIntrusive.UseVisualStyleBackColor = true;
             // 
-            // checkNotificationTimer
-            // 
-            this.checkNotificationTimer.AutoSize = true;
-            this.checkNotificationTimer.Location = new System.Drawing.Point(9, 44);
-            this.checkNotificationTimer.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
-            this.checkNotificationTimer.Name = "checkNotificationTimer";
-            this.checkNotificationTimer.Size = new System.Drawing.Size(145, 17);
-            this.checkNotificationTimer.TabIndex = 1;
-            this.checkNotificationTimer.Text = "Display Notification Timer";
-            this.checkNotificationTimer.UseVisualStyleBackColor = true;
-            // 
             // checkTimerCountDown
             // 
             this.checkTimerCountDown.AutoSize = true;
-            this.checkTimerCountDown.Location = new System.Drawing.Point(9, 67);
+            this.checkTimerCountDown.Location = new System.Drawing.Point(6, 28);
             this.checkTimerCountDown.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
             this.checkTimerCountDown.Name = "checkTimerCountDown";
             this.checkTimerCountDown.Size = new System.Drawing.Size(119, 17);
-            this.checkTimerCountDown.TabIndex = 2;
+            this.checkTimerCountDown.TabIndex = 1;
             this.checkTimerCountDown.Text = "Timer Counts Down";
             this.toolTip.SetToolTip(this.checkTimerCountDown, "The notification timer counts down instead of up.");
             this.checkTimerCountDown.UseVisualStyleBackColor = true;
             // 
+            // checkNotificationTimer
+            // 
+            this.checkNotificationTimer.AutoSize = true;
+            this.checkNotificationTimer.Location = new System.Drawing.Point(6, 5);
+            this.checkNotificationTimer.Margin = new System.Windows.Forms.Padding(6, 5, 3, 3);
+            this.checkNotificationTimer.Name = "checkNotificationTimer";
+            this.checkNotificationTimer.Size = new System.Drawing.Size(145, 17);
+            this.checkNotificationTimer.TabIndex = 0;
+            this.checkNotificationTimer.Text = "Display Notification Timer";
+            this.checkNotificationTimer.UseVisualStyleBackColor = true;
+            // 
+            // radioSizeAuto
+            // 
+            this.radioSizeAuto.Location = new System.Drawing.Point(6, 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.TabIndex = 0;
+            this.radioSizeAuto.TabStop = true;
+            this.radioSizeAuto.Text = "Auto";
+            this.toolTip.SetToolTip(this.radioSizeAuto, "Notification size is based on the font size and browser zoom level.");
+            this.radioSizeAuto.UseVisualStyleBackColor = true;
+            // 
+            // radioSizeCustom
+            // 
+            this.radioSizeCustom.Location = new System.Drawing.Point(106, 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.TabIndex = 1;
+            this.radioSizeCustom.TabStop = true;
+            this.radioSizeCustom.Text = "Custom";
+            this.toolTip.SetToolTip(this.radioSizeCustom, "Resize the example notification window to the desired size.");
+            this.radioSizeCustom.UseVisualStyleBackColor = true;
+            // 
+            // 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.Location = new System.Drawing.Point(6, 8);
+            this.labelGeneral.Margin = new System.Windows.Forms.Padding(0, 2, 0, 0);
+            this.labelGeneral.Name = "labelGeneral";
+            this.labelGeneral.Size = new System.Drawing.Size(66, 20);
+            this.labelGeneral.TabIndex = 0;
+            this.labelGeneral.Text = "General";
+            // 
+            // panelGeneral
+            // 
+            this.panelGeneral.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelGeneral.Controls.Add(this.checkColumnName);
+            this.panelGeneral.Controls.Add(this.checkSkipOnLinkClick);
+            this.panelGeneral.Controls.Add(this.checkNonIntrusive);
+            this.panelGeneral.Controls.Add(this.labelIdlePause);
+            this.panelGeneral.Controls.Add(this.comboBoxIdlePause);
+            this.panelGeneral.Location = new System.Drawing.Point(9, 31);
+            this.panelGeneral.Name = "panelGeneral";
+            this.panelGeneral.Size = new System.Drawing.Size(322, 126);
+            this.panelGeneral.TabIndex = 1;
+            // 
+            // labelScrollSpeedValue
+            // 
+            this.labelScrollSpeedValue.Location = new System.Drawing.Point(147, 53);
+            this.labelScrollSpeedValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
+            this.labelScrollSpeedValue.Name = "labelScrollSpeedValue";
+            this.labelScrollSpeedValue.Size = new System.Drawing.Size(34, 13);
+            this.labelScrollSpeedValue.TabIndex = 4;
+            this.labelScrollSpeedValue.Text = "100%";
+            this.labelScrollSpeedValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            // 
+            // trackBarScrollSpeed
+            // 
+            this.trackBarScrollSpeed.AutoSize = false;
+            this.trackBarScrollSpeed.LargeChange = 25;
+            this.trackBarScrollSpeed.Location = new System.Drawing.Point(5, 52);
+            this.trackBarScrollSpeed.Maximum = 200;
+            this.trackBarScrollSpeed.Minimum = 25;
+            this.trackBarScrollSpeed.Name = "trackBarScrollSpeed";
+            this.trackBarScrollSpeed.Size = new System.Drawing.Size(148, 30);
+            this.trackBarScrollSpeed.SmallChange = 5;
+            this.trackBarScrollSpeed.TabIndex = 3;
+            this.trackBarScrollSpeed.TickFrequency = 25;
+            this.trackBarScrollSpeed.Value = 100;
+            // 
+            // labelScrollSpeed
+            // 
+            this.labelScrollSpeed.AutoSize = true;
+            this.labelScrollSpeed.Location = new System.Drawing.Point(3, 36);
+            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.TabIndex = 2;
+            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.Location = new System.Drawing.Point(6, 372);
+            this.labelLocation.Margin = new System.Windows.Forms.Padding(0, 21, 0, 0);
+            this.labelLocation.Name = "labelLocation";
+            this.labelLocation.Size = new System.Drawing.Size(70, 20);
+            this.labelLocation.TabIndex = 4;
+            this.labelLocation.Text = "Location";
+            // 
+            // panelLocation
+            // 
+            this.panelLocation.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelLocation.Controls.Add(this.labelEdgeDistanceValue);
+            this.panelLocation.Controls.Add(this.radioLocTL);
+            this.panelLocation.Controls.Add(this.labelDisplay);
+            this.panelLocation.Controls.Add(this.trackBarEdgeDistance);
+            this.panelLocation.Controls.Add(this.comboBoxDisplay);
+            this.panelLocation.Controls.Add(this.radioLocTR);
+            this.panelLocation.Controls.Add(this.labelEdgeDistance);
+            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(9, 395);
+            this.panelLocation.Name = "panelLocation";
+            this.panelLocation.Size = new System.Drawing.Size(322, 165);
+            this.panelLocation.TabIndex = 5;
+            // 
+            // panelTimer
+            // 
+            this.panelTimer.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelTimer.Controls.Add(this.labelDuration);
+            this.panelTimer.Controls.Add(this.checkNotificationTimer);
+            this.panelTimer.Controls.Add(this.tableLayoutDurationButtons);
+            this.panelTimer.Controls.Add(this.checkTimerCountDown);
+            this.panelTimer.Controls.Add(this.labelDurationValue);
+            this.panelTimer.Controls.Add(this.trackBarDuration);
+            this.panelTimer.Location = new System.Drawing.Point(9, 204);
+            this.panelTimer.Name = "panelTimer";
+            this.panelTimer.Size = new System.Drawing.Size(322, 144);
+            this.panelTimer.TabIndex = 3;
+            // 
+            // labelDuration
+            // 
+            this.labelDuration.AutoSize = true;
+            this.labelDuration.Location = new System.Drawing.Point(3, 60);
+            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.TabIndex = 2;
+            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.Location = new System.Drawing.Point(6, 181);
+            this.labelTimer.Margin = new System.Windows.Forms.Padding(0, 21, 0, 0);
+            this.labelTimer.Name = "labelTimer";
+            this.labelTimer.Size = new System.Drawing.Size(48, 20);
+            this.labelTimer.TabIndex = 2;
+            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.Location = new System.Drawing.Point(6, 584);
+            this.labelSize.Margin = new System.Windows.Forms.Padding(0, 21, 0, 0);
+            this.labelSize.Name = "labelSize";
+            this.labelSize.Size = new System.Drawing.Size(40, 20);
+            this.labelSize.TabIndex = 6;
+            this.labelSize.Text = "Size";
+            // 
+            // panelMiscellaneous
+            // 
+            this.panelMiscellaneous.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelMiscellaneous.Controls.Add(this.radioSizeCustom);
+            this.panelMiscellaneous.Controls.Add(this.radioSizeAuto);
+            this.panelMiscellaneous.Controls.Add(this.labelScrollSpeedValue);
+            this.panelMiscellaneous.Controls.Add(this.trackBarScrollSpeed);
+            this.panelMiscellaneous.Controls.Add(this.labelScrollSpeed);
+            this.panelMiscellaneous.Location = new System.Drawing.Point(9, 607);
+            this.panelMiscellaneous.Name = "panelMiscellaneous";
+            this.panelMiscellaneous.Size = new System.Drawing.Size(322, 92);
+            this.panelMiscellaneous.TabIndex = 7;
+            // 
+            // durationUpdateTimer
+            // 
+            this.durationUpdateTimer.Interval = 200;
+            this.durationUpdateTimer.Tick += new System.EventHandler(this.durationUpdateTimer_Tick);
+            // 
             // TabSettingsNotifications
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.groupUserInterface);
+            this.Controls.Add(this.panelMiscellaneous);
-            this.Controls.Add(this.groupNotificationDuration);
+            this.Controls.Add(this.labelSize);
-            this.Controls.Add(this.groupNotificationLocation);
+            this.Controls.Add(this.labelTimer);
+            this.Controls.Add(this.panelLocation);
+            this.Controls.Add(this.labelLocation);
+            this.Controls.Add(this.panelGeneral);
+            this.Controls.Add(this.labelGeneral);
+            this.Controls.Add(this.panelTimer);
             this.Name = "TabSettingsNotifications";
-            this.Size = new System.Drawing.Size(478, 300);
+            this.Size = new System.Drawing.Size(340, 708);
             this.ParentChanged += new System.EventHandler(this.TabSettingsNotifications_ParentChanged);
-            this.groupNotificationLocation.ResumeLayout(false);
-            this.groupNotificationLocation.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.trackBarEdgeDistance)).EndInit();
-            this.groupNotificationDuration.ResumeLayout(false);
-            this.groupNotificationDuration.PerformLayout();
             this.tableLayoutDurationButtons.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.trackBarDuration)).EndInit();
-            this.groupUserInterface.ResumeLayout(false);
+            this.panelGeneral.ResumeLayout(false);
-            this.groupUserInterface.PerformLayout();
+            this.panelGeneral.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.trackBarScrollSpeed)).EndInit();
+            this.panelLocation.ResumeLayout(false);
+            this.panelLocation.PerformLayout();
+            this.panelTimer.ResumeLayout(false);
+            this.panelTimer.PerformLayout();
+            this.panelMiscellaneous.ResumeLayout(false);
+            this.panelMiscellaneous.PerformLayout();
             this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
 
         #endregion
-
-        private System.Windows.Forms.GroupBox groupNotificationLocation;
         private System.Windows.Forms.Label labelDisplay;
         private System.Windows.Forms.ComboBox comboBoxDisplay;
         private System.Windows.Forms.Label labelEdgeDistance;
@@ -432,16 +573,14 @@
         private System.Windows.Forms.RadioButton radioLocBL;
         private System.Windows.Forms.RadioButton radioLocTR;
         private System.Windows.Forms.RadioButton radioLocTL;
-        private System.Windows.Forms.GroupBox groupNotificationDuration;
-        private System.Windows.Forms.GroupBox groupUserInterface;
         private System.Windows.Forms.ToolTip toolTip;
         private System.Windows.Forms.Label labelEdgeDistanceValue;
         private System.Windows.Forms.Label labelDurationValue;
         private System.Windows.Forms.TrackBar trackBarDuration;
         private System.Windows.Forms.TableLayoutPanel tableLayoutDurationButtons;
-        private TweetDck.Core.Controls.FlatButton btnDurationMedium;
+        private TweetDuck.Core.Controls.FlatButton btnDurationMedium;
-        private TweetDck.Core.Controls.FlatButton btnDurationLong;
+        private TweetDuck.Core.Controls.FlatButton btnDurationLong;
-        private TweetDck.Core.Controls.FlatButton btnDurationShort;
+        private TweetDuck.Core.Controls.FlatButton btnDurationShort;
         private System.Windows.Forms.CheckBox checkNonIntrusive;
         private System.Windows.Forms.Label labelIdlePause;
         private System.Windows.Forms.ComboBox comboBoxIdlePause;
@@ -449,5 +588,20 @@
         private System.Windows.Forms.CheckBox checkSkipOnLinkClick;
         private System.Windows.Forms.CheckBox checkTimerCountDown;
         private System.Windows.Forms.CheckBox checkNotificationTimer;
+        private System.Windows.Forms.Label labelGeneral;
+        private System.Windows.Forms.Panel panelGeneral;
+        private System.Windows.Forms.Label labelLocation;
+        private System.Windows.Forms.Panel panelLocation;
+        private System.Windows.Forms.Panel panelTimer;
+        private System.Windows.Forms.Label labelTimer;
+        private System.Windows.Forms.Label labelScrollSpeedValue;
+        private System.Windows.Forms.TrackBar trackBarScrollSpeed;
+        private System.Windows.Forms.Label labelScrollSpeed;
+        private System.Windows.Forms.Label labelSize;
+        private System.Windows.Forms.Panel panelMiscellaneous;
+        private System.Windows.Forms.Label labelDuration;
+        private System.Windows.Forms.Timer durationUpdateTimer;
+        private System.Windows.Forms.RadioButton radioSizeCustom;
+        private System.Windows.Forms.RadioButton radioSizeAuto;
     }
 }

Core/Other/Settings/TabSettingsNotifications.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Globalization;
 using System.Windows.Forms;
-using TweetDck.Core.Controls;
+using TweetDuck.Core.Controls;
-using TweetDck.Core.Notification;
+using TweetDuck.Core.Notification;
 
-namespace TweetDck.Core.Other.Settings{
+namespace TweetDuck.Core.Other.Settings{
     partial class TabSettingsNotifications : BaseTabSettings{
         private static readonly int[] IdlePauseSeconds = { 0, 30, 60, 120, 300 };
 
@@ -14,16 +14,13 @@ namespace TweetDck.Core.Other.Settings{
             InitializeComponent();
 
             this.notification = notification;
-            this.notification.CanMoveWindow = () => radioLocCustom.Checked;
-
-            this.notification.Move += (sender, args) => {
-                if (radioLocCustom.Checked){
-                    Config.CustomNotificationPosition = this.notification.Location;
-                }
-            };
             
             this.notification.Initialized += (sender, args) => {
-                this.InvokeAsyncSafe(() => this.notification.ShowNotificationForSettings(true));
+                this.InvokeAsyncSafe(() => {
+                    this.notification.ShowNotificationForSettings(true);
+                    this.notification.Move += notification_Move;
+                    this.notification.ResizeEnd += notification_ResizeEnd;
+                });
             };
 
             this.notification.Activated += notification_Activated;
@@ -37,6 +34,14 @@ namespace TweetDck.Core.Other.Settings{
                 case TweetNotification.Position.Custom: radioLocCustom.Checked = true; break;
             }
 
+            comboBoxDisplay.Enabled = trackBarEdgeDistance.Enabled = !radioLocCustom.Checked;
+
+            switch(Config.NotificationSize){
+                case TweetNotification.Size.Auto: radioSizeAuto.Checked = true; break;
+                case TweetNotification.Size.Custom: radioSizeCustom.Checked = true; break;
+            }
+            
+            toolTip.SetToolTip(trackBarDuration, toolTip.GetToolTip(labelDurationValue));
             trackBarDuration.SetValueSafe(Config.NotificationDurationValue);
             labelDurationValue.Text = Config.NotificationDurationValue+" ms/c";
 
@@ -50,7 +55,7 @@ namespace TweetDck.Core.Other.Settings{
             comboBoxDisplay.Items.Add("(Same As "+Program.BrandName+")");
 
             foreach(Screen screen in Screen.AllScreens){
-                comboBoxDisplay.Items.Add(screen.DeviceName+" ("+screen.Bounds.Width+"x"+screen.Bounds.Height+")");
+                comboBoxDisplay.Items.Add(screen.DeviceName.TrimStart('\\', '.')+" ("+screen.Bounds.Width+"x"+screen.Bounds.Height+")");
             }
 
             comboBoxDisplay.SelectedIndex = Math.Min(comboBoxDisplay.Items.Count-1, Config.NotificationDisplay);
@@ -62,9 +67,15 @@ namespace TweetDck.Core.Other.Settings{
             checkSkipOnLinkClick.Checked = Config.NotificationSkipOnLinkClick;
             checkNonIntrusive.Checked = Config.NotificationNonIntrusiveMode;
 
+            trackBarScrollSpeed.SetValueSafe(Config.NotificationScrollSpeed);
+            labelScrollSpeedValue.Text = trackBarScrollSpeed.Value.ToString(CultureInfo.InvariantCulture)+"%";
+
             trackBarEdgeDistance.SetValueSafe(Config.NotificationEdgeDistance);
             labelEdgeDistanceValue.Text = trackBarEdgeDistance.Value.ToString(CultureInfo.InvariantCulture)+" px";
             
+            this.notification.CanMoveWindow = () => radioLocCustom.Checked;
+            this.notification.CanResizeWindow = radioSizeCustom.Checked;
+
             Disposed += (sender, args) => this.notification.Dispose();
         }
 
@@ -73,7 +84,10 @@ namespace TweetDck.Core.Other.Settings{
             radioLocTR.CheckedChanged += radioLoc_CheckedChanged;
             radioLocBL.CheckedChanged += radioLoc_CheckedChanged;
             radioLocBR.CheckedChanged += radioLoc_CheckedChanged;
-            radioLocCustom.CheckedChanged += radioLoc_CheckedChanged;
+            radioLocCustom.Click += radioLocCustom_Click;
+
+            radioSizeAuto.CheckedChanged += radioSize_CheckedChanged;
+            radioSizeCustom.Click += radioSizeCustom_Click;
 
             trackBarDuration.ValueChanged += trackBarDuration_ValueChanged;
             btnDurationShort.Click += btnDurationShort_Click;
@@ -87,6 +101,7 @@ namespace TweetDck.Core.Other.Settings{
             checkNonIntrusive.CheckedChanged += checkNonIntrusive_CheckedChanged;
 
             comboBoxIdlePause.SelectedValueChanged += comboBoxIdlePause_SelectedValueChanged;
+            trackBarScrollSpeed.ValueChanged += trackBarScrollSpeed_ValueChanged;
 
             comboBoxDisplay.SelectedValueChanged += comboBoxDisplay_SelectedValueChanged;
             trackBarEdgeDistance.ValueChanged += trackBarEdgeDistance_ValueChanged;
@@ -106,28 +121,74 @@ namespace TweetDck.Core.Other.Settings{
             notification.Activated -= notification_Activated;
         }
 
+        private void notification_Move(object sender, EventArgs e){
+            if (radioLocCustom.Checked && notification.Location != ControlExtensions.InvisibleLocation){
+                Config.CustomNotificationPosition = notification.Location;
+            }
+        }
+
+        private void notification_ResizeEnd(object sender, EventArgs e){
+            if (radioSizeCustom.Checked){
+                Config.CustomNotificationSize = notification.BrowserSize;
+                notification.ShowNotificationForSettings(false);
+            }
+        }
+
         private void radioLoc_CheckedChanged(object sender, EventArgs e){
             if (radioLocTL.Checked)Config.NotificationPosition = TweetNotification.Position.TopLeft;
             else if (radioLocTR.Checked)Config.NotificationPosition = TweetNotification.Position.TopRight;
             else if (radioLocBL.Checked)Config.NotificationPosition = TweetNotification.Position.BottomLeft;
             else if (radioLocBR.Checked)Config.NotificationPosition = TweetNotification.Position.BottomRight;
-            else if (radioLocCustom.Checked){
+
+            comboBoxDisplay.Enabled = trackBarEdgeDistance.Enabled = true;
+            notification.ShowNotificationForSettings(false);
+        }
+
+        private void radioLocCustom_Click(object sender, EventArgs e){
             if (!Config.IsCustomNotificationPositionSet){
                 Config.CustomNotificationPosition = notification.Location;
             }
 
             Config.NotificationPosition = TweetNotification.Position.Custom;
+
+            comboBoxDisplay.Enabled = trackBarEdgeDistance.Enabled = false;
+            notification.ShowNotificationForSettings(false);
+
+            if (notification.IsFullyOutsideView() && MessageBox.Show("The notification seems to be outside of view, would you like to reset its position?", "Notification is outside view", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) == DialogResult.Yes){
+                Config.NotificationPosition = TweetNotification.Position.TopRight;
+                notification.MoveToVisibleLocation();
+
+                Config.CustomNotificationPosition = notification.Location;
+
+                Config.NotificationPosition = TweetNotification.Position.Custom;
+                notification.MoveToVisibleLocation();
+            }
         }
 
-            comboBoxDisplay.Enabled = trackBarEdgeDistance.Enabled = !radioLocCustom.Checked;
+        private void radioSize_CheckedChanged(object sender, EventArgs e){
+            if (radioSizeAuto.Checked)Config.NotificationSize = TweetNotification.Size.Auto;
+            
+            notification.ShowNotificationForSettings(false);
+            notification.CanResizeWindow = false; // must be after ShowNotificationForSettings
+        }
+        
+        private void radioSizeCustom_Click(object sender, EventArgs e){
+            if (!Config.IsCustomNotificationSizeSet){
+                Config.CustomNotificationSize = notification.BrowserSize;
+            }
+
+            Config.NotificationSize = TweetNotification.Size.Custom;
+
+            notification.CanResizeWindow = true;
             notification.ShowNotificationForSettings(false);
         }
 
         private void trackBarDuration_ValueChanged(object sender, EventArgs e){
+            durationUpdateTimer.Stop();
+            durationUpdateTimer.Start();
+
             Config.NotificationDurationValue = trackBarDuration.Value;
             labelDurationValue.Text = Config.NotificationDurationValue+" ms/c";
-
-            notification.ShowNotificationForSettings(true);
         }
 
         private void btnDurationShort_Click(object sender, EventArgs e){
@@ -170,6 +231,13 @@ namespace TweetDck.Core.Other.Settings{
             Config.NotificationIdlePauseSeconds = IdlePauseSeconds[comboBoxIdlePause.SelectedIndex];
         }
 
+        private void trackBarScrollSpeed_ValueChanged(object sender, EventArgs e){
+            if (trackBarScrollSpeed.AlignValueToTick()){
+                labelScrollSpeedValue.Text = trackBarScrollSpeed.Value.ToString(CultureInfo.InvariantCulture)+"%";
+                Config.NotificationScrollSpeed = trackBarScrollSpeed.Value;
+            }
+        }
+
         private void comboBoxDisplay_SelectedValueChanged(object sender, EventArgs e){
             Config.NotificationDisplay = comboBoxDisplay.SelectedIndex;
             notification.ShowNotificationForSettings(false);
@@ -180,5 +248,10 @@ namespace TweetDck.Core.Other.Settings{
             Config.NotificationEdgeDistance = trackBarEdgeDistance.Value;
             notification.ShowNotificationForSettings(false);
         }
+
+        private void durationUpdateTimer_Tick(object sender, EventArgs e){
+            notification.ShowNotificationForSettings(true);
+            durationUpdateTimer.Stop();
+        }
     }
 }

Core/Other/Settings/TabSettingsSounds.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDck.Core.Other.Settings {
+namespace TweetDuck.Core.Other.Settings {
     partial class TabSettingsSounds {
         /// <summary> 
         /// Required designer variable.
@@ -25,31 +25,20 @@
         private void InitializeComponent() {
             this.components = new System.ComponentModel.Container();
             this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-            this.groupCustomSound = new System.Windows.Forms.GroupBox();
             this.btnPlaySound = new System.Windows.Forms.Button();
             this.btnResetSound = new System.Windows.Forms.Button();
             this.btnBrowseSound = new System.Windows.Forms.Button();
             this.tbCustomSound = new System.Windows.Forms.TextBox();
-            this.groupCustomSound.SuspendLayout();
+            this.labelSoundNotification = new System.Windows.Forms.Label();
+            this.panelSoundNotification = new System.Windows.Forms.Panel();
+            this.panelSoundNotification.SuspendLayout();
             this.SuspendLayout();
             // 
-            // groupCustomSound
-            // 
-            this.groupCustomSound.Controls.Add(this.btnPlaySound);
-            this.groupCustomSound.Controls.Add(this.btnResetSound);
-            this.groupCustomSound.Controls.Add(this.btnBrowseSound);
-            this.groupCustomSound.Controls.Add(this.tbCustomSound);
-            this.groupCustomSound.Location = new System.Drawing.Point(9, 9);
-            this.groupCustomSound.Name = "groupCustomSound";
-            this.groupCustomSound.Size = new System.Drawing.Size(372, 75);
-            this.groupCustomSound.TabIndex = 0;
-            this.groupCustomSound.TabStop = false;
-            this.groupCustomSound.Text = "Custom Sound Notification";
-            // 
             // btnPlaySound
             // 
+            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(250, 45);
+            this.btnPlaySound.Location = new System.Drawing.Point(203, 29);
             this.btnPlaySound.Name = "btnPlaySound";
             this.btnPlaySound.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
             this.btnPlaySound.Size = new System.Drawing.Size(43, 23);
@@ -60,7 +49,7 @@
             // btnResetSound
             // 
             this.btnResetSound.AutoSize = true;
-            this.btnResetSound.Location = new System.Drawing.Point(6, 45);
+            this.btnResetSound.Location = new System.Drawing.Point(3, 29);
             this.btnResetSound.Name = "btnResetSound";
             this.btnResetSound.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
             this.btnResetSound.Size = new System.Drawing.Size(51, 23);
@@ -70,8 +59,9 @@
             // 
             // btnBrowseSound
             // 
+            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(299, 45);
+            this.btnBrowseSound.Location = new System.Drawing.Point(252, 29);
             this.btnBrowseSound.Name = "btnBrowseSound";
             this.btnBrowseSound.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
             this.btnBrowseSound.Size = new System.Drawing.Size(67, 23);
@@ -81,31 +71,60 @@
             // 
             // tbCustomSound
             // 
-            this.tbCustomSound.Location = new System.Drawing.Point(6, 19);
+            this.tbCustomSound.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.tbCustomSound.Location = new System.Drawing.Point(3, 3);
             this.tbCustomSound.Name = "tbCustomSound";
-            this.tbCustomSound.Size = new System.Drawing.Size(360, 20);
+            this.tbCustomSound.Size = new System.Drawing.Size(316, 20);
             this.tbCustomSound.TabIndex = 0;
             // 
+            // 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.Location = new System.Drawing.Point(6, 8);
+            this.labelSoundNotification.Margin = new System.Windows.Forms.Padding(0, 2, 0, 0);
+            this.labelSoundNotification.Name = "labelSoundNotification";
+            this.labelSoundNotification.Size = new System.Drawing.Size(198, 20);
+            this.labelSoundNotification.TabIndex = 1;
+            this.labelSoundNotification.Text = "Custom Sound Notification";
+            // 
+            // panelSoundNotification
+            // 
+            this.panelSoundNotification.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.panelSoundNotification.Controls.Add(this.btnPlaySound);
+            this.panelSoundNotification.Controls.Add(this.tbCustomSound);
+            this.panelSoundNotification.Controls.Add(this.btnResetSound);
+            this.panelSoundNotification.Controls.Add(this.btnBrowseSound);
+            this.panelSoundNotification.Location = new System.Drawing.Point(9, 31);
+            this.panelSoundNotification.Name = "panelSoundNotification";
+            this.panelSoundNotification.Size = new System.Drawing.Size(322, 56);
+            this.panelSoundNotification.TabIndex = 2;
+            // 
             // TabSettingsSounds
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.groupCustomSound);
+            this.Controls.Add(this.panelSoundNotification);
+            this.Controls.Add(this.labelSoundNotification);
             this.Name = "TabSettingsSounds";
-            this.Size = new System.Drawing.Size(478, 300);
+            this.Size = new System.Drawing.Size(340, 97);
-            this.groupCustomSound.ResumeLayout(false);
+            this.panelSoundNotification.ResumeLayout(false);
-            this.groupCustomSound.PerformLayout();
+            this.panelSoundNotification.PerformLayout();
             this.ResumeLayout(false);
+            this.PerformLayout();
 
         }
 
         #endregion
 
         private System.Windows.Forms.ToolTip toolTip;
-        private System.Windows.Forms.GroupBox groupCustomSound;
         private System.Windows.Forms.Button btnResetSound;
         private System.Windows.Forms.Button btnBrowseSound;
         private System.Windows.Forms.TextBox tbCustomSound;
         private System.Windows.Forms.Button btnPlaySound;
+        private System.Windows.Forms.Label labelSoundNotification;
+        private System.Windows.Forms.Panel panelSoundNotification;
     }
 }

Core/Other/Settings/TabSettingsSounds.cs

@@ -2,17 +2,17 @@
 using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
-using TweetDck.Core.Notification;
+using TweetDuck.Core.Notification;
-using TweetDck.Core.Notification.Sound;
+using TweetLib.Audio.Utils;
 
-namespace TweetDck.Core.Other.Settings{
+namespace TweetDuck.Core.Other.Settings{
     partial class TabSettingsSounds : BaseTabSettings{
-        private readonly ISoundNotificationPlayer soundNotification;
+        private readonly SoundNotification soundNotification;
 
         public TabSettingsSounds(){
             InitializeComponent();
 
-            soundNotification = SoundNotification.New();
+            soundNotification = new SoundNotification();
             soundNotification.PlaybackError += sound_PlaybackError;
 
             tbCustomSound.Text = Config.NotificationSoundPath;

Core/TrayIcon.Designer.cs

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

Core/TrayIcon.cs

@@ -2,7 +2,7 @@
 using System.ComponentModel;
 using System.Windows.Forms;
 
-namespace TweetDck.Core{
+namespace TweetDuck.Core{
     partial class TrayIcon : Component{
         public enum Behavior{ // keep order
             Disabled, DisplayOnly, MinimizeToTray, CloseToTray, Combined
@@ -12,9 +12,7 @@ namespace TweetDck.Core{
         public event EventHandler ClickClose;
 
         public bool Visible{
-            get{
+            get => notifyIcon.Visible;
-                return notifyIcon.Visible;
-            }
 
             set{
                 if (value){
@@ -72,9 +70,7 @@ namespace TweetDck.Core{
         }
 
         private void menuItemRestore_Click(object sender, EventArgs e){
-            if (ClickRestore != null){
+            ClickRestore?.Invoke(this, e);
-                ClickRestore(this, e);
-            }
         }
 
         private void menuItemMuteNotifications_Click(object sender, EventArgs e){
@@ -83,9 +79,7 @@ namespace TweetDck.Core{
         }
 
         private void menuItemClose_Click(object sender, EventArgs e){
-            if (ClickClose != null){
+            ClickClose?.Invoke(this, e);
-                ClickClose(this, e);
-            }
         }
     }
 

Core/Utils/BrowserCache.cs

@@ -4,7 +4,7 @@ using System.IO;
 using System.Threading.Tasks;
 using System.Linq;
 
-namespace TweetDck.Core.Utils{
+namespace TweetDuck.Core.Utils{
     static class BrowserCache{
         private static bool ClearOnExit { get; set; }
 

Core/Utils/BrowserUtils.cs

@@ -1,14 +1,14 @@
-using System;
+using CefSharp;
+using System;
 using System.Diagnostics;
+using System.Drawing;
 using System.Globalization;
 using System.IO;
 using System.Net;
-using System.Windows.Forms;
-using CefSharp;
 using System.Text.RegularExpressions;
-using System.Drawing;
+using System.Windows.Forms;
 
-namespace TweetDck.Core.Utils{
+namespace TweetDuck.Core.Utils{
     static class BrowserUtils{
         public static string HeaderAcceptLanguage{
             get{
@@ -23,11 +23,7 @@ namespace TweetDck.Core.Utils{
             }
         }
 
-        public static string HeaderUserAgent{
+        public static string HeaderUserAgent => Program.BrandName+" "+Application.ProductVersion;
-            get{
-               return Program.BrandName+" "+Application.ProductVersion; 
-            }
-        }
 
         public static readonly Color BackgroundColor = Color.FromArgb(28, 99, 153);
         public const string BackgroundColorFix = "let e=document.createElement('style');document.head.appendChild(e);e.innerHTML='body::before{background:#1c6399!important}'";
@@ -37,9 +33,7 @@ namespace TweetDck.Core.Utils{
         };
 
         public static bool IsValidUrl(string url){
-            Uri uri;
+            if (Uri.TryCreate(url, UriKind.Absolute, out Uri uri)){
-            
-            if (Uri.TryCreate(url, UriKind.Absolute, out uri)){
                 string scheme = uri.Scheme;
                 return scheme == Uri.UriSchemeHttp || scheme == Uri.UriSchemeHttps || scheme == Uri.UriSchemeFtp || scheme == Uri.UriSchemeMailto;
             }
@@ -75,17 +69,36 @@ namespace TweetDck.Core.Utils{
             return ConvertPascalCaseToScreamingSnakeCase(Enum.GetName(typeof(CefErrorCode), code) ?? string.Empty);
         }
 
-        public static void DownloadFileAsync(string url, string target, Action<Exception> onFailure){
+        public static WebClient DownloadFileAsync(string url, string target, Action onSuccess, Action<Exception> onFailure){
             WebClient client = new WebClient{ Proxy = null };
             client.Headers[HttpRequestHeader.UserAgent] = HeaderUserAgent;
 
             client.DownloadFileCompleted += (sender, args) => {
-                if (args.Error != null){
+                if (args.Cancelled){
-                    onFailure(args.Error);
+                    try{
+                        File.Delete(target);
+                    }catch{
+                        // didn't want it deleted anyways
+                    }
+                }
+                else if (args.Error != null){
+                    onFailure?.Invoke(args.Error);
+                }
+                else{
+                    onSuccess?.Invoke();
                 }
             };
 
             client.DownloadFileAsync(new Uri(url), target);
+            return client;
+        }
+
+        public static int Scale(int baseValue, double scaleFactor){
+            return (int)Math.Round(baseValue*scaleFactor);
+        }
+
+        public static void SetZoomLevel(IBrowser browser, int percentage){
+            browser.GetHost().SetZoomLevel(Math.Log(percentage/100.0, 1.2));
         }
 
         public static bool IsTweetDeckWebsite(IFrame frame){

Core/Utils/CommandLineArgs.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace TweetDck.Core.Utils{
+namespace TweetDuck.Core.Utils{
     class CommandLineArgs{
         public static CommandLineArgs FromStringArray(char entryChar, string[] array){
             CommandLineArgs args = new CommandLineArgs();
@@ -35,11 +35,7 @@ namespace TweetDck.Core.Utils{
         private readonly HashSet<string> flags = new HashSet<string>();
         private readonly Dictionary<string, string> values = new Dictionary<string, string>();
 
-        public int Count{
+        public int Count => flags.Count+values.Count;
-            get{
-                return flags.Count+values.Count;
-            }
-        }
 
         public void AddFlag(string flag){
             flags.Add(flag.ToLowerInvariant());
@@ -62,8 +58,7 @@ namespace TweetDck.Core.Utils{
         }
 
         public string GetValue(string key, string defaultValue){
-            string val;
+            return values.TryGetValue(key.ToLowerInvariant(), out string val) ? val : defaultValue;
-            return values.TryGetValue(key.ToLowerInvariant(), out val) ? val : defaultValue;
         }
 
         public void RemoveValue(string key){

Core/Utils/CommandLineArgsParser.cs

@@ -1,14 +1,9 @@
-using System.Text.RegularExpressions;
+using System;
+using System.Text.RegularExpressions;
 
-namespace TweetDck.Core.Utils{
+namespace TweetDuck.Core.Utils{
     static class CommandLineArgsParser{
-        private static Regex splitRegex;
+        private static readonly Lazy<Regex> SplitRegex = new Lazy<Regex>(() => new Regex(@"([^=\s]+(?:=(?:\S*""[^""]*?""\S*|\S*))?)", RegexOptions.Compiled), false);
-
-        private static Regex SplitRegex{
-            get{
-                return splitRegex ?? (splitRegex = new Regex(@"([^=\s]+(?:=(?:[^ ]*""[^""]*?""[^ ]*|[^ ]*))?)", RegexOptions.Compiled));
-            }
-        }
         
         public static CommandLineArgs ReadCefArguments(string argumentString){
             CommandLineArgs args = new CommandLineArgs();
@@ -17,7 +12,7 @@ namespace TweetDck.Core.Utils{
                 return args;
             }
 
-            foreach(Match match in SplitRegex.Matches(argumentString)){
+            foreach(Match match in SplitRegex.Value.Matches(argumentString)){
                 string matchValue = match.Value;
 
                 int indexEquals = matchValue.IndexOf('=');

Core/Utils/HardwareAcceleration.cs

@@ -1,60 +0,0 @@
-using System;
-using System.IO;
-
-namespace TweetDck.Core.Utils{
-    static class HardwareAcceleration{
-        private static readonly string LibEGL = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "libEGL.dll");
-        private static readonly string LibGLES = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "libGLESv2.dll");
-
-        private static readonly string DisabledLibEGL = LibEGL+".bak";
-        private static readonly string DisabledLibGLES = LibGLES+".bak";
-
-        public static bool IsEnabled{
-            get{
-                return File.Exists(LibEGL) && File.Exists(LibGLES);
-            }
-        }
-
-        public static bool CanEnable{
-            get{
-                return File.Exists(DisabledLibEGL) && File.Exists(DisabledLibGLES);
-            }
-        }
-        
-        public static bool Enable(){
-            if (IsEnabled)return false;
-
-            try{
-                File.Move(DisabledLibEGL, LibEGL);
-                File.Move(DisabledLibGLES, LibGLES);
-                return true;
-            }catch{
-                return false;
-            }
-        }
-
-        public static bool Disable(){
-            if (!IsEnabled)return false;
-
-            try{
-                if (File.Exists(DisabledLibEGL)){
-                    File.Delete(DisabledLibEGL);
-                }
-
-                if (File.Exists(DisabledLibGLES)){
-                    File.Delete(DisabledLibGLES);
-                }
-            }catch{
-                // woops
-            }
-
-            try{
-                File.Move(LibEGL, DisabledLibEGL);
-                File.Move(LibGLES, DisabledLibGLES);
-                return true;
-            }catch{
-                return false;
-            }
-        }
-    }
-}

Core/Utils/InjectedHTML.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace TweetDck.Core.Utils{
+namespace TweetDuck.Core.Utils{
     class InjectedHTML{
         public enum Position{
             Before, After

Core/Utils/NativeMethods.cs

@@ -4,7 +4,7 @@ using System.Drawing;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 
-namespace TweetDck.Core.Utils{
+namespace TweetDuck.Core.Utils{
     [SuppressMessage("ReSharper", "FieldCanBeMadeReadOnly.Local")]
     [SuppressMessage("ReSharper", "MemberCanBePrivate.Local")]
     static class NativeMethods{
@@ -13,12 +13,17 @@ namespace TweetDck.Core.Utils{
 
         public const int HWND_TOPMOST = -1;
         public const uint SWP_NOACTIVATE = 0x0010;
+        public const int WS_DISABLED = 0x08000000;
+        public const int GWL_STYLE = -16;
 
         public const int SB_HORZ = 0;
         public const int BCM_SETSHIELD = 0x160C;
 
         public const int WM_MOUSE_LL = 14;
         public const int WM_MOUSEWHEEL = 0x020A;
+        public const int WM_XBUTTONDOWN = 0x020B;
+        public const int WM_XBUTTONUP = 0x020C;
+        public const int WM_PARENTNOTIFY = 0x0210;
         
         [StructLayout(LayoutKind.Sequential)]
         private struct LASTINPUTINFO{
@@ -80,11 +85,26 @@ namespace TweetDck.Core.Utils{
         [DllImport("user32.dll")]
         public static extern IntPtr CallNextHookEx(IntPtr idHook, int nCode, IntPtr wParam, IntPtr lParam);
 
+        [DllImport("user32.dll")]
+        private static extern int GetWindowLong(IntPtr hWnd, int nIndex);
+
+        [DllImport("user32.dll")]
+        private static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
+
         public static void SetFormPos(Form form, int hWndOrder, uint flags){
             SetWindowPos(form.Handle.ToInt32(), hWndOrder, form.Left, form.Top, form.Width, form.Height, flags);
         }
 
-        public static int GetHookWheelDelta(IntPtr ptr){
+        public static void SetFormDisabled(Form form, bool disabled){
+            if (disabled){
+                SetWindowLong(form.Handle, GWL_STYLE, GetWindowLong(form.Handle, GWL_STYLE) | WS_DISABLED);
+            }
+            else{
+                SetWindowLong(form.Handle, GWL_STYLE, GetWindowLong(form.Handle, GWL_STYLE) & ~WS_DISABLED);
+            }
+        }
+
+        public static int GetMouseHookData(IntPtr ptr){
             return Marshal.PtrToStructure<MSLLHOOKSTRUCT>(ptr).mouseData >> 16;
         }
 

Core/Utils/TwoKeyDictionary.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace TweetDck.Core.Utils{
+namespace TweetDuck.Core.Utils{
     class TwoKeyDictionary<K1, K2, V>{
         private readonly Dictionary<K1, Dictionary<K2, V>> dict;
         private readonly int innerCapacity;
@@ -21,9 +21,7 @@ namespace TweetDck.Core.Utils{
             }
 
             set{
-                Dictionary<K2, V> innerDict;
+                if (!dict.TryGetValue(outerKey, out Dictionary<K2, V> innerDict)){
-
-                if (!dict.TryGetValue(outerKey, out innerDict)){
                     dict.Add(outerKey, innerDict = new Dictionary<K2, V>(innerCapacity));
                 }
 
@@ -44,9 +42,7 @@ namespace TweetDck.Core.Utils{
         // Members
 
         public void Add(K1 outerKey, K2 innerKey, V value){ // throws on duplicate
-            Dictionary<K2, V> innerDict;
+            if (!dict.TryGetValue(outerKey, out Dictionary<K2, V> innerDict)){
-
-            if (!dict.TryGetValue(outerKey, out innerDict)){
                 dict.Add(outerKey, innerDict = new Dictionary<K2, V>(innerCapacity));
             }
 
@@ -54,7 +50,7 @@ namespace TweetDck.Core.Utils{
         }
         
         public void Clear(){
-            this.dict.Clear();
+            dict.Clear();
         }
 
         public void Clear(K1 outerKey){ // throws on missing key, but keeps the key unlike Remove(K1)
@@ -83,10 +79,8 @@ namespace TweetDck.Core.Utils{
         }
         
         public bool Remove(K1 outerKey, K2 innerKey){
-            Dictionary<K2, V> innerDict;
+            if (dict.TryGetValue(outerKey, out Dictionary<K2, V> innerDict) && innerDict.Remove(innerKey)){
-
+                if (innerDict.Count == 0) {
-            if (dict.TryGetValue(outerKey, out innerDict) && innerDict.Remove(innerKey)){
-                if (innerDict.Count == 0){
                     dict.Remove(outerKey);
                 }
 
@@ -96,9 +90,7 @@ namespace TweetDck.Core.Utils{
         }
 
         public bool TryGetValue(K1 outerKey, K2 innerKey, out V value){
-            Dictionary<K2, V> innerDict;
+            if (dict.TryGetValue(outerKey, out Dictionary<K2, V> innerDict)){
-            
-            if (dict.TryGetValue(outerKey, out innerDict)){
                 return innerDict.TryGetValue(innerKey, out value);
             }
             else{

Core/Utils/WindowState.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Drawing;
-using System.Linq;
 using System.Windows.Forms;
+using TweetDuck.Core.Controls;
 
-namespace TweetDck.Core.Utils{
+namespace TweetDuck.Core.Utils{
     [Serializable]
     class WindowState{
         private Rectangle rect;
@@ -20,7 +20,7 @@ namespace TweetDck.Core.Utils{
                 form.WindowState = isMaximized ? FormWindowState.Maximized : FormWindowState.Normal;
             }
 
-            if ((rect == Rectangle.Empty && firstTimeFullscreen) || !Screen.AllScreens.Any(screen => screen.WorkingArea.IntersectsWith(form.Bounds))){
+            if ((rect == Rectangle.Empty && firstTimeFullscreen) || form.IsFullyOutsideView()){
                 form.DesktopBounds = Screen.PrimaryScreen.WorkingArea;
                 form.WindowState = FormWindowState.Maximized;
                 Save(form);

Core/Utils/WindowsUtils.cs

@@ -6,8 +6,18 @@ using System.Text.RegularExpressions;
 using System.Threading;
 using System.Windows.Forms;
 
-namespace TweetDck.Core.Utils{
+namespace TweetDuck.Core.Utils{
     static class WindowsUtils{
+        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);
+
+        public static bool ShouldAvoidToolWindow { get; }
+
+        static WindowsUtils(){
+            Version ver = Environment.OSVersion.Version;
+            ShouldAvoidToolWindow = ver.Major == 6 && ver.Minor == 2; // windows 8/10
+        }
+
         public static bool CheckFolderWritePermission(string path){
             string testFile = Path.Combine(path, ".test");
 
@@ -47,6 +57,21 @@ namespace TweetDck.Core.Utils{
             return false;
         }
 
+        public static void TryDeleteFolderWhenAble(string path, int timeout){
+            new Thread(() => {
+                TrySleepUntil(() => {
+                    try{
+                        Directory.Delete(path, true);
+                        return true;
+                    }catch(DirectoryNotFoundException){
+                        return true;
+                    }catch{
+                        return false;
+                    }
+                }, timeout, 500);
+            }).Start();
+        }
+
         public static void ClipboardStripHtmlStyles(){
             if (!Clipboard.ContainsText(TextDataFormat.Html)){
                 return;
@@ -55,10 +80,10 @@ namespace TweetDck.Core.Utils{
             string originalText = Clipboard.GetText(TextDataFormat.UnicodeText);
             string originalHtml = Clipboard.GetText(TextDataFormat.Html);
 
-            string updatedHtml = ClipboardRegexes.RegexStripHtmlStyles.Replace(originalHtml, string.Empty);
+            string updatedHtml = RegexStripHtmlStyles.Value.Replace(originalHtml, string.Empty);
 
             int removed = originalHtml.Length-updatedHtml.Length;
-            updatedHtml = ClipboardRegexes.RegexOffsetClipboardHtml.Replace(updatedHtml, match => (int.Parse(match.Value)-removed).ToString().PadLeft(match.Value.Length, '0'));
+            updatedHtml = RegexOffsetClipboardHtml.Value.Replace(updatedHtml, match => (int.Parse(match.Value)-removed).ToString().PadLeft(match.Value.Length, '0'));
 
             DataObject obj = new DataObject();
             obj.SetText(originalText, TextDataFormat.UnicodeText);
@@ -83,10 +108,5 @@ namespace TweetDck.Core.Utils{
                 Program.Reporter.HandleException("Clipboard Error", Program.BrandName+" could not access the clipboard as it is currently used by another process.", true, e);
             }
         }
-
-        private static class ClipboardRegexes{ // delays construction of regular expressions until needed
-            public static readonly Regex RegexStripHtmlStyles = new Regex(@"\s?(?:style|class)="".*?""");
-            public static readonly Regex RegexOffsetClipboardHtml = new Regex(@"(?<=EndHTML:|EndFragment:)(\d+)");
-        }
     }
 }

Plugins/Controls/PluginControl.Designer.cs

@@ -1,4 +1,4 @@
-namespace TweetDck.Plugins.Controls {
+namespace TweetDuck.Plugins.Controls {
     partial class PluginControl {
         /// <summary> 
         /// Required designer variable.
@@ -32,6 +32,7 @@
             this.labelWebsite = new System.Windows.Forms.Label();
             this.labelVersion = new System.Windows.Forms.Label();
             this.btnOpenConfig = new System.Windows.Forms.Button();
+            this.labelType = new TweetDuck.Core.Controls.LabelVertical();
             this.panelDescription.SuspendLayout();
             this.flowLayoutInfo.SuspendLayout();
             this.SuspendLayout();
@@ -39,7 +40,7 @@
             // 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(459, 80);
+            this.btnToggleState.Location = new System.Drawing.Point(456, 80);
             this.btnToggleState.Name = "btnToggleState";
             this.btnToggleState.Size = new System.Drawing.Size(65, 23);
             this.btnToggleState.TabIndex = 5;
@@ -51,7 +52,7 @@
             // 
             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.Location = new System.Drawing.Point(7, 7);
+            this.labelName.Location = new System.Drawing.Point(24, 7);
             this.labelName.Name = "labelName";
             this.labelName.Size = new System.Drawing.Size(61, 24);
             this.labelName.TabIndex = 0;
@@ -65,9 +66,9 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.panelDescription.AutoScroll = true;
             this.panelDescription.Controls.Add(this.labelDescription);
-            this.panelDescription.Location = new System.Drawing.Point(11, 35);
+            this.panelDescription.Location = new System.Drawing.Point(28, 35);
             this.panelDescription.Name = "panelDescription";
-            this.panelDescription.Size = new System.Drawing.Size(513, 39);
+            this.panelDescription.Size = new System.Drawing.Size(493, 39);
             this.panelDescription.TabIndex = 2;
             this.panelDescription.Resize += new System.EventHandler(this.panelDescription_Resize);
             // 
@@ -101,9 +102,9 @@
             | System.Windows.Forms.AnchorStyles.Right)));
             this.flowLayoutInfo.Controls.Add(this.labelAuthor);
             this.flowLayoutInfo.Controls.Add(this.labelWebsite);
-            this.flowLayoutInfo.Location = new System.Drawing.Point(11, 85);
+            this.flowLayoutInfo.Location = new System.Drawing.Point(28, 85);
             this.flowLayoutInfo.Name = "flowLayoutInfo";
-            this.flowLayoutInfo.Size = new System.Drawing.Size(368, 18);
+            this.flowLayoutInfo.Size = new System.Drawing.Size(348, 18);
             this.flowLayoutInfo.TabIndex = 3;
             this.flowLayoutInfo.WrapContents = false;
             // 
@@ -128,7 +129,7 @@
             this.labelVersion.Location = new System.Drawing.Point(14, 12);
             this.labelVersion.Margin = new System.Windows.Forms.Padding(3, 9, 3, 0);
             this.labelVersion.Name = "labelVersion";
-            this.labelVersion.Size = new System.Drawing.Size(513, 13);
+            this.labelVersion.Size = new System.Drawing.Size(510, 13);
             this.labelVersion.TabIndex = 1;
             this.labelVersion.Text = "Version";
             this.labelVersion.TextAlign = System.Drawing.ContentAlignment.TopRight;
@@ -137,7 +138,7 @@
             // btnOpenConfig
             // 
             this.btnOpenConfig.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnOpenConfig.Location = new System.Drawing.Point(385, 80);
+            this.btnOpenConfig.Location = new System.Drawing.Point(382, 80);
             this.btnOpenConfig.Name = "btnOpenConfig";
             this.btnOpenConfig.Size = new System.Drawing.Size(68, 23);
             this.btnOpenConfig.TabIndex = 4;
@@ -145,20 +146,34 @@
             this.btnOpenConfig.UseVisualStyleBackColor = true;
             this.btnOpenConfig.Click += new System.EventHandler(this.btnOpenConfig_Click);
             // 
+            // labelType
+            // 
+            this.labelType.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | 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.Location = new System.Drawing.Point(0, 0);
+            this.labelType.Name = "labelType";
+            this.labelType.Size = new System.Drawing.Size(18, 109);
+            this.labelType.TabIndex = 6;
+            this.labelType.Text = "TYPE";
+            // 
             // PluginControl
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.labelType);
             this.Controls.Add(this.btnOpenConfig);
             this.Controls.Add(this.flowLayoutInfo);
             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.MinimumSize = new System.Drawing.Size(0, 61);
             this.Name = "PluginControl";
-            this.Padding = new System.Windows.Forms.Padding(3);
+            this.Padding = new System.Windows.Forms.Padding(3, 3, 6, 3);
             this.Size = new System.Drawing.Size(530, 109);
             this.panelDescription.ResumeLayout(false);
             this.panelDescription.PerformLayout();
@@ -180,5 +195,6 @@
         private System.Windows.Forms.Label labelWebsite;
         private System.Windows.Forms.Label labelVersion;
         private System.Windows.Forms.Button btnOpenConfig;
+        private Core.Controls.LabelVertical labelType;
     }
 }

Plugins/Controls/PluginControl.cs

@@ -3,13 +3,17 @@ using System.Diagnostics;
 using System.Drawing;
 using System.IO;
 using System.Windows.Forms;
-using TweetDck.Core.Utils;
+using TweetDuck.Core.Controls;
+using TweetDuck.Core.Utils;
+using TweetDuck.Plugins.Enums;
 
-namespace TweetDck.Plugins.Controls{
+namespace TweetDuck.Plugins.Controls{
     partial class PluginControl : UserControl{
         private readonly PluginManager pluginManager;
         private readonly Plugin plugin;
 
+        private readonly float dpiScale;
+
         public PluginControl(){
             InitializeComponent();
         }
@@ -18,19 +22,23 @@ namespace TweetDck.Plugins.Controls{
             this.pluginManager = pluginManager;
             this.plugin = plugin;
 
+            this.dpiScale = this.GetDPIScale();
+
             this.labelName.Text = plugin.Name;
             this.labelDescription.Text = plugin.CanRun ? plugin.Description : "This plugin requires "+Program.BrandName+" "+plugin.RequiredVersion+" or newer.";
             this.labelVersion.Text = plugin.Version;
             this.labelAuthor.Text = plugin.Author;
             this.labelWebsite.Text = plugin.Website;
             
+            this.labelType.LineHeight = BrowserUtils.Scale(9, dpiScale);
+
             UpdatePluginState();
 
             if (labelDescription.Text.Length == 0){
                 labelDescription.Visible = false;
             }
 
-            panelDescription_Resize(panelDescription, new EventArgs());
+            panelDescription_Resize(panelDescription, null);
         }
 
         private void panelDescription_Resize(object sender, EventArgs e){
@@ -39,7 +47,7 @@ namespace TweetDck.Plugins.Controls{
             }
             else{
                 labelDescription.MaximumSize = new Size(panelDescription.Width-SystemInformation.VerticalScrollBarWidth, 0);
-                Height = Math.Min(MinimumSize.Height+9+labelDescription.Height, MaximumSize.Height);
+                Height = Math.Min(MinimumSize.Height+BrowserUtils.Scale(9, dpiScale)+labelDescription.Height, MaximumSize.Height);
             }
         }
 
@@ -61,13 +69,22 @@ namespace TweetDck.Plugins.Controls{
         }
 
         private void UpdatePluginState(){
-            bool isEnabled = plugin.CanRun && pluginManager.Config.IsEnabled(plugin);
+            bool isEnabled = pluginManager.Config.IsEnabled(plugin) && plugin.CanRun;
             Color textColor = isEnabled ? Color.Black : Color.FromArgb(90, 90, 90);
             
             labelVersion.ForeColor = textColor;
             labelAuthor.ForeColor = textColor;
             labelWebsite.ForeColor = isEnabled ? Color.Blue : Color.FromArgb(90, 90, 249);
 
+            if (plugin.Group == PluginGroup.Official){
+                labelType.Text = "OFFICIAL";
+                labelType.BackColor = isEnabled ? Color.FromArgb(154, 195, 217) : Color.FromArgb(185, 185, 185);
+            }
+            else{
+                labelType.Text = "CUSTOM";
+                labelType.BackColor = isEnabled ? Color.FromArgb(208, 154, 217) : Color.FromArgb(185, 185, 185);
+            }
+
             if (plugin.CanRun){
                 labelName.ForeColor = textColor;
                 labelDescription.ForeColor = textColor;

Plugins/Controls/PluginListFlowLayout.cs

@@ -1,7 +1,7 @@
 using System.Windows.Forms;
-using TweetDck.Core.Utils;
+using TweetDuck.Core.Utils;
 
-namespace TweetDck.Plugins.Controls{
+namespace TweetDuck.Plugins.Controls{
     sealed class PluginListFlowLayout : FlowLayoutPanel{
         public PluginListFlowLayout(){
             FlowDirection = FlowDirection.TopDown;

Plugins/Enums/PluginEnvironment.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace TweetDck.Plugins.Enums{
+namespace TweetDuck.Plugins.Enums{
     [Flags]
     enum PluginEnvironment{
         None = 0,

Plugins/Enums/PluginFolder.cs

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

Plugins/Enums/PluginGroup.cs

@@ -1,4 +1,4 @@
-namespace TweetDck.Plugins.Enums{
+namespace TweetDuck.Plugins.Enums{
     enum PluginGroup{
         Official, Custom
     }

Plugins/Events/PluginChangedStateEventArgs.cs

@@ -1,9 +1,9 @@
 using System;
 
-namespace TweetDck.Plugins.Events{
+namespace TweetDuck.Plugins.Events{
     class PluginChangedStateEventArgs : EventArgs{
-        public Plugin Plugin { get; private set; }
+        public Plugin Plugin { get; }
-        public bool IsEnabled { get; private set; }
+        public bool IsEnabled { get; }
 
         public PluginChangedStateEventArgs(Plugin plugin, bool isEnabled){
             this.Plugin = plugin;

Plugins/Events/PluginErrorEventArgs.cs

@@ -1,13 +1,9 @@
 using System;
 using System.Collections.Generic;
 
-namespace TweetDck.Plugins.Events{
+namespace TweetDuck.Plugins.Events{
     class PluginErrorEventArgs : EventArgs{
-        public bool HasErrors{
+        public bool HasErrors => Errors.Count > 0;
-            get{
-                return Errors.Count > 0;
-            }
-        }
 
         public IList<string> Errors;
 

Plugins/Plugin.cs

@@ -3,55 +3,45 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
-using TweetDck.Plugins.Enums;
+using TweetDuck.Plugins.Enums;
 
-namespace TweetDck.Plugins{
+namespace TweetDuck.Plugins{
     class Plugin{
-        public string Identifier { get { return identifier; } }
+        public string Identifier { get; }
-        public string Name { get { return metadata["NAME"]; } }
+        public PluginGroup Group { get; }
-        public string Description { get { return metadata["DESCRIPTION"]; } }
-        public string Author { get { return metadata["AUTHOR"]; } }
-        public string Version { get { return metadata["VERSION"]; } }
-        public string Website { get { return metadata["WEBSITE"]; } }
-        public string ConfigFile { get { return metadata["CONFIGFILE"]; } }
-        public string ConfigDefault { get { return metadata["CONFIGDEFAULT"]; } }
-        public string RequiredVersion { get { return metadata["REQUIRES"]; } }
-        public PluginGroup Group { get; private set; }
         public PluginEnvironment Environments { get; private set; }
 
+        public string Name => metadata["NAME"];
+        public string Description => metadata["DESCRIPTION"];
+        public string Author => metadata["AUTHOR"];
+        public string Version => metadata["VERSION"];
+        public string Website => metadata["WEBSITE"];
+        public string ConfigFile => metadata["CONFIGFILE"];
+        public string ConfigDefault => metadata["CONFIGDEFAULT"];
+        public string RequiredVersion => metadata["REQUIRES"];
+
         public bool CanRun{
-            get{
+            get => canRun ?? (canRun = CheckRequiredVersion(RequiredVersion)).Value;
-                return canRun ?? (canRun = CheckRequiredVersion(RequiredVersion)).Value;
-            }
         }
 
         public bool HasConfig{
-            get{
+            get => ConfigFile.Length > 0 && GetFullPathIfSafe(PluginFolder.Data, ConfigFile).Length > 0;
-                return ConfigFile.Length > 0 && GetFullPathIfSafe(PluginFolder.Data, ConfigFile).Length > 0;
-            }
         }
 
         public string ConfigPath{
-            get{
+            get => HasConfig ? Path.Combine(GetPluginFolder(PluginFolder.Data), ConfigFile) : string.Empty;
-                return HasConfig ? Path.Combine(GetPluginFolder(PluginFolder.Data), ConfigFile) : string.Empty;
-            }
         }
 
         public bool HasDefaultConfig{
-            get{
+            get => ConfigDefault.Length > 0 && GetFullPathIfSafe(PluginFolder.Root, ConfigDefault).Length > 0;
-                return ConfigDefault.Length > 0 && GetFullPathIfSafe(PluginFolder.Root, ConfigDefault).Length > 0;
-            }
         }
 
         public string DefaultConfigPath{
-            get{
+            get => HasDefaultConfig ? Path.Combine(GetPluginFolder(PluginFolder.Root), ConfigDefault) : string.Empty;
-                return HasDefaultConfig ? Path.Combine(GetPluginFolder(PluginFolder.Root), ConfigDefault) : string.Empty;
-            }
         }
 
         private readonly string pathRoot;
         private readonly string pathData;
-        private readonly string identifier;
         private readonly Dictionary<string, string> metadata = new Dictionary<string, string>(4){
             { "NAME", "" },
             { "DESCRIPTION", "" },
@@ -72,7 +62,7 @@ namespace TweetDck.Plugins{
             this.pathRoot = path;
             this.pathData = Path.Combine(Program.PluginDataPath, group.GetIdentifierPrefix(), name);
 
-            this.identifier = group.GetIdentifierPrefix()+name;
+            this.Identifier = group.GetIdentifierPrefix()+name;
             this.Group = group;
             this.Environments = PluginEnvironment.None;
         }
@@ -83,27 +73,11 @@ namespace TweetDck.Plugins{
             if (configPath.Length > 0 && defaultConfigPath.Length > 0 && !File.Exists(configPath) && File.Exists(defaultConfigPath)){
                 string dataFolder = GetPluginFolder(PluginFolder.Data);
 
-                if (!Directory.Exists(dataFolder)){ // config migration
-                    string originalFile = Path.Combine(GetPluginFolder(PluginFolder.Root), ConfigFile);
-
-                    if (File.Exists(originalFile)){
-                        try{
-                            Directory.CreateDirectory(dataFolder);
-                            File.Copy(originalFile, configPath, false);
-                            File.Delete(originalFile); // will fail without write perms in program folder, ignore if so
-                        }catch{
-                            // ignore
-                        }
-
-                        return;
-                    }
-                }
-
                 try{
                     Directory.CreateDirectory(dataFolder);
                     File.Copy(defaultConfigPath, configPath, false);
                 }catch(Exception e){
-                    Program.Reporter.HandleException("Plugin Loading Error", "Could not generate a configuration file for '"+identifier+"' plugin.", true, e);
+                    Program.Reporter.HandleException("Plugin Loading Error", "Could not generate a configuration file for '"+Identifier+"' plugin.", true, e);
                 }
             }
         }
@@ -154,12 +128,12 @@ namespace TweetDck.Plugins{
         }
 
         public override int GetHashCode(){
-            return identifier.GetHashCode();
+            return Identifier.GetHashCode();
         }
 
         public override bool Equals(object obj){
             Plugin plugin = obj as Plugin;
-            return plugin != null && plugin.identifier.Equals(identifier);
+            return plugin != null && plugin.Identifier.Equals(Identifier);
         }
 
         public static Plugin CreateFromFolder(string path, PluginGroup group, out string error){
@@ -236,9 +210,7 @@ namespace TweetDck.Plugins{
                 return false;
             }
 
-            Version ver;
+            if (plugin.RequiredVersion.Length == 0 || !(plugin.RequiredVersion.Equals("*") || System.Version.TryParse(plugin.RequiredVersion, out Version _))){
-
-            if (plugin.RequiredVersion.Length == 0 || !(plugin.RequiredVersion.Equals("*") || System.Version.TryParse(plugin.RequiredVersion, out ver))){
                 error = "Plugin contains invalid version: "+plugin.RequiredVersion;
                 return false;
             }

Plugins/PluginBridge.cs

@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
-using TweetDck.Core.Utils;
+using TweetDuck.Core.Utils;
-using TweetDck.Plugins.Enums;
+using TweetDuck.Plugins.Enums;
-using TweetDck.Plugins.Events;
+using TweetDuck.Plugins.Events;
 
-namespace TweetDck.Plugins{
+namespace TweetDuck.Plugins{
     class PluginBridge{
         private static string SanitizeCacheKey(string key){
             return key.Replace('\\', '/').Trim();
@@ -16,11 +16,7 @@ namespace TweetDck.Plugins{
         private readonly TwoKeyDictionary<int, string, string> fileCache = new TwoKeyDictionary<int, string, string>(4, 2);
         private readonly TwoKeyDictionary<int, string, InjectedHTML> notificationInjections = new TwoKeyDictionary<int,string,InjectedHTML>(4, 1);
 
-        public IEnumerable<InjectedHTML> NotificationInjections{
+        public IEnumerable<InjectedHTML> NotificationInjections => notificationInjections.InnerValues;
-            get{
-                return notificationInjections.InnerValues;
-            }
-        }
 
         public PluginBridge(PluginManager manager){
             this.manager = manager;
@@ -64,9 +60,7 @@ namespace TweetDck.Plugins{
         private string ReadFileUnsafe(int token, string cacheKey, string fullPath, bool readCached){
             cacheKey = SanitizeCacheKey(cacheKey);
             
-            string cachedContents;
+            if (readCached && fileCache.TryGetValue(token, cacheKey, out string cachedContents)){
-            
-            if (readCached && fileCache.TryGetValue(token, cacheKey, out cachedContents)){
                 return cachedContents;
             }
 

Plugins/PluginConfig.cs

@@ -1,41 +1,65 @@
 using System;
 using System.Collections.Generic;
-using TweetDck.Plugins.Events;
+using System.IO;
+using System.Text;
+using TweetDuck.Plugins.Events;
 
-namespace TweetDck.Plugins{
+namespace TweetDuck.Plugins{
-    [Serializable]
     sealed class PluginConfig{
-        [field:NonSerialized]
         public event EventHandler<PluginChangedStateEventArgs> InternalPluginChangedState; // should only be accessed from PluginManager
 
-        public IEnumerable<string> DisabledPlugins{
+        public IEnumerable<string> DisabledPlugins => Disabled;
-            get{
+        public bool AnyDisabled => Disabled.Count > 0;
-                return Disabled;
-            }
-        }
 
-        public bool AnyDisabled{
+        private readonly HashSet<string> Disabled = new HashSet<string>{
-            get{
+            "official/clear-columns",
-                return Disabled.Count > 0;
+            "official/reply-account"
-            }
+        };
-        }
-
-        private readonly HashSet<string> Disabled = new HashSet<string>();
 
         public void SetEnabled(Plugin plugin, bool enabled){
             if ((enabled && Disabled.Remove(plugin.Identifier)) || (!enabled && Disabled.Add(plugin.Identifier))){
-                if (InternalPluginChangedState != null){
+                InternalPluginChangedState?.Invoke(this, new PluginChangedStateEventArgs(plugin, enabled));
-                    InternalPluginChangedState(this, new PluginChangedStateEventArgs(plugin, enabled));
-                }
             }
         }
 
         public bool IsEnabled(Plugin plugin){
-            return !Disabled.Contains(plugin.Identifier) && plugin.CanRun;
+            return !Disabled.Contains(plugin.Identifier);
         }
 
-        public void DisableOfficialFromConfig(string pluginName){
+        public void Load(string file){
-            Disabled.Add("official/"+pluginName);
+            try{
+                using(FileStream stream = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read))
+                using(StreamReader reader = new StreamReader(stream, Encoding.UTF8)){
+                    string line = reader.ReadLine();
+
+                    if (line == "#Disabled"){
+                        Disabled.Clear();
+
+                        while((line = reader.ReadLine()) != null){
+                            Disabled.Add(line);
+                        }
+                    }
+                }
+            }catch(FileNotFoundException){
+            }catch(DirectoryNotFoundException){
+            }catch(Exception e){
+                Program.Reporter.HandleException("Plugin Configuration Error", "Could not read the plugin configuration file. If you continue, the list of disabled plugins will be reset to default.", true, e);
+            }
+        }
+
+        public void Save(string file){
+            try{
+                using(FileStream stream = new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.None))
+                using(StreamWriter writer = new StreamWriter(stream, Encoding.UTF8)){
+                    writer.WriteLine("#Disabled");
+
+                    foreach(string disabled in Disabled){
+                        writer.WriteLine(disabled);
+                    }
+                }
+            }catch(Exception e){
+                Program.Reporter.HandleException("Plugin Configuration Error", "Could not save the plugin configuration file.", true, e);
+            }
         }
     }
 }

Plugins/PluginManager.cs

@@ -1,13 +1,13 @@
-using System;
+using CefSharp;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using CefSharp;
+using TweetDuck.Plugins.Enums;
-using TweetDck.Plugins.Enums;
+using TweetDuck.Plugins.Events;
-using TweetDck.Plugins.Events;
+using TweetDuck.Resources;
-using TweetDck.Resources;
 
-namespace TweetDck.Plugins{
+namespace TweetDuck.Plugins{
     sealed class PluginManager{
         public const string PluginBrowserScriptFile = "plugins.browser.js";
         public const string PluginNotificationScriptFile = "plugins.notification.js";
@@ -15,64 +15,53 @@ namespace TweetDck.Plugins{
 
         private const int InvalidToken = 0;
 
-        public string PathOfficialPlugins { get { return Path.Combine(rootPath, "official"); } }
+        public string PathOfficialPlugins => Path.Combine(rootPath, "official");
-        public string PathCustomPlugins { get { return Path.Combine(rootPath, "user"); } }
+        public string PathCustomPlugins => Path.Combine(rootPath, "user");
 
-        public IEnumerable<Plugin> Plugins { get { return plugins; } }
+        public IEnumerable<Plugin> Plugins => plugins;
-        public PluginConfig Config { get; private set; }
+        public PluginConfig Config { get; }
-        public PluginBridge Bridge { get; private set; }
+        public PluginBridge Bridge { get; }
         
         public event EventHandler<PluginErrorEventArgs> Reloaded;
         public event EventHandler<PluginErrorEventArgs> Executed;
         public event EventHandler<PluginChangedStateEventArgs> PluginChangedState;
 
         private readonly string rootPath;
+        private readonly string configPath;
+
         private readonly HashSet<Plugin> plugins = new HashSet<Plugin>();
         private readonly Dictionary<int, Plugin> tokens = new Dictionary<int, Plugin>();
         private readonly Random rand = new Random();
 
         private List<string> loadErrors;
 
-        public PluginManager(string path, PluginConfig config){
+        public PluginManager(string rootPath, string configPath){
-            this.rootPath = path;
+            this.rootPath = rootPath;
-            this.SetConfig(config);
+            this.configPath = configPath;
+
+            this.Config = new PluginConfig();
             this.Bridge = new PluginBridge(this);
 
+            Config.Load(configPath);
+            
+            Config.InternalPluginChangedState += Config_InternalPluginChangedState;
             Program.UserConfigReplaced += Program_UserConfigReplaced;
         }
 
         private void Program_UserConfigReplaced(object sender, EventArgs e){
-            SetConfig(Program.UserConfig.Plugins);
+            Config.Load(configPath);
             Reload();
         }
 
         private void Config_InternalPluginChangedState(object sender, PluginChangedStateEventArgs e){
-            if (PluginChangedState != null){
+            PluginChangedState?.Invoke(this, e);
-                PluginChangedState(this, e);
+            Config.Save(configPath);
-            }
-        }
-
-        private void SetConfig(PluginConfig config){
-            if (this.Config != null){
-                this.Config.InternalPluginChangedState -= Config_InternalPluginChangedState;
-            }
-
-            this.Config = config;
-            this.Config.InternalPluginChangedState += Config_InternalPluginChangedState;
         }
 
         public bool IsPluginInstalled(string identifier){
             return plugins.Any(plugin => plugin.Identifier.Equals(identifier));
         }
 
-        public IEnumerable<Plugin> GetPluginsByGroup(PluginGroup group){
-            return plugins.Where(plugin => plugin.Group == group);
-        }
-
-        public int CountPluginByGroup(PluginGroup group){
-            return plugins.Count(plugin => plugin.Group == group);
-        }
-
         public bool HasAnyPlugin(PluginEnvironment environment){
             return plugins.Any(plugin => plugin.Environments.HasFlag(environment));
         }
@@ -88,8 +77,7 @@ namespace TweetDck.Plugins{
         }
 
         public Plugin GetPluginFromToken(int token){
-            Plugin plugin;
+            return tokens.TryGetValue(token, out Plugin plugin) ? plugin : null;
-            return tokens.TryGetValue(token, out plugin) ? plugin : null;
         }
 
         public void Reload(){
@@ -106,9 +94,7 @@ namespace TweetDck.Plugins{
                 plugins.Add(plugin);
             }
 
-            if (Reloaded != null){
+            Reloaded?.Invoke(this, new PluginErrorEventArgs(loadErrors));
-                Reloaded(this, new PluginErrorEventArgs(loadErrors));
-            }
         }
 
         public void ExecutePlugins(IFrame frame, PluginEnvironment environment, bool includeDisabled){
@@ -120,7 +106,7 @@ namespace TweetDck.Plugins{
 
             foreach(Plugin plugin in Plugins){
                 string path = plugin.GetScriptPath(environment);
-                if (string.IsNullOrEmpty(path) || !plugin.CanRun || (!includeDisabled && !Config.IsEnabled(plugin)))continue;
+                if (string.IsNullOrEmpty(path) || (!includeDisabled && !Config.IsEnabled(plugin)) || !plugin.CanRun)continue;
 
                 string script;
 
@@ -144,9 +130,7 @@ namespace TweetDck.Plugins{
                 ScriptLoader.ExecuteScript(frame, PluginScriptGenerator.GeneratePlugin(plugin.Identifier, script, token, environment), "plugin:"+plugin);
             }
 
-            if (Executed != null){
+            Executed?.Invoke(this, new PluginErrorEventArgs(failedPlugins));
-                Executed(this, new PluginErrorEventArgs(failedPlugins));
-            }
         }
 
         private IEnumerable<Plugin> LoadPluginsFrom(string path, PluginGroup group){
@@ -155,8 +139,7 @@ namespace TweetDck.Plugins{
             }
 
             foreach(string fullDir in Directory.EnumerateDirectories(path, "*", SearchOption.TopDirectoryOnly)){
-                string error;
+                Plugin plugin = Plugin.CreateFromFolder(fullDir, group, out string error);
-                Plugin plugin = Plugin.CreateFromFolder(fullDir, group, out error);
 
                 if (plugin == null){
                     loadErrors.Add(group.GetIdentifierPrefix()+Path.GetFileName(fullDir)+": "+error);

Plugins/PluginScriptGenerator.cs

@@ -1,29 +1,36 @@
-using System.Text;
+using System.Globalization;
-using TweetDck.Plugins.Enums;
+using TweetDuck.Plugins.Enums;
 
-namespace TweetDck.Plugins{
+namespace TweetDuck.Plugins{
     static class PluginScriptGenerator{
         public static string GenerateConfig(PluginConfig config){
             return config.AnyDisabled ? "window.TD_PLUGINS.disabled = [\""+string.Join("\",\"", config.DisabledPlugins)+"\"];" : string.Empty;
         }
 
         public static string GeneratePlugin(string pluginIdentifier, string pluginContents, int pluginToken, PluginEnvironment environment){
-            StringBuilder build = new StringBuilder(2*pluginIdentifier.Length+pluginContents.Length+165);
+            return PluginGen
-
+                .Replace("%params", environment.GetScriptVariables())
-            build.Append("(function(").Append(environment.GetScriptVariables()).Append("){");
+                .Replace("%id", pluginIdentifier)
-            
+                .Replace("%token", pluginToken.ToString(CultureInfo.InvariantCulture))
-            build.Append("let tmp={");
+                .Replace("%contents", pluginContents);
-            build.Append("id:\"").Append(pluginIdentifier).Append("\",");
-            build.Append("obj:new class extends PluginBase{").Append(pluginContents).Append("}");
-            build.Append("};");
-            
-            build.Append("tmp.obj.$id=\"").Append(pluginIdentifier).Append("\";");
-            build.Append("tmp.obj.$token=").Append(pluginToken).Append(";");
-            build.Append("window.TD_PLUGINS.install(tmp);");
-
-            build.Append("})(").Append(environment.GetScriptVariables()).Append(");");
-
-            return build.ToString();
         }
+
+        private const string PluginGen = "(function(%params,$d){let tmp={id:'%id',obj:new class extends PluginBase{%contents}};$d(tmp.obj,'$id',{value:'%id'});$d(tmp.obj,'$token',{value:%token});window.TD_PLUGINS.install(tmp);})(%params,Object.defineProperty);";
+
+/* PluginGen
+
+(function(%params, $i, $d){
+  let tmp = {
+    id: '%id',
+    obj: new class extends PluginBase{%contents}
+  };
+  
+  $d(tmp.obj, '$id', { value: '%id' });
+  $d(tmp.obj, '$token', { value: %token });
+  
+  window.TD_PLUGINS.install(tmp);
+})(%params, Object.defineProperty);
+
+*/
     }
 }

Program.cs

@@ -1,27 +1,27 @@
-using System;
+using CefSharp;
+using System;
 using System.Diagnostics;
 using System.IO;
-using System.Windows.Forms;
-using CefSharp;
-using TweetDck.Configuration;
-using TweetDck.Core;
-using TweetDck.Core.Utils;
 using System.Linq;
 using System.Threading;
-using TweetDck.Plugins;
+using System.Windows.Forms;
-using TweetDck.Plugins.Events;
+using TweetDuck.Configuration;
-using TweetDck.Core.Other.Settings.Export;
+using TweetDuck.Core;
-using TweetDck.Core.Handling;
+using TweetDuck.Core.Handling;
-using TweetDck.Core.Other;
+using TweetDuck.Core.Other;
-using TweetDck.Updates;
+using TweetDuck.Core.Other.Settings.Export;
+using TweetDuck.Core.Utils;
+using TweetDuck.Plugins;
+using TweetDuck.Plugins.Events;
+using TweetDuck.Updates;
 
-namespace TweetDck{
+namespace TweetDuck{
     static class Program{
         public const string BrandName = "TweetDuck";
         public const string Website = "https://tweetduck.chylex.com";
 
-        public const string VersionTag = "1.7.2";
+        public const string VersionTag = "1.8.1";
-        public const string VersionFull = "1.7.2.0";
+        public const string VersionFull = "1.8.1.0";
 
         public static readonly Version Version = new Version(VersionTag);
         public static readonly bool IsPortable = File.Exists("makeportable");
@@ -29,20 +29,26 @@ namespace TweetDck{
         public static readonly string ProgramPath = AppDomain.CurrentDomain.BaseDirectory;
         public static readonly string StoragePath = IsPortable ? Path.Combine(ProgramPath, "portable", "storage") : GetDataStoragePath();
 
-        public static readonly string PluginDataPath = Path.Combine(StoragePath, "TD_Plugins");
-        public static readonly string ConfigFilePath = Path.Combine(StoragePath, "TD_UserConfig.cfg");
-        private static readonly string ErrorLogFilePath = Path.Combine(StoragePath, "TD_Log.txt");
-        private static readonly string ConsoleLogFilePath = Path.Combine(StoragePath, "TD_Console.txt");
-        
         public static readonly string ScriptPath = Path.Combine(ProgramPath, "scripts");
         public static readonly string PluginPath = Path.Combine(ProgramPath, "plugins");
 
+        public static readonly string UserConfigFilePath = Path.Combine(StoragePath, "TD_UserConfig.cfg");
+        public static readonly string SystemConfigFilePath = Path.Combine(StoragePath, "TD_SystemConfig.cfg");
+        public static readonly string PluginConfigFilePath = Path.Combine(StoragePath, "TD_PluginConfig.cfg");
+
+        public static readonly string PluginDataPath = Path.Combine(StoragePath, "TD_Plugins");
+        private static readonly string InstallerPath = Path.Combine(StoragePath, "TD_Updates");
+
+        private static string ErrorLogFilePath => Path.Combine(StoragePath, "TD_Log.txt");
+        private static string ConsoleLogFilePath => Path.Combine(StoragePath, "TD_Console.txt");
+
         public static uint WindowRestoreMessage;
 
         private static readonly LockManager LockManager = new LockManager(Path.Combine(StoragePath, ".lock"));
         private static bool HasCleanedUp;
         
         public static UserConfig UserConfig { get; private set; }
+        public static SystemConfig SystemConfig { get; private set; }
         public static Reporter Reporter { get; private set; }
 
         public static event EventHandler UserConfigReplaced;
@@ -121,28 +127,33 @@ namespace TweetDck{
             }
 
             ReloadConfig();
+            SystemConfig = SystemConfig.Load(SystemConfigFilePath);
 
             if (Arguments.HasFlag(Arguments.ArgImportCookies)){
                 ExportManager.ImportCookies();
             }
 
+            if (Arguments.HasFlag(Arguments.ArgUpdated)){
+                WindowsUtils.TryDeleteFolderWhenAble(InstallerPath, 8000);
+            }
+            
             CefSharpSettings.WcfEnabled = false;
 
             CefSettings settings = new CefSettings{
                 AcceptLanguageList = BrowserUtils.HeaderAcceptLanguage,
                 UserAgent = BrowserUtils.HeaderUserAgent,
                 Locale = Arguments.GetValue(Arguments.ArgLocale, string.Empty),
+                BrowserSubprocessPath = BrandName+".Browser.exe",
                 CachePath = StoragePath,
                 LogFile = ConsoleLogFilePath,
                 #if !DEBUG
-                BrowserSubprocessPath = BrandName+".Browser.exe",
                 LogSeverity = Arguments.HasFlag(Arguments.ArgLogging) ? LogSeverity.Info : LogSeverity.Disable
                 #endif
             };
 
             CommandLineArgsParser.ReadCefArguments(UserConfig.CustomCefArgs).ToDictionary(settings.CefCommandLineArgs);
 
-            if (!HardwareAcceleration.IsEnabled){
+            if (!SystemConfig.HardwareAcceleration){
                 settings.CefCommandLineArgs["disable-gpu"] = "1";
                 settings.CefCommandLineArgs["disable-gpu-vsync"] = "1";
             }
@@ -151,27 +162,30 @@ namespace TweetDck{
             settings.CefCommandLineArgs["disable-plugins-discovery"] = "1";
             settings.CefCommandLineArgs["enable-system-flash"] = "0";
             
+            Cef.EnableHighDPISupport();
             Cef.Initialize(settings, false, new BrowserProcessHandler());
 
             Application.ApplicationExit += (sender, args) => ExitCleanup();
 
-            PluginManager plugins = new PluginManager(PluginPath, UserConfig.Plugins);
+            PluginManager plugins = new PluginManager(PluginPath, PluginConfigFilePath);
             plugins.Reloaded += plugins_Reloaded;
             plugins.Executed += plugins_Executed;
             plugins.Reload();
 
-            FormBrowser mainForm = new FormBrowser(plugins, new UpdaterSettings{
+            UpdaterSettings updaterSettings = new UpdaterSettings{
                 AllowPreReleases = Arguments.HasFlag(Arguments.ArgDebugUpdates),
-                DismissedUpdate = UserConfig.DismissedUpdate
+                DismissedUpdate = UserConfig.DismissedUpdate,
-            });
+                InstallerDownloadFolder = InstallerPath
+            };
 
+            FormBrowser mainForm = new FormBrowser(plugins, updaterSettings);
             Application.Run(mainForm);
 
             if (mainForm.UpdateInstallerPath != null){
                 ExitCleanup();
 
                 // ProgramPath has a trailing backslash
-                string updaterArgs = "/SP- /SILENT /CLOSEAPPLICATIONS /UPDATEPATH=\""+ProgramPath+"\" /RUNARGS=\""+Arguments.GetCurrentClean().ToString().Replace("\"", "^\"")+"\""+(IsPortable ? " /PORTABLE=1" : "");
+                string updaterArgs = "/SP- /SILENT /CLOSEAPPLICATIONS /UPDATEPATH=\""+ProgramPath+"\" /RUNARGS=\""+Arguments.GetCurrentForInstallerCmd()+"\""+(IsPortable ? " /PORTABLE=1" : "");
                 bool runElevated = !IsPortable || !WindowsUtils.CheckFolderWritePermission(ProgramPath);
 
                 WindowsUtils.StartProcess(mainForm.UpdateInstallerPath, updaterArgs, runElevated);
@@ -212,30 +226,23 @@ namespace TweetDck{
         }
 
         public static void ReloadConfig(){
-            UserConfig = UserConfig.Load(ConfigFilePath);
+            UserConfig = UserConfig.Load(UserConfigFilePath);
-
+            UserConfigReplaced?.Invoke(UserConfig, new EventArgs());
-            if (UserConfigReplaced != null){
-                UserConfigReplaced(UserConfig, new EventArgs());
-            }
         }
 
         public static void ResetConfig(){
             try{
-                File.Delete(ConfigFilePath);
+                File.Delete(UserConfigFilePath);
-                File.Delete(UserConfig.GetBackupFile(ConfigFilePath));
+                File.Delete(UserConfig.GetBackupFile(UserConfigFilePath));
             }catch(Exception e){
-                Reporter.HandleException("Configuration Reset Error", "Could not delete configuration files to reset the settings.", true, e);
+                Reporter.HandleException("Configuration Reset Error", "Could not delete configuration files to reset the options.", true, e);
                 return;
             }
 
             ReloadConfig();
         }
 
-        public static void Restart(){
+        public static void Restart(params string[] extraArgs){
-            Restart(new string[0]);
-        }
-
-        public static void Restart(string[] extraArgs){
             CommandLineArgs args = Arguments.GetCurrentClean();
             CommandLineArgs.ReadStringArray('-', extraArgs, args);
             RestartWithArgs(args);

Properties/AssemblyInfo.cs

@@ -1,8 +1,8 @@
 using System;
 using System.Reflection;
-using System.Runtime.InteropServices;
 using System.Resources;
-using TweetDck;
+using System.Runtime.InteropServices;
+using TweetDuck;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -37,9 +37,9 @@ using TweetDck;
 [assembly: AssemblyVersion(Program.VersionFull)]
 [assembly: AssemblyFileVersion(Program.VersionFull)]
 
-[assembly: NeutralResourcesLanguageAttribute("en")]
+[assembly: NeutralResourcesLanguage("en")]
 
-[assembly: CLSCompliant(false)]
+[assembly: CLSCompliant(true)]
 
 #if DEBUG
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("UnitTests")]

Properties/Resources.Designer.cs

@@ -8,7 +8,7 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace TweetDck.Properties {
+namespace TweetDuck.Properties {
     using System;
     
     
@@ -39,7 +39,7 @@ namespace TweetDck.Properties {
         internal static global::System.Resources.ResourceManager ResourceManager {
             get {
                 if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TweetDck.Properties.Resources", typeof(Resources).Assembly);
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TweetDuck.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;

README.md

@@ -1,8 +1,8 @@
 # Build Instructions
 
-The program was build using Visual Studio 2013. After opening the solution, make sure you have **CefSharp.WinForms** and **Microsoft.VC120.CRT.JetBrains** included - if not, download them using NuGet.
+The program was built using Visual Studio 2017. After opening the solution, make sure you have **CefSharp.WinForms** and **Microsoft.VC120.CRT.JetBrains** included - if not, download them using NuGet.
 ```
-PM> Install-Package CefSharp.WinForms -Version 57.0.0-pre01
+PM> Install-Package CefSharp.WinForms -Version 57.0.0
 PM> Install-Package Microsoft.VC120.CRT.JetBrains
 ```
 

Reporter.cs

@@ -5,9 +5,9 @@ using System.Globalization;
 using System.IO;
 using System.Text;
 using System.Windows.Forms;
-using TweetDck.Core.Other;
+using TweetDuck.Core.Other;
 
-namespace TweetDck{
+namespace TweetDuck{
     class Reporter{
         private readonly string logFile;
 
@@ -46,7 +46,7 @@ namespace TweetDck{
         public void HandleException(string caption, string message, bool canIgnore, Exception e){
             bool loggedSuccessfully = Log(e.ToString());
 
-            FormMessage form = new FormMessage(caption, message+"\r\nError: "+e.Message, canIgnore ? MessageBoxIcon.Warning : MessageBoxIcon.Error);
+            FormMessage form = new FormMessage(caption, message+Environment.NewLine+"Error: "+e.Message, canIgnore ? MessageBoxIcon.Warning : MessageBoxIcon.Error);
             
             Button btnExit = form.AddButton("Exit");
             Button btnIgnore = form.AddButton("Ignore", DialogResult.Ignore);
@@ -59,9 +59,9 @@ namespace TweetDck{
                 Anchor = AnchorStyles.Bottom | AnchorStyles.Left,
                 Enabled = loggedSuccessfully,
                 Font = SystemFonts.MessageBoxFont,
-                Location = new Point(6, 12),
+                Location = new Point(9, 12),
                 Margin = new Padding(0, 0, 48, 0),
-                Size = new Size(88, 26),
+                Size = new Size(106, 26),
                 Text = "Show Error Log",
                 UseVisualStyleBackColor = true
             };

Resources/Plugins/.debug/browser.js

@@ -8,7 +8,7 @@ enabled(){
     
     if (e.keyCode === 115){
       this.isDebugging = !this.isDebugging;
-      $(".app-title").first().css("background-color", this.isDebugging ? "#5A6B75" : "#292F33");
+      $(".nav-user-info").first().css("background-color", this.isDebugging ? "#5A6B75" : "#292F33");
     }
     
     // Debug mode handling

Resources/Plugins/clear-columns/.meta

@@ -3,7 +3,7 @@ Clear columns
 
 [description]
 - Adds buttons and keyboard shortcuts to quickly clear columns
-- Hold Shift when clicking or using a keyboard shortcut to reset the column instead
+- Hold Shift when clicking or using a keyboard shortcut to restore the column instead
 
 [author]
 chylex

Resources/Plugins/clear-columns/browser.js

@@ -38,7 +38,7 @@ enabled(){
         $(document).off("mousemove", this.eventKeyUp);
       }
       
-      $("#clear-columns-btn-all").text(pressed ? "Reset all" : "Clear all");
+      $("#clear-columns-btn-all").text(pressed ? "Restore columns" : "Clear columns");
     }
   };
   
@@ -84,7 +84,7 @@ enabled(){
   replaceMustache("column/column_header.mustache", "</header>", [
     '{{^isTemporary}}',
     '<a class="column-header-link" href="#" data-action="td-clearcolumns-dosingle" style="right:34px">',
-    '<i class="icon icon-clear-timeline"></i>',
+    '<i class="icon icon-clear-timeline js-show-tip" data-placement="bottom" data-original-title="Clear column (hold Shift to restore)"></i>',
     '</a>',
     '{{/isTemporary}}',
     '</header>'
@@ -94,7 +94,7 @@ enabled(){
     '<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',
+    '<span class="text-like-keyboard-key">Alt</span> + <span class="text-like-keyboard-key">Del</span> Clear all columns',
     '</dd></dl><dl'
   ].join(""));
   
@@ -116,11 +116,18 @@ ready(){
   
   // add clear all button
   $("nav.app-navigator").first().append([
-    '<a class="link-clean cf app-nav-link padding-h--10" data-title="Clear all" data-action="td-clearcolumns-doall">',
+    '<a id="clear-columns-btn-all-parent" 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="clear-columns-btn-all" class="nbfc padding-ts hide-condensed txt-size--16">Clear all</div>',
+    '<div id="clear-columns-btn-all" class="nbfc padding-ts hide-condensed txt-size--16">Clear columns</div>',
     '</a></nav>'
   ].join(""));
+  
+  // 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").on("mouseover", tooltipEvents.mouseover[0].handler).on("mouseout", tooltipEvents.mouseout[0].handler);
+  }
 }
 
 disabled(){