Release 1.7

Closes #114

.gitignore

@@ -1,6 +1,12 @@
 ## Ignore Visual Studio temporary files, build results, and
 ## files generated by popular Visual Studio add-ons.
 
+# TweetDuck installer builds
+bld/*
+!bld/*.iss
+!bld/*.bat
+!bld/Resources
+
 # User-specific files
 *.suo
 *.user
@@ -19,16 +25,9 @@ x64/
 x86/
 [Bb]in/
 [Oo]bj/
-bld/*
-!bld/gen_full.iss
-!bld/gen_port.iss
-!bld/gen_upd.iss
-!bld/Resources
 
 # Visual Studio 2015 cache/options directory
 .vs/
-# Uncomment if you have tasks that create the project's static files in wwwroot
-#wwwroot/
 
 # MSTest test Results
 [Tt]est[Rr]esult*/
@@ -38,11 +37,6 @@ bld/*
 *.VisualState.xml
 TestResult.xml
 
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-
 # DNX
 project.lock.json
 artifacts/
@@ -71,27 +65,12 @@ artifacts/
 *.svclog
 *.scc
 
-# Chutzpah Test files
-_Chutzpah*
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opendb
-*.opensdf
-*.sdf
-*.cachefile
-
 # Visual Studio profiler
 *.psess
 *.vsp
 *.vspx
 *.sap
 
-# TFS 2012 Local Workspace
-$tf/
-
 # Guidance Automation Toolkit
 *.gpState
 
@@ -118,33 +97,9 @@ nCrunchTemp_*
 *.mm.*
 AutoTest.Net/
 
-# Web workbench (sass)
-.sass-cache/
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
 # Click-Once directory
 publish/
 
-# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-# TODO: Comment the next line if you want to checkin your web deploy settings 
-# but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
-*.publishproj
-
 # NuGet Packages
 *.nupkg
 # The packages folder can be ignored because of Package Restore
@@ -157,17 +112,6 @@ publish/
 *.nuget.props
 *.nuget.targets
 
-# Microsoft Azure Build Output
-csx/
-*.build.csdef
-
-# Microsoft Azure Emulator
-ecf/
-rcf/
-
-# Microsoft Azure ApplicationInsights config file
-ApplicationInsights.config
-
 # Windows Store app package directory
 AppPackages/
 BundleArtifacts/
@@ -189,9 +133,6 @@ ClientBin/
 node_modules/
 orleans.codegen.cs
 
-# RIA/Silverlight projects
-Generated_Code/
-
 # Backup & report files from converting an old project file
 # to a newer Visual Studio version. Backup files are not needed,
 # because we have git ;-)
@@ -200,40 +141,3 @@ Backup*/
 UpgradeLog*.XML
 UpgradeLog*.htm
 
-# SQL Server files
-*.mdf
-*.ldf
-
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
-
-# Microsoft Fakes
-FakesAssemblies/
-
-# GhostDoc plugin setting file
-*.GhostDoc.xml
-
-# Node.js Tools for Visual Studio
-.ntvs_analysis.dat
-
-# Visual Studio 6 build log
-*.plg
-
-# Visual Studio 6 workspace options file
-*.opt
-
-# Visual Studio LightSwitch build output
-**/*.HTMLClient/GeneratedArtifacts
-**/*.DesktopClient/GeneratedArtifacts
-**/*.DesktopClient/ModelManifest.xml
-**/*.Server/GeneratedArtifacts
-**/*.Server/ModelManifest.xml
-_Pvt_Extensions
-
-# Paket dependency manager
-.paket/paket.exe
-
-# FAKE - F# Make
-.fake/

Configuration/Arguments.cs

@@ -0,0 +1,34 @@
+using System;
+using TweetDck.Core.Utils;
+
+namespace TweetDck.Configuration{
+    static class Arguments{
+        // public args
+        public const string ArgDataFolder = "-datafolder";
+        public const string ArgLocale = "-locale";
+        public const string ArgLogging = "-log";
+        public const string ArgDebugUpdates = "-debugupdates";
+
+        // internal args
+        public const string ArgRestart = "-restart";
+        public const string ArgImportCookies = "-importcookies";
+
+        // class data and methods
+        private static readonly CommandLineArgs Current = CommandLineArgs.FromStringArray('-', Environment.GetCommandLineArgs());
+
+        public static bool HasFlag(string flag){
+            return Current.HasFlag(flag);
+        }
+
+        public static string GetValue(string key, string defaultValue){
+            return Current.GetValue(key, defaultValue);
+        }
+
+        public static CommandLineArgs GetCurrentClean(){
+            CommandLineArgs args = Current.Clone();
+            args.RemoveFlag(ArgRestart);
+            args.RemoveFlag(ArgImportCookies);
+            return args;
+        }
+    }
+}

Configuration/LockManager.cs

@@ -1,7 +1,8 @@
 using System;
+using System.ComponentModel;
 using System.Diagnostics;
 using System.IO;
-using System.Threading;
+using TweetDck.Core.Utils;
 
 namespace TweetDck.Configuration{
     sealed class LockManager{
@@ -114,13 +115,16 @@ namespace TweetDck.Configuration{
             return result;
         }
 
-        public bool CloseLockingProcess(int timeout){
+        public bool CloseLockingProcess(int closeTimeout, int killTimeout){
             if (LockingProcess != null){
-                LockingProcess.CloseMainWindow();
+                try{
+                    if (LockingProcess.CloseMainWindow()){
+                        WindowsUtils.TrySleepUntil(CheckLockingProcessExited, closeTimeout, 250);
+                    }
 
-                for(int waited = 0; waited < timeout && !LockingProcess.HasExited; waited += 250){
-                    LockingProcess.Refresh();
-                    Thread.Sleep(250);
+                    if (!LockingProcess.HasExited){
+                        LockingProcess.Kill();
+                        WindowsUtils.TrySleepUntil(CheckLockingProcessExited, killTimeout, 250);
                     }
 
                     if (LockingProcess.HasExited){
@@ -128,11 +132,28 @@ namespace TweetDck.Configuration{
                         LockingProcess = null;
                         return true;
                     }
+                }catch(Exception ex){
+                    if (ex is InvalidOperationException || ex is Win32Exception){
+                        if (LockingProcess != null){
+                            LockingProcess.Refresh();
+
+                            bool hasExited = LockingProcess.HasExited;
+                            LockingProcess.Dispose();
+                            return hasExited;
+                        }
+                    }
+                    else throw;
+                }
             }
 
             return false;
         }
 
+        private bool CheckLockingProcessExited(){
+            LockingProcess.Refresh();
+            return LockingProcess.HasExited;
+        }
+
         // Utility functions
 
         private static void WriteIntToStream(Stream stream, int value){

Configuration/UserConfig.cs

@@ -12,20 +12,22 @@ using TweetDck.Plugins;
 namespace TweetDck.Configuration{
     [Serializable]
     sealed class UserConfig{
-        private static readonly IFormatter Formatter = new BinaryFormatter{ Binder = new CustomBinder() };
+        private static readonly IFormatter Formatter = new BinaryFormatter();
 
-        private const int CurrentFileVersion = 6;
+        private const int CurrentFileVersion = 7;
 
         // START OF CONFIGURATION
 
         public WindowState BrowserWindow { get; set; }
         public bool DisplayNotificationTimer { get; set; }
         public bool NotificationTimerCountDown { get; set; }
+        public bool NotificationNonIntrusiveMode { 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 bool EnableSpellCheck { get; set; }
@@ -112,13 +114,13 @@ namespace TweetDck.Configuration{
 
             BrowserWindow = new WindowState();
             DisplayNotificationTimer = true;
+            NotificationNonIntrusiveMode = true;
             NotificationPosition = TweetNotification.Position.TopRight;
             CustomNotificationPosition = ControlExtensions.InvisibleLocation;
             NotificationEdgeDistance = 8;
             NotificationDurationValue = 25;
             EnableUpdateCheck = true;
             ExpandLinksOnHover = true;
-            ShowScreenshotBorder = true;
             EnableTrayHighlight = true;
             Plugins = new PluginConfig();
             PluginsWindow = new WindowState();
@@ -164,7 +166,11 @@ namespace TweetDck.Configuration{
             }
 
             if (fileVersion == 5){
-                ShowScreenshotBorder = true;
+                ++fileVersion;
+            }
+
+            if (fileVersion == 6){
+                NotificationNonIntrusiveMode = true;
                 ++fileVersion;
             }
 
@@ -238,15 +244,5 @@ namespace TweetDck.Configuration{
         public static string GetBackupFile(string file){
             return file+".bak";
         }
-
-        private sealed class CustomBinder : SerializationBinder{
-            public override Type BindToType(string assemblyName, string typeName){
-                if (typeName == "TweetDck.Core.Handling.TweetNotification+Position"){
-                    return typeof(TweetNotification.Position);
-                }
-
-                return null;
-            }
-        }
     }
 }

Configuration/app.config

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2"/></startup></configuration>

Configuration/packages.config

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-  <package id="cef.redist.x64" version="3.2785.1486" targetFramework="net452" />
-  <package id="cef.redist.x86" version="3.2785.1486" targetFramework="net452" />
-  <package id="CefSharp.Common" version="53.0.1" targetFramework="net452" />
-  <package id="CefSharp.WinForms" version="53.0.1" targetFramework="net452" />
-  <package id="Microsoft.VC120.CRT.JetBrains" version="12.0.21005.2" targetFramework="net452" />
-</packages>

Core/Bridge/TweetDeckBridge.cs

@@ -19,21 +19,21 @@ namespace TweetDck.Core.Bridge{
         }
 
         private readonly FormBrowser form;
-        private readonly FormNotification notification;
+        private readonly FormNotificationMain notification;
 
-        public TweetDeckBridge(FormBrowser form, FormNotification notification){
+        public TweetDeckBridge(FormBrowser form, FormNotificationMain notification){
             this.form = form;
             this.notification = notification;
         }
 
         public void LoadFontSizeClass(string fsClass){
-            form.InvokeSafe(() => {
+            form.InvokeAsyncSafe(() => {
                TweetNotification.SetFontSizeClass(fsClass);
             });
         }
 
         public void LoadNotificationHeadContents(string headContents){
-            form.InvokeSafe(() => {
+            form.InvokeAsyncSafe(() => {
                TweetNotification.SetHeadTag(headContents); 
             });
         }
@@ -53,16 +53,12 @@ namespace TweetDck.Core.Bridge{
             notification.InvokeAsyncSafe(() => notification.CurrentQuotedTweetUrl = link);
         }
 
-        public void OpenSettingsMenu(){
-            form.InvokeAsyncSafe(form.OpenSettings);
-        }
-
-        public void OpenPluginsMenu(){
-            form.InvokeAsyncSafe(form.OpenPlugins);
+        public void OpenContextMenu(){
+            form.InvokeAsyncSafe(form.OpenContextMenu);
         }
 
         public void OnTweetPopup(string tweetHtml, string tweetUrl, int tweetCharacters){
-            notification.InvokeSafe(() => {
+            notification.InvokeAsyncSafe(() => {
                 form.OnTweetNotification();
                 notification.ShowNotification(new TweetNotification(tweetHtml, tweetUrl, tweetCharacters));
             });
@@ -85,7 +81,7 @@ namespace TweetDck.Core.Bridge{
         }
 
         public void LoadNextNotification(){
-            notification.InvokeAsyncSafe(notification.FinishCurrentTweet);
+            notification.InvokeAsyncSafe(notification.FinishCurrentNotification);
         }
 
         public void TryPasteImage(){
@@ -109,15 +105,7 @@ namespace TweetDck.Core.Bridge{
         }
 
         public void ClickUploadImage(int offsetX, int offsetY){
-            form.InvokeSafe(() => {
-                Point prevPos = Cursor.Position;
-
-                Cursor.Position = form.PointToScreen(new Point(offsetX, offsetY));
-                NativeMethods.SimulateMouseClick(NativeMethods.MouseButton.Left);
-                Cursor.Position = prevPos;
-
-                form.OnImagePastedFinish();
-            });
+            form.InvokeAsyncSafe(() => form.TriggerImageUpload(offsetX, offsetY));
         }
 
         public void ScreenshotTweet(string html, int width, int height){

Core/FormBrowser.Designer.cs

@@ -24,18 +24,15 @@
         /// </summary>
         private void InitializeComponent() {
             this.components = new System.ComponentModel.Container();
-            this.trayIcon = new TweetDck.Core.TrayIcon();
+            this.trayIcon = new TweetDck.Core.TrayIcon(this.components);
             this.toolTip = new System.Windows.Forms.ToolTip(this.components);
             this.SuspendLayout();
             // 
-            // trayIcon
-            // 
-            this.trayIcon.Visible = false;
-            // 
             // FormBrowser
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = TweetDck.Core.Utils.BrowserUtils.BackgroundColor;
             this.ClientSize = new System.Drawing.Size(324, 386);
             this.Icon = Properties.Resources.icon;
             this.Location = TweetDck.Core.Controls.ControlExtensions.InvisibleLocation;

Core/FormBrowser.cs

@@ -17,6 +17,8 @@ using TweetDck.Core.Bridge;
 using TweetDck.Core.Notification;
 using TweetDck.Core.Notification.Screenshot;
 using TweetDck.Updates.Events;
+using System.Diagnostics;
+using TweetDck.Core.Notification.Sound;
 
 namespace TweetDck.Core{
     sealed partial class FormBrowser : Form{
@@ -31,7 +33,8 @@ namespace TweetDck.Core{
         private readonly ChromiumWebBrowser browser;
         private readonly PluginManager plugins;
         private readonly UpdateHandler updates;
-        private readonly FormNotification notification;
+        private readonly FormNotificationTweet notification;
+        private readonly ContextMenu contextMenu;
 
         private FormSettings currentFormSettings;
         private FormAbout currentFormAbout;
@@ -41,7 +44,7 @@ namespace TweetDck.Core{
         private FormWindowState prevState;
 
         private TweetScreenshotManager notificationScreenshotManager;
-        private SoundNotification soundNotification;
+        private ISoundNotificationPlayer soundNotification;
 
         public FormBrowser(PluginManager pluginManager, UpdaterSettings updaterSettings){
             InitializeComponent();
@@ -52,12 +55,16 @@ namespace TweetDck.Core{
             this.plugins.Reloaded += plugins_Reloaded;
             this.plugins.PluginChangedState += plugins_PluginChangedState;
 
-            this.notification = CreateNotificationForm(NotificationFlags.AutoHide | NotificationFlags.TopMost);
+            this.contextMenu = ContextMenuBrowser.CreateMenu(this);
+
+            this.notification = new FormNotificationTweet(this, plugins){
                 #if DEBUG
-            this.notification.CanMoveWindow = () => (ModifierKeys & Keys.Alt) == Keys.Alt;
+                CanMoveWindow = () => (ModifierKeys & Keys.Alt) == Keys.Alt
                 #else
-            this.notification.CanMoveWindow = () => false;
+                CanMoveWindow = () => false
                 #endif
+            };
+
             this.notification.Show();
 
             this.browser = new ChromiumWebBrowser("https://tweetdeck.twitter.com/"){
@@ -71,17 +78,22 @@ namespace TweetDck.Core{
             this.browser.ConsoleMessage += BrowserUtils.HandleConsoleMessage;
             #endif
 
-            this.browser.LoadingStateChanged += Browser_LoadingStateChanged;
-            this.browser.FrameLoadEnd += Browser_FrameLoadEnd;
+            this.browser.LoadingStateChanged += browser_LoadingStateChanged;
+            this.browser.FrameLoadEnd += browser_FrameLoadEnd;
+            this.browser.LoadError += browser_LoadError;
             this.browser.RegisterAsyncJsObject("$TD", new TweetDeckBridge(this, notification));
             this.browser.RegisterAsyncJsObject("$TDP", plugins.Bridge);
             
+            browser.BrowserSettings.BackgroundColor = (uint)BrowserUtils.BackgroundColor.ToArgb();
+            browser.Dock = DockStyle.None;
+            browser.Location = ControlExtensions.InvisibleLocation;
             Controls.Add(browser);
 
             Controls.Add(new MenuStrip{ Visible = false }); // fixes Alt freezing the program in Win 10 Anniversary Update
 
             Disposed += (sender, args) => {
                 browser.Dispose();
+                contextMenu.Dispose();
 
                 if (notificationScreenshotManager != null){
                     notificationScreenshotManager.Dispose();
@@ -103,6 +115,8 @@ namespace TweetDck.Core{
             this.updates = new UpdateHandler(browser, this, updaterSettings);
             this.updates.UpdateAccepted += updates_UpdateAccepted;
             this.updates.UpdateDismissed += updates_UpdateDismissed;
+
+            RestoreWindow();
         }
 
         private void ShowChildForm(Form form){
@@ -117,11 +131,18 @@ namespace TweetDck.Core{
 
         // window setup
 
-        private void SetupWindow(){
+        private void RestoreWindow(){
             Config.BrowserWindow.Restore(this, true);
             prevState = WindowState;
+        }
+
+        private void OnLoaded(){
+            if (!isLoaded){
+                browser.Location = Point.Empty;
+                browser.Dock = DockStyle.Fill;
                 isLoaded = true;
             }
+        }
 
         private void UpdateTrayIcon(){
             trayIcon.Visible = Config.TrayBehavior.ShouldDisplayIcon();
@@ -129,29 +150,25 @@ namespace TweetDck.Core{
 
         // active event handlers
 
-        private void Browser_LoadingStateChanged(object sender, LoadingStateChangedEventArgs e){
+        private void browser_LoadingStateChanged(object sender, LoadingStateChangedEventArgs e){
             if (!e.IsLoading){
-                browser.AddWordToDictionary("tweetdeck");
-                browser.AddWordToDictionary("TweetDeck");
-                browser.AddWordToDictionary("tweetduck");
-                browser.AddWordToDictionary("TweetDuck");
-                browser.AddWordToDictionary("TD");
+                foreach(string word in BrowserUtils.DictionaryWords){
+                    browser.AddWordToDictionary(word);
+                }
 
-                Invoke(new Action(SetupWindow));
-                browser.LoadingStateChanged -= Browser_LoadingStateChanged;
+                BeginInvoke(new Action(OnLoaded));
+                browser.LoadingStateChanged -= browser_LoadingStateChanged;
             }
         }
 
-        private void Browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
+        private void browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
             if (e.Frame.IsMain && BrowserUtils.IsTweetDeckWebsite(e.Frame)){
+                e.Frame.ExecuteJavaScriptAsync(BrowserUtils.BackgroundColorFix);
+
                 UpdateProperties();
                 ScriptLoader.ExecuteFile(e.Frame, "code.js");
                 ReinjectCustomCSS(Config.CustomBrowserCSS);
 
-                #if DEBUG
-                ScriptLoader.ExecuteFile(e.Frame, "debug.js");
-                #endif
-
                 if (plugins.HasAnyPlugin(PluginEnvironment.Browser)){
                     ScriptLoader.ExecuteFile(e.Frame, PluginManager.PluginBrowserScriptFile);
                     ScriptLoader.ExecuteFile(e.Frame, PluginManager.PluginGlobalScriptFile);
@@ -162,6 +179,20 @@ namespace TweetDck.Core{
             }
         }
 
+        private void browser_LoadError(object sender, LoadErrorEventArgs e){
+            if (e.ErrorCode == CefErrorCode.Aborted){
+                return;
+            }
+
+            if (!e.FailedUrl.StartsWith("http://td/")){
+                string errorPage = ScriptLoader.LoadResource("pages/error.html", true);
+
+                if (errorPage != null){
+                    browser.LoadHtml(errorPage.Replace("{err}", BrowserUtils.GetErrorName(e.ErrorCode)), "http://td/error");
+                }
+            }
+        }
+
         private void FormBrowser_Activated(object sender, EventArgs e){
             if (!isLoaded)return;
 
@@ -208,33 +239,27 @@ namespace TweetDck.Core{
         }
 
         private void Config_TrayBehaviorChanged(object sender, EventArgs e){
-            if (!isLoaded)return;
-            
             UpdateTrayIcon();
         }
 
         private void trayIcon_ClickRestore(object sender, EventArgs e){
-            if (!isLoaded)return;
-
-            isLoaded = false;
             Show();
-            SetupWindow();
+            RestoreWindow();
             Activate();
             UpdateTrayIcon();
         }
 
         private void trayIcon_ClickClose(object sender, EventArgs e){
-            if (!isLoaded)return;
-
             ForceClose();
         }
         
-        private void plugins_Reloaded(object sender, PluginLoadEventArgs e){
-            ReloadBrowser();
+        private void plugins_Reloaded(object sender, PluginErrorEventArgs e){
+            browser.GetBrowser().Reload();
         }
 
         private void plugins_PluginChangedState(object sender, PluginChangedStateEventArgs e){
-            browser.ExecuteScriptAsync("window.TDPF_setPluginState", e.Plugin, e.IsEnabled ? 1 : 0); // ExecuteScriptAsync cannot handle boolean values as of yet
+            browser.ExecuteScriptAsync("window.TDPF_setPluginState", e.Plugin, e.IsEnabled);
+            Config.Save();
         }
 
         private void updates_UpdateAccepted(object sender, UpdateAcceptedEventArgs e){
@@ -243,6 +268,7 @@ namespace TweetDck.Core{
             FormUpdateDownload downloadForm = new FormUpdateDownload(e.UpdateInfo);
             downloadForm.MoveToCenter(this);
             downloadForm.ShowDialog();
+            downloadForm.Dispose();
 
             if (downloadForm.UpdateStatus == FormUpdateDownload.Status.Succeeded){
                 UpdateInstallerPath = downloadForm.InstallerPath;
@@ -261,9 +287,30 @@ namespace TweetDck.Core{
             Config.Save();
         }
 
+        private void soundNotification_PlaybackError(object sender, PlaybackErrorEventArgs e){
+            e.Ignore = true;
+
+            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");
+                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);
+                }
+            }
+        }
+
         protected override void WndProc(ref Message m){
             if (isLoaded && m.Msg == Program.WindowRestoreMessage){
+                using(Process process = Process.GetCurrentProcess()){
+                    if (process.Id == m.WParam.ToInt32()){
                         trayIcon_ClickRestore(trayIcon, new EventArgs());
+                    }
+                }
+
                 return;
             }
 
@@ -277,8 +324,8 @@ namespace TweetDck.Core{
 
         // notification helpers
 
-        public FormNotification CreateNotificationForm(NotificationFlags flags){
-            return new FormNotification(this, plugins, flags);
+        public FormNotificationMain CreateNotificationForm(bool enableContextMenu){
+            return new FormNotificationMain(this, plugins, enableContextMenu);
         }
 
         public void PauseNotification(){
@@ -299,8 +346,16 @@ namespace TweetDck.Core{
             browser.ExecuteScriptAsync(PropertyBridge.GenerateScript(properties));
         }
 
+        public void ReloadToTweetDeck(){
+            browser.ExecuteScriptAsync("window.location.href = 'https://tweetdeck.twitter.com'");
+        }
+
         // callback handlers
 
+        public void OpenContextMenu(){
+            contextMenu.Show(this, PointToClient(Cursor.Position));
+        }
+
         public void OpenSettings(){
             OpenSettings(0);
         }
@@ -318,10 +373,7 @@ namespace TweetDck.Core{
                     currentFormSettings = null;
 
                     if (!prevEnableUpdateCheck && Config.EnableUpdateCheck){
-                        updates.Settings.DismissedUpdate = string.Empty;
-                        Config.DismissedUpdate = string.Empty;
-                        Config.Save();
-
+                        updates.DismissUpdate(string.Empty);
                         updates.Check(false);
                     }
 
@@ -370,7 +422,8 @@ namespace TweetDck.Core{
             }
 
             if (soundNotification == null){
-                soundNotification = new SoundNotification(this);
+                soundNotification = SoundNotification.New();
+                soundNotification.PlaybackError += soundNotification_PlaybackError;
             }
 
             soundNotification.Play(Config.NotificationSoundPath);
@@ -399,16 +452,14 @@ namespace TweetDck.Core{
             browser.ExecuteScriptAsync("TDGF_tryPasteImage()");
         }
 
-        public void OnImagePastedFinish(){
-            browser.ExecuteScriptAsync("TDGF_tryPasteImageFinish()");
+        public void TriggerImageUpload(int offsetX, int offsetY){
+            IBrowserHost host = browser.GetBrowser().GetHost();
+            host.SendMouseClickEvent(offsetX, offsetY, MouseButtonType.Left, false, 1, CefEventFlags.None);
+            host.SendMouseClickEvent(offsetX, offsetY, MouseButtonType.Left, true, 1, CefEventFlags.None);
         }
 
         public void TriggerTweetScreenshot(){
             browser.ExecuteScriptAsync("TDGF_triggerScreenshot()");
         }
-
-        public void ReloadBrowser(){
-            browser.ExecuteScriptAsync("window.location.reload()");
-        }
     }
 }

Core/FormNotification.cs

@@ -1,443 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Drawing;
-using System.Windows.Forms;
-using CefSharp;
-using CefSharp.WinForms;
-using TweetDck.Configuration;
-using TweetDck.Core.Bridge;
-using TweetDck.Core.Handling;
-using TweetDck.Resources;
-using TweetDck.Core.Utils;
-using TweetDck.Plugins;
-using TweetDck.Plugins.Enums;
-using TweetDck.Core.Controls;
-using TweetDck.Core.Notification;
-
-namespace TweetDck.Core{
-    partial class FormNotification : Form{
-        private const string NotificationScriptFile = "notification.js";
-
-        private static readonly string NotificationScriptIdentifier = ScriptLoader.GetRootIdentifier(NotificationScriptFile);
-        private static readonly string PluginScriptIdentifier = ScriptLoader.GetRootIdentifier(PluginManager.PluginNotificationScriptFile);
-
-        public Func<bool> CanMoveWindow = () => true;
-
-        public bool IsNotificationVisible{
-            get{
-                return Location != ControlExtensions.InvisibleLocation;
-            }
-        }
-
-        public new Point Location{
-            get{
-                return base.Location;
-            }
-
-            set{
-                Visible = (base.Location = value) != ControlExtensions.InvisibleLocation;
-            }
-        }
-
-        private readonly Control owner;
-        private readonly PluginManager plugins;
-        protected readonly NotificationFlags flags;
-        protected readonly ChromiumWebBrowser browser;
-
-        private readonly Queue<TweetNotification> tweetQueue = new Queue<TweetNotification>(4);
-        private int timeLeft, totalTime;
-        
-        private readonly NativeMethods.HookProc mouseHookDelegate;
-        private IntPtr mouseHook;
-
-        private bool? prevDisplayTimer;
-        private int? prevFontSize;
-
-        private bool RequiresResize{
-            get{
-                return !prevDisplayTimer.HasValue || !prevFontSize.HasValue || prevDisplayTimer != Program.UserConfig.DisplayNotificationTimer || prevFontSize != TweetNotification.FontSizeLevel;
-            }
-
-            set{
-                if (value){
-                    prevDisplayTimer = null;
-                    prevFontSize = null;
-                }
-                else{
-                    prevDisplayTimer = Program.UserConfig.DisplayNotificationTimer;
-                    prevFontSize = TweetNotification.FontSizeLevel;
-                }
-            }
-        }
-
-        private readonly string notificationJS;
-        private readonly string pluginJS;
-
-        protected override bool ShowWithoutActivation{
-            get{
-                return true;
-            }
-        }
-
-        public bool FreezeTimer { get; set; }
-        public bool ContextMenuOpen { get; set; }
-        public string CurrentUrl { get; private set; }
-        public string CurrentQuotedTweetUrl { get; set; }
-
-        public EventHandler Initialized;
-
-        private int pauseCounter;
-        private bool pausedDuringNotification;
-
-        public bool IsPaused{
-            get{
-                return pauseCounter > 0;
-            }
-        }
-
-        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));
-            }
-        }
-
-        public FormNotification(FormBrowser owner, PluginManager pluginManager, NotificationFlags flags){
-            InitializeComponent();
-
-            this.owner = owner;
-            this.plugins = pluginManager;
-            this.flags = flags;
-
-            owner.FormClosed += (sender, args) => Close();
-
-            browser = new ChromiumWebBrowser("about:blank"){
-                MenuHandler = new ContextMenuNotification(this, !flags.HasFlag(NotificationFlags.DisableContextMenu)),
-                LifeSpanHandler = new LifeSpanHandler()
-            };
-
-            #if DEBUG
-            browser.ConsoleMessage += BrowserUtils.HandleConsoleMessage;
-            #endif
-
-            browser.IsBrowserInitializedChanged += Browser_IsBrowserInitializedChanged;
-            browser.LoadingStateChanged += Browser_LoadingStateChanged;
-            browser.FrameLoadEnd += Browser_FrameLoadEnd;
-
-            if (!flags.HasFlag(NotificationFlags.DisableScripts)){
-                notificationJS = ScriptLoader.LoadResource(NotificationScriptFile);
-                browser.RegisterAsyncJsObject("$TD", new TweetDeckBridge(owner, this));
-
-                if (plugins != null){
-                    pluginJS = ScriptLoader.LoadResource(PluginManager.PluginNotificationScriptFile);
-                    browser.RegisterAsyncJsObject("$TDP", plugins.Bridge);
-                }
-            }
-
-            panelBrowser.Controls.Add(browser);
-
-            if (flags.HasFlag(NotificationFlags.AutoHide)){
-                Program.UserConfig.MuteToggled += Config_MuteToggled;
-                Disposed += (sender, args) => Program.UserConfig.MuteToggled -= Config_MuteToggled;
-
-                if (Program.UserConfig.MuteNotifications){
-                    PauseNotification();
-                }
-            }
-
-            mouseHookDelegate = MouseHookProc;
-
-            Disposed += FormNotification_Disposed;
-        }
-
-        protected override void WndProc(ref Message m){
-            if (m.Msg == 0x0112 && (m.WParam.ToInt32() & 0xFFF0) == 0xF010 && !CanMoveWindow()){ // WM_SYSCOMMAND, SC_MOVE
-                return;
-            }
-
-            base.WndProc(ref m);
-        }
-
-        // mouse wheel hook
-
-        private void StartMouseHook(){
-            if (mouseHook == IntPtr.Zero){
-                mouseHook = NativeMethods.SetWindowsHookEx(NativeMethods.WH_MOUSE_LL, mouseHookDelegate, IntPtr.Zero, 0);
-            }
-        }
-
-        private void StopMouseHook(){
-            if (mouseHook != IntPtr.Zero){
-                NativeMethods.UnhookWindowsHookEx(mouseHook);
-                mouseHook = IntPtr.Zero;
-            }
-        }
-
-        private IntPtr MouseHookProc(int nCode, IntPtr wParam, IntPtr lParam){
-            if (!ContainsFocus && wParam.ToInt32() == NativeMethods.WH_MOUSEWHEEL && browser.Bounds.Contains(PointToClient(Cursor.Position))){
-                // fuck it, Activate() doesn't work with this
-                Point prevPos = Cursor.Position;
-                Cursor.Position = PointToScreen(new Point(0, -1));
-                NativeMethods.SimulateMouseClick(NativeMethods.MouseButton.Left);
-                Cursor.Position = prevPos;
-            }
-
-            return NativeMethods.CallNextHookEx(mouseHook, nCode, wParam, lParam);
-        }
-
-        // event handlers
-
-        private void timerDisplayDelay_Tick(object sender, EventArgs e){
-            OnNotificationReady();
-            timerDisplayDelay.Stop();
-        }
-
-        private void timerHideProgress_Tick(object sender, EventArgs e){
-            if (Bounds.Contains(Cursor.Position) || FreezeTimer || ContextMenuOpen)return;
-
-            timeLeft -= timerProgress.Interval;
-
-            int value = (int)Math.Round(1025.0*(totalTime-timeLeft)/totalTime);
-            progressBarTimer.SetValueInstant(Math.Min(1000, Math.Max(0, Program.UserConfig.NotificationTimerCountDown ? 1000-value : value)));
-
-            if (timeLeft <= 0){
-                FinishCurrentTweet();
-            }
-        }
-
-        private void Config_MuteToggled(object sender, EventArgs e){
-            if (Program.UserConfig.MuteNotifications){
-                PauseNotification();
-            }
-            else{
-                ResumeNotification();
-            }
-        }
-
-        private void Browser_IsBrowserInitializedChanged(object sender, IsBrowserInitializedChangedEventArgs e){
-            if (e.IsBrowserInitialized && Initialized != null){
-                Initialized(this, new EventArgs());
-            }
-        }
-
-        private void Browser_LoadingStateChanged(object sender, LoadingStateChangedEventArgs e){
-            if (!e.IsLoading && browser.Address != "about:blank" && !flags.HasFlag(NotificationFlags.ManualDisplay)){
-                this.InvokeSafe(() => {
-                    Visible = true; // ensures repaint before moving the window to a visible location
-                    timerDisplayDelay.Start();
-                });
-            }
-        }
-
-        private void Browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
-            if (e.Frame.IsMain && notificationJS != null && browser.Address != "about:blank" && !flags.HasFlag(NotificationFlags.DisableScripts)){
-                e.Frame.ExecuteJavaScriptAsync(PropertyBridge.GenerateScript(PropertyBridge.Properties.ExpandLinksOnHover));
-                ScriptLoader.ExecuteScript(e.Frame, notificationJS, NotificationScriptIdentifier);
-
-                if (plugins != null && plugins.HasAnyPlugin(PluginEnvironment.Notification)){
-                    ScriptLoader.ExecuteScript(e.Frame, pluginJS, PluginScriptIdentifier);
-                    ScriptLoader.ExecuteFile(e.Frame, PluginManager.PluginGlobalScriptFile);
-                    plugins.ExecutePlugins(e.Frame, PluginEnvironment.Notification, false);
-                }
-            }
-        }
-
-        private void FormNotification_FormClosing(object sender, FormClosingEventArgs e){
-            if (e.CloseReason == CloseReason.UserClosing){
-                HideNotification(false);
-                tweetQueue.Clear();
-                e.Cancel = true;
-            }
-        }
-
-        private void FormNotification_Disposed(object sender, EventArgs e){
-            browser.Dispose();
-            StopMouseHook();
-        }
-
-        // notification methods
-
-        public void ShowNotification(TweetNotification notification){
-            if (IsPaused){
-                tweetQueue.Enqueue(notification);
-            }
-            else{
-                tweetQueue.Enqueue(notification);
-                UpdateTitle();
-
-                if (totalTime == 0){
-                    LoadNextNotification();
-                }
-            }
-        }
-
-        public void ShowNotificationForSettings(bool reset){
-            if (reset){
-                LoadTweet(TweetNotification.ExampleTweet);
-            }
-            else{
-                PrepareAndDisplayWindow();
-            }
-        }
-
-        public void HideNotification(bool loadBlank){
-            if (loadBlank){
-                browser.LoadHtml("", "about:blank");
-            }
-
-            Location = ControlExtensions.InvisibleLocation;
-            progressBarTimer.Value = Program.UserConfig.NotificationTimerCountDown ? 1000 : 0;
-            timerProgress.Stop();
-            totalTime = 0;
-
-            StopMouseHook();
-        }
-
-        public void FinishCurrentTweet(){
-            if (tweetQueue.Count > 0){
-                LoadNextNotification();
-            }
-            else if (flags.HasFlag(NotificationFlags.AutoHide)){
-                HideNotification(true);
-            }
-            else{
-                timerProgress.Stop();
-            }
-        }
-
-        public void PauseNotification(){
-            if (pauseCounter++ == 0){
-                pausedDuringNotification = IsNotificationVisible;
-
-                if (IsNotificationVisible){
-                    Location = ControlExtensions.InvisibleLocation;
-                    timerProgress.Stop();
-                    StopMouseHook();
-                }
-            }
-        }
-
-        public void ResumeNotification(){
-            if (pauseCounter > 0 && --pauseCounter == 0){
-                if (pausedDuringNotification){
-                    OnNotificationReady();
-                }
-                else if (tweetQueue.Count > 0){
-                    LoadNextNotification();
-                }
-            }
-        }
-
-        private void LoadNextNotification(){
-            LoadTweet(tweetQueue.Dequeue());
-        }
-
-        private void LoadTweet(TweetNotification tweet){
-            CurrentUrl = tweet.Url;
-            CurrentQuotedTweetUrl = string.Empty; // load from JS
-            
-            timerProgress.Stop();
-            totalTime = timeLeft = tweet.GetDisplayDuration(Program.UserConfig.NotificationDurationValue);
-            progressBarTimer.Value = Program.UserConfig.NotificationTimerCountDown ? 1000 : 0;
-
-            string bodyClasses = browser.Bounds.Contains(PointToClient(Cursor.Position)) ? "td-hover" : string.Empty;
-
-            browser.LoadHtml(tweet.GenerateHtml(bodyClasses), "http://tweetdeck.twitter.com/?"+DateTime.Now.Ticks);
-        }
-
-        private void PrepareAndDisplayWindow(){
-            if (RequiresResize){
-                RequiresResize = false;
-                SetNotificationSize(BaseClientWidth, BaseClientHeight, Program.UserConfig.DisplayNotificationTimer);
-            }
-            
-            MoveToVisibleLocation();
-            StartMouseHook();
-        }
-
-        protected void SetNotificationSize(int width, int height, bool displayTimer){
-            if (displayTimer){
-                ClientSize = new Size(width, height+4);
-                progressBarTimer.Visible = true;
-            }
-            else{
-                ClientSize = new Size(width, height);
-                progressBarTimer.Visible = false;
-            }
-
-            panelBrowser.Height = height;
-        }
-
-        protected void MoveToVisibleLocation(){
-            UserConfig config = Program.UserConfig;
-
-            Screen screen = Screen.FromControl(owner);
-
-            if (config.NotificationDisplay > 0 && config.NotificationDisplay <= Screen.AllScreens.Length){
-                screen = Screen.AllScreens[config.NotificationDisplay-1];
-            }
-            
-            bool needsReactivating = Location == ControlExtensions.InvisibleLocation;
-            int edgeDist = config.NotificationEdgeDistance;
-
-            switch(config.NotificationPosition){
-                case TweetNotification.Position.TopLeft:
-                    Location = new Point(screen.WorkingArea.X+edgeDist, screen.WorkingArea.Y+edgeDist);
-                    break;
-
-                case TweetNotification.Position.TopRight:
-                    Location = new Point(screen.WorkingArea.X+screen.WorkingArea.Width-edgeDist-Width, screen.WorkingArea.Y+edgeDist);
-                    break;
-
-                case TweetNotification.Position.BottomLeft:
-                    Location = new Point(screen.WorkingArea.X+edgeDist, screen.WorkingArea.Y+screen.WorkingArea.Height-edgeDist-Height);
-                    break;
-
-                case TweetNotification.Position.BottomRight:
-                    Location = new Point(screen.WorkingArea.X+screen.WorkingArea.Width-edgeDist-Width, screen.WorkingArea.Y+screen.WorkingArea.Height-edgeDist-Height);
-                    break;
-
-                case TweetNotification.Position.Custom:
-                    if (!config.IsCustomNotificationPositionSet){
-                        config.CustomNotificationPosition = new Point(screen.WorkingArea.X+screen.WorkingArea.Width-edgeDist-Width, screen.WorkingArea.Y+edgeDist);
-                        config.Save();
-                    }
-
-                    Location = config.CustomNotificationPosition;
-                    break;
-            }
-
-            if (needsReactivating && flags.HasFlag(NotificationFlags.TopMost)){
-                NativeMethods.SetFormPos(this, NativeMethods.HWND_TOPMOST, NativeMethods.SWP_NOACTIVATE);
-            }
-        }
-
-        protected void UpdateTitle(){
-            Text = tweetQueue.Count > 0 ? Program.BrandName+" ("+tweetQueue.Count+" more left)" : Program.BrandName;
-        }
-
-        protected void OnNotificationReady(){
-            UpdateTitle();
-            PrepareAndDisplayWindow();
-            timerProgress.Start();
-        }
-
-        public void DisplayTooltip(string text){
-            if (string.IsNullOrEmpty(text)){
-                toolTip.Hide(this);
-            }
-            else{
-                Point position = PointToClient(Cursor.Position);
-                position.Offset(20, 5);
-                toolTip.Show(text, this, position); // TODO figure out flickering when moving the mouse
-            }
-        }
-    }
-}

Core/Handling/ContextMenuBase.cs

@@ -1,6 +1,7 @@
 using CefSharp;
 using System;
 using System.IO;
+using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using TweetDck.Core.Bridge;
 using TweetDck.Core.Controls;
@@ -8,11 +9,14 @@ using TweetDck.Core.Utils;
 
 namespace TweetDck.Core.Handling{
     abstract class ContextMenuBase : IContextMenuHandler{
+        private static readonly Regex RegexTwitterAccount = new Regex(@"^https?://twitter\.com/([^/]+)/?$", RegexOptions.Compiled);
+
         private const int MenuOpenLinkUrl = 26500;
         private const int MenuCopyLinkUrl = 26501;
-        private const int MenuOpenImage = 26502;
-        private const int MenuSaveImage = 26503;
-        private const int MenuCopyImageUrl = 26504;
+        private const int MenuCopyUsername = 26502;
+        private const int MenuOpenImage = 26503;
+        private const int MenuSaveImage = 26504;
+        private const int MenuCopyImageUrl = 26505;
 
         #if DEBUG
         private const int MenuOpenDevTools = 26599;
@@ -30,8 +34,16 @@ 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)){
+                    model.AddItem((CefMenuCommand)MenuOpenLinkUrl, "Open account in browser");
+                    model.AddItem((CefMenuCommand)MenuCopyLinkUrl, "Copy account address");
+                    model.AddItem((CefMenuCommand)MenuCopyUsername, "Copy account username");
+                }
+                else{
                     model.AddItem((CefMenuCommand)MenuOpenLinkUrl, "Open link in browser");
                     model.AddItem((CefMenuCommand)MenuCopyLinkUrl, "Copy link address");
+                }
+
                 model.AddSeparator();
             }
 
@@ -84,6 +96,11 @@ namespace TweetDck.Core.Handling{
                     SetClipboardText(parameters.SourceUrl);
                     break;
 
+                case MenuCopyUsername:
+                    Match match = RegexTwitterAccount.Match(parameters.UnfilteredLinkUrl);
+                    SetClipboardText(match.Success ? match.Groups[1].Value : parameters.UnfilteredLinkUrl);
+                    break;
+
                 #if DEBUG
                 case MenuOpenDevTools:
                     browserControl.ShowDevTools();

Core/Handling/ContextMenuBrowser.cs

@@ -1,4 +1,5 @@
-using CefSharp;
+using System.Windows.Forms;
+using CefSharp;
 using TweetDck.Core.Bridge;
 using TweetDck.Core.Controls;
 using TweetDck.Core.Utils;
@@ -17,6 +18,12 @@ namespace TweetDck.Core.Handling{
         private const int MenuCopyQuotedTweetUrl = 26613;
         private const int MenuScreenshotTweet = 26614;
 
+        private const string TitleReloadBrowser = "Reload browser";
+        private const string TitleMuteNotifications = "Mute notifications";
+        private const string TitleSettings = "Settings";
+        private const string TitlePlugins = "Plugins";
+        private const string TitleAboutProgram = "About "+Program.BrandName;
+
         private readonly FormBrowser form;
 
         private string lastHighlightedTweet;
@@ -66,14 +73,14 @@ namespace TweetDck.Core.Handling{
 
                 IMenuModel globalMenu = model.Count == 0 ? model : model.AddSubMenu((CefMenuCommand)MenuGlobal, Program.BrandName);
             
-                globalMenu.AddItem(CefMenuCommand.Reload, "Reload browser");
-                globalMenu.AddCheckItem((CefMenuCommand)MenuMute, "Mute notifications");
+                globalMenu.AddItem(CefMenuCommand.Reload, TitleReloadBrowser);
+                globalMenu.AddCheckItem((CefMenuCommand)MenuMute, TitleMuteNotifications);
                 globalMenu.SetChecked((CefMenuCommand)MenuMute, Program.UserConfig.MuteNotifications);
                 globalMenu.AddSeparator();
 
-                globalMenu.AddItem((CefMenuCommand)MenuSettings, "Settings");
-                globalMenu.AddItem((CefMenuCommand)MenuPlugins, "Plugins");
-                globalMenu.AddItem((CefMenuCommand)MenuAbout, "About "+Program.BrandName);
+                globalMenu.AddItem((CefMenuCommand)MenuSettings, TitleSettings);
+                globalMenu.AddItem((CefMenuCommand)MenuPlugins, TitlePlugins);
+                globalMenu.AddItem((CefMenuCommand)MenuAbout, TitleAboutProgram);
 
                 #if DEBUG
                 globalMenu.AddSeparator();
@@ -91,7 +98,7 @@ namespace TweetDck.Core.Handling{
 
             switch((int)commandId){
                 case (int)CefMenuCommand.Reload:
-                    frame.ExecuteJavaScriptAsync("window.location.href = 'https://tweetdeck.twitter.com'");
+                    form.InvokeAsyncSafe(form.ReloadToTweetDeck);
                     return true;
 
                 case MenuSettings:
@@ -107,11 +114,7 @@ namespace TweetDck.Core.Handling{
                     return true;
 
                 case MenuMute:
-                    form.InvokeAsyncSafe(() => {
-                        Program.UserConfig.MuteNotifications = !Program.UserConfig.MuteNotifications;
-                        Program.UserConfig.Save();
-                    });
-
+                    form.InvokeAsyncSafe(ToggleMuteNotifications);
                     return true;
 
                 case MenuOpenTweetUrl:
@@ -137,5 +140,27 @@ namespace TweetDck.Core.Handling{
 
             return false;
         }
+
+        public static ContextMenu CreateMenu(FormBrowser form){
+            ContextMenu menu = new ContextMenu();
+
+            menu.MenuItems.Add(TitleReloadBrowser, (sender, args) => form.ReloadToTweetDeck());
+            menu.MenuItems.Add(TitleMuteNotifications, (sender, args) => ToggleMuteNotifications());
+            menu.MenuItems.Add("-");
+            menu.MenuItems.Add(TitleSettings, (sender, args) => form.OpenSettings());
+            menu.MenuItems.Add(TitlePlugins, (sender, args) => form.OpenPlugins());
+            menu.MenuItems.Add(TitleAboutProgram,  (sender, args) => form.OpenAbout());
+
+            menu.Popup += (sender, args) => {
+                menu.MenuItems[1].Checked = Program.UserConfig.MuteNotifications;
+            };
+
+            return menu;
+        }
+
+        private static void ToggleMuteNotifications(){
+            Program.UserConfig.MuteNotifications = !Program.UserConfig.MuteNotifications;
+            Program.UserConfig.Save();
+        }
     }
 }

Core/Handling/ContextMenuNotification.cs

@@ -1,5 +1,6 @@
 using CefSharp;
 using TweetDck.Core.Controls;
+using TweetDck.Core.Notification;
 
 namespace TweetDck.Core.Handling{
     class ContextMenuNotification : ContextMenuBase{
@@ -8,10 +9,10 @@ namespace TweetDck.Core.Handling{
         private const int MenuCopyTweetUrl = 26602;
         private const int MenuCopyQuotedTweetUrl = 26603;
 
-        private readonly FormNotification form;
+        private readonly FormNotificationBase form;
         private readonly bool enableCustomMenu;
 
-        public ContextMenuNotification(FormNotification form, bool enableCustomMenu) : base(form){
+        public ContextMenuNotification(FormNotificationBase form, bool enableCustomMenu) : base(form){
             this.form = form;
             this.enableCustomMenu = enableCustomMenu;
         }
@@ -59,7 +60,7 @@ namespace TweetDck.Core.Handling{
 
             switch((int)commandId){
                 case MenuSkipTweet:
-                    form.InvokeAsyncSafe(form.FinishCurrentTweet);
+                    form.InvokeAsyncSafe(form.FinishCurrentNotification);
                     return true;
 
                 case MenuFreeze:

Core/Handling/JavaScriptDialogHandler.cs

@@ -1,5 +1,6 @@
 using CefSharp;
 using CefSharp.WinForms;
+using System.Drawing;
 using System.Windows.Forms;
 using TweetDck.Core.Controls;
 using TweetDck.Core.Other;
@@ -7,30 +8,40 @@ using TweetDck.Core.Other;
 namespace TweetDck.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){
-            if (dialogType != CefJsDialogType.Alert && dialogType != CefJsDialogType.Confirm){
-                return false;
-            }
-
             ((ChromiumWebBrowser)browserControl).InvokeSafe(() => {
                 FormMessage form = new FormMessage(Program.BrandName, messageText, MessageBoxIcon.None);
-                Button btnConfirm;
+                TextBox input = null;
 
                 if (dialogType == CefJsDialogType.Alert){
-                    btnConfirm = form.AddButton("OK");
+                    form.AcceptButton = form.AddButton("OK");
                 }
                 else if (dialogType == CefJsDialogType.Confirm){
-                    form.AddButton("No");
-                    btnConfirm = form.AddButton("Yes");
+                    form.CancelButton = form.AddButton("No", DialogResult.No);
+                    form.AcceptButton = form.AddButton("Yes");
                 }
-                else{
-                    return;
+                else if (dialogType == CefJsDialogType.Prompt){
+                    form.CancelButton = form.AddButton("Cancel", DialogResult.Cancel);
+                    form.AcceptButton = form.AddButton("OK");
+
+                    input = new TextBox{
+                        Anchor = AnchorStyles.Left | AnchorStyles.Right | AnchorStyles.Bottom,
+                        Location = new Point(27, form.ActionPanelY-46),
+                        Size = new Size(form.ClientSize.Width-54, 20)
+                    };
+
+                    form.Controls.Add(input);
+                    form.ActiveControl = input;
+                    form.Height += input.Size.Height+input.Margin.Vertical;
                 }
 
-                if (form.ShowDialog() == DialogResult.OK && form.ClickedButton == btnConfirm){
-                    callback.Continue(true);
+                bool success = form.ShowDialog() == DialogResult.OK;
+
+                if (input == null){
+                    callback.Continue(success);
                 }
                 else{
-                    callback.Continue(false);
+                    callback.Continue(success, input.Text);
+                    input.Dispose();
                 }
 
                 form.Dispose();

Core/Notification/FormNotificationBase.Designer.cs

@@ -0,0 +1,52 @@
+namespace TweetDck.Core.Notification {
+    partial class FormNotificationBase {
+        /// <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.toolTip = new System.Windows.Forms.ToolTip(this.components);
+            this.SuspendLayout();
+            // 
+            // FormNotification
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            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.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "FormNotification";
+            this.ShowIcon = false;
+            this.ShowInTaskbar = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.ToolTip toolTip;
+    }
+}

Core/Notification/FormNotificationBase.cs

@@ -0,0 +1,213 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using CefSharp;
+using CefSharp.WinForms;
+using TweetDck.Configuration;
+using TweetDck.Core.Controls;
+using TweetDck.Core.Handling;
+using TweetDck.Core.Utils;
+
+namespace TweetDck.Core.Notification{
+    partial class FormNotificationBase : Form{
+        protected Point PrimaryLocation{
+            get{
+                UserConfig config = Program.UserConfig;
+                Screen screen;
+
+                if (config.NotificationDisplay > 0 && config.NotificationDisplay <= Screen.AllScreens.Length){
+                    screen = Screen.AllScreens[config.NotificationDisplay-1];
+                }
+                else{
+                    screen = Screen.FromControl(owner);
+                }
+            
+                int edgeDist = config.NotificationEdgeDistance;
+
+                switch(config.NotificationPosition){
+                    case TweetNotification.Position.TopLeft:
+                        return new Point(screen.WorkingArea.X+edgeDist, screen.WorkingArea.Y+edgeDist);
+
+                    case TweetNotification.Position.TopRight:
+                        return new Point(screen.WorkingArea.X+screen.WorkingArea.Width-edgeDist-Width, screen.WorkingArea.Y+edgeDist);
+
+                    case TweetNotification.Position.BottomLeft:
+                        return new Point(screen.WorkingArea.X+edgeDist, screen.WorkingArea.Y+screen.WorkingArea.Height-edgeDist-Height);
+
+                    case TweetNotification.Position.BottomRight:
+                        return new Point(screen.WorkingArea.X+screen.WorkingArea.Width-edgeDist-Width, screen.WorkingArea.Y+screen.WorkingArea.Height-edgeDist-Height);
+
+                    case TweetNotification.Position.Custom:
+                        if (!config.IsCustomNotificationPositionSet){
+                            config.CustomNotificationPosition = new Point(screen.WorkingArea.X+screen.WorkingArea.Width-edgeDist-Width, screen.WorkingArea.Y+edgeDist);
+                            config.Save();
+                        }
+
+                        return config.CustomNotificationPosition;
+                }
+
+                return Location;
+            }
+        }
+
+        public bool IsNotificationVisible{
+            get{
+                return Location != ControlExtensions.InvisibleLocation;
+            }
+        }
+
+        public new Point Location{
+            get{
+                return base.Location;
+            }
+
+            set{
+                Visible = (base.Location = value) != ControlExtensions.InvisibleLocation;
+            }
+        }
+        
+        public Func<bool> CanMoveWindow = () => true;
+
+        protected readonly Form owner;
+        protected readonly ChromiumWebBrowser browser;
+
+        private int pauseCounter;
+
+        public bool IsPaused{
+            get{
+                return pauseCounter > 0;
+            }
+        }
+
+        protected override bool ShowWithoutActivation{
+            get{
+                return true;
+            }
+        }
+
+        public bool FreezeTimer { get; set; }
+        public bool ContextMenuOpen { get; set; }
+        public string CurrentUrl { get; private set; }
+        public string CurrentQuotedTweetUrl { get; set; }
+
+        public event EventHandler Initialized;
+
+        public FormNotificationBase(Form owner, bool enableContextMenu){
+            InitializeComponent();
+
+            this.owner = owner;
+            this.owner.FormClosed += owner_FormClosed;
+
+            this.browser = new ChromiumWebBrowser("about:blank"){
+                MenuHandler = new ContextMenuNotification(this, enableContextMenu),
+                LifeSpanHandler = new LifeSpanHandler()
+            };
+
+            this.browser.Dock = DockStyle.None;
+            this.browser.ClientSize = ClientSize;
+
+            #if DEBUG
+            this.browser.ConsoleMessage += BrowserUtils.HandleConsoleMessage;
+            #endif
+
+            this.browser.IsBrowserInitializedChanged += Browser_IsBrowserInitializedChanged;
+
+            Controls.Add(browser);
+
+            Disposed += (sender, args) => {
+                this.browser.Dispose();
+                this.owner.FormClosed -= owner_FormClosed;
+            };
+
+            // ReSharper disable once VirtualMemberCallInContructor
+            UpdateTitle();
+        }
+
+        protected override void WndProc(ref Message m){
+            if (m.Msg == 0x0112 && (m.WParam.ToInt32() & 0xFFF0) == 0xF010 && !CanMoveWindow()){ // WM_SYSCOMMAND, SC_MOVE
+                return;
+            }
+
+            base.WndProc(ref m);
+        }
+
+        // event handlers
+
+        private void owner_FormClosed(object sender, FormClosedEventArgs e){
+            Close();
+        }
+
+        private void Browser_IsBrowserInitializedChanged(object sender, IsBrowserInitializedChangedEventArgs e){
+            if (e.IsBrowserInitialized && Initialized != null){
+                Initialized(this, new EventArgs());
+            }
+        }
+
+        // notification methods
+
+        public virtual void HideNotification(bool loadBlank){
+            if (loadBlank){
+                browser.LoadHtml("", "about:blank");
+            }
+
+            Location = ControlExtensions.InvisibleLocation;
+        }
+
+        public virtual void FinishCurrentNotification(){}
+
+        public virtual void PauseNotification(){
+            if (pauseCounter++ == 0 && IsNotificationVisible){
+                Location = ControlExtensions.InvisibleLocation;
+            }
+        }
+
+        public virtual void ResumeNotification(){
+            if (pauseCounter > 0){
+                --pauseCounter;
+            }
+        }
+
+        protected virtual string GetTweetHTML(TweetNotification tweet){
+            string bodyClasses = browser.Bounds.Contains(PointToClient(Cursor.Position)) ? "td-hover" : string.Empty;
+            return tweet.GenerateHtml(bodyClasses);
+        }
+
+        protected virtual void LoadTweet(TweetNotification tweet){
+            CurrentUrl = tweet.Url;
+            CurrentQuotedTweetUrl = string.Empty; // load from JS
+            browser.LoadHtml(GetTweetHTML(tweet), "http://tweetdeck.twitter.com/?"+DateTime.Now.Ticks);
+        }
+
+        protected virtual void SetNotificationSize(int width, int height){
+            browser.ClientSize = ClientSize = new Size(width, height);
+        }
+
+        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(){
+            MoveToVisibleLocation();
+        }
+
+        protected virtual void UpdateTitle(){
+            Text = Program.BrandName;
+        }
+
+        public void DisplayTooltip(string text){
+            if (string.IsNullOrEmpty(text)){
+                toolTip.Hide(this);
+            }
+            else{
+                Point position = PointToClient(Cursor.Position);
+                position.Offset(20, 5);
+                toolTip.Show(text, this, position); // TODO figure out flickering when moving the mouse
+            }
+        }
+    }
+}

Core/Notification/FormNotificationMain.Designer.cs

@@ -1,7 +1,5 @@
-using TweetDck.Core.Controls;
-
-namespace TweetDck.Core {
-    partial class FormNotification {
+namespace TweetDck.Core.Notification {
+    partial class FormNotificationMain {
         /// <summary>
         /// Required designer variable.
         /// </summary>
@@ -26,23 +24,15 @@ namespace TweetDck.Core {
         /// </summary>
         private void InitializeComponent() {
             this.components = new System.ComponentModel.Container();
-            this.panelBrowser = new System.Windows.Forms.Panel();
+            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.toolTip = new System.Windows.Forms.ToolTip(this.components);
-            this.timerDisplayDelay = new System.Windows.Forms.Timer(this.components);
             this.SuspendLayout();
             // 
-            // panelBrowser
+            // timerDisplayDelay
             // 
-            this.panelBrowser.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.panelBrowser.BackColor = System.Drawing.Color.White;
-            this.panelBrowser.Location = new System.Drawing.Point(0, 0);
-            this.panelBrowser.Margin = new System.Windows.Forms.Padding(0);
-            this.panelBrowser.Name = "panelBrowser";
-            this.panelBrowser.Size = new System.Drawing.Size(284, 118);
-            this.panelBrowser.TabIndex = 0;
+            this.timerDisplayDelay.Interval = 17;
+            this.timerDisplayDelay.Tick += new System.EventHandler(this.timerDisplayDelay_Tick);
             // 
             // timerProgress
             // 
@@ -62,11 +52,6 @@ namespace TweetDck.Core {
             this.progressBarTimer.Size = new System.Drawing.Size(284, 4);
             this.progressBarTimer.TabIndex = 1;
             // 
-            // timerDisplayDelay
-            // 
-            this.timerDisplayDelay.Interval = 17;
-            this.timerDisplayDelay.Tick += new System.EventHandler(this.timerDisplayDelay_Tick);
-            // 
             // FormNotification
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -74,15 +59,6 @@ namespace TweetDck.Core {
             this.BackColor = System.Drawing.SystemColors.Control;
             this.ClientSize = new System.Drawing.Size(284, 122);
             this.Controls.Add(this.progressBarTimer);
-            this.Controls.Add(this.panelBrowser);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
-            this.Location = TweetDck.Core.Controls.ControlExtensions.InvisibleLocation;
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "FormNotification";
-            this.ShowIcon = false;
-            this.ShowInTaskbar = false;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FormNotification_FormClosing);
             this.ResumeLayout(false);
 
@@ -90,10 +66,8 @@ namespace TweetDck.Core {
 
         #endregion
 
-        private System.Windows.Forms.Panel panelBrowser;
-        private Controls.FlatProgressBar progressBarTimer;
-        private System.Windows.Forms.Timer timerProgress;
-        private System.Windows.Forms.ToolTip toolTip;
         private System.Windows.Forms.Timer timerDisplayDelay;
+        protected System.Windows.Forms.Timer timerProgress;
+        private Controls.FlatProgressBar progressBarTimer;
     }
 }

Core/Notification/FormNotificationMain.cs

@@ -0,0 +1,249 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+using CefSharp;
+using TweetDck.Core.Bridge;
+using TweetDck.Core.Controls;
+using TweetDck.Core.Utils;
+using TweetDck.Plugins;
+using TweetDck.Plugins.Enums;
+using TweetDck.Resources;
+
+namespace TweetDck.Core.Notification{
+    partial class FormNotificationMain : FormNotificationBase{
+        private const string NotificationScriptFile = "notification.js";
+
+        private static readonly string NotificationScriptIdentifier = ScriptLoader.GetRootIdentifier(NotificationScriptFile);
+        private static readonly string PluginScriptIdentifier = ScriptLoader.GetRootIdentifier(PluginManager.PluginNotificationScriptFile);
+
+        private static readonly string NotificationJS, PluginJS;
+
+        static FormNotificationMain(){
+            NotificationJS = ScriptLoader.LoadResource(NotificationScriptFile);
+            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;
+        protected bool pausedDuringNotification;
+        
+        private readonly NativeMethods.HookProc mouseHookDelegate;
+        private IntPtr mouseHook;
+
+        private bool? prevDisplayTimer;
+        private int? prevFontSize;
+
+        private bool RequiresResize{
+            get{
+                return !prevDisplayTimer.HasValue || !prevFontSize.HasValue || prevDisplayTimer != Program.UserConfig.DisplayNotificationTimer || prevFontSize != TweetNotification.FontSizeLevel;
+            }
+
+            set{
+                if (value){
+                    prevDisplayTimer = null;
+                    prevFontSize = null;
+                }
+                else{
+                    prevDisplayTimer = Program.UserConfig.DisplayNotificationTimer;
+                    prevFontSize = TweetNotification.FontSizeLevel;
+                }
+            }
+        }
+
+        public FormNotificationMain(FormBrowser owner, PluginManager pluginManager, bool enableContextMenu) : base(owner, enableContextMenu){
+            InitializeComponent();
+
+            this.plugins = pluginManager;
+
+            browser.RegisterAsyncJsObject("$TD", new TweetDeckBridge(owner, this));
+            browser.RegisterAsyncJsObject("$TDP", plugins.Bridge);
+
+            browser.LoadingStateChanged += Browser_LoadingStateChanged;
+            browser.FrameLoadEnd += Browser_FrameLoadEnd;
+
+            mouseHookDelegate = MouseHookProc;
+            Disposed += (sender, args) => StopMouseHook();
+        }
+
+        // mouse wheel hook
+
+        private void StartMouseHook(){
+            if (mouseHook == IntPtr.Zero){
+                mouseHook = NativeMethods.SetWindowsHookEx(NativeMethods.WM_MOUSE_LL, mouseHookDelegate, IntPtr.Zero, 0);
+            }
+        }
+
+        private void StopMouseHook(){
+            if (mouseHook != IntPtr.Zero){
+                NativeMethods.UnhookWindowsHookEx(mouseHook);
+                mouseHook = IntPtr.Zero;
+            }
+        }
+
+        private IntPtr MouseHookProc(int nCode, IntPtr wParam, IntPtr lParam){
+            if (wParam.ToInt32() == NativeMethods.WM_MOUSEWHEEL && browser.Bounds.Contains(PointToClient(Cursor.Position)) && !ContainsFocus && !owner.ContainsFocus){
+                browser.SendMouseWheelEvent(0, 0, 0, NativeMethods.GetHookWheelDelta(lParam), CefEventFlags.None);
+            }
+
+            return NativeMethods.CallNextHookEx(mouseHook, nCode, wParam, lParam);
+        }
+
+        // event handlers
+
+        private void FormNotification_FormClosing(object sender, FormClosingEventArgs e){
+            if (e.CloseReason == CloseReason.UserClosing){
+                HideNotification(false);
+                e.Cancel = true;
+            }
+        }
+
+        private void Browser_LoadingStateChanged(object sender, LoadingStateChangedEventArgs e){
+            if (!e.IsLoading && browser.Address != "about:blank"){
+                this.InvokeSafe(() => {
+                    Visible = true; // ensures repaint before moving the window to a visible location
+                    timerDisplayDelay.Start();
+                });
+            }
+        }
+
+        private void Browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
+            if (e.Frame.IsMain && NotificationJS != null && browser.Address != "about:blank"){
+                e.Frame.ExecuteJavaScriptAsync(PropertyBridge.GenerateScript(PropertyBridge.Properties.ExpandLinksOnHover));
+                ScriptLoader.ExecuteScript(e.Frame, NotificationJS, NotificationScriptIdentifier);
+
+                if (plugins.HasAnyPlugin(PluginEnvironment.Notification)){
+                    ScriptLoader.ExecuteScript(e.Frame, PluginJS, PluginScriptIdentifier);
+                    ScriptLoader.ExecuteFile(e.Frame, PluginManager.PluginGlobalScriptFile);
+                    plugins.ExecutePlugins(e.Frame, PluginEnvironment.Notification, false);
+                }
+            }
+        }
+
+        private void timerDisplayDelay_Tick(object sender, EventArgs e){
+            OnNotificationReady();
+            timerDisplayDelay.Stop();
+        }
+
+        private void timerHideProgress_Tick(object sender, EventArgs e){
+            if (Bounds.Contains(Cursor.Position) || FreezeTimer || ContextMenuOpen)return;
+
+            timeLeft -= timerProgress.Interval;
+
+            int value = (int)Math.Round(1025.0*(totalTime-timeLeft)/totalTime);
+            progressBarTimer.SetValueInstant(Math.Min(1000, Math.Max(0, Program.UserConfig.NotificationTimerCountDown ? 1000-value : value)));
+
+            if (timeLeft <= 0){
+                FinishCurrentNotification();
+            }
+        }
+
+        // notification methods
+
+        public virtual void ShowNotification(TweetNotification notification){
+            LoadTweet(notification);
+        }
+
+        public void ShowNotificationForSettings(bool reset){
+            if (reset){
+                LoadTweet(TweetNotification.ExampleTweet);
+            }
+            else{
+                PrepareAndDisplayWindow();
+            }
+        }
+
+        public override void HideNotification(bool loadBlank){
+            base.HideNotification(loadBlank);
+            
+            progressBarTimer.Value = Program.UserConfig.NotificationTimerCountDown ? 1000 : 0;
+            timerProgress.Stop();
+            totalTime = 0;
+
+            StopMouseHook();
+        }
+
+        public override void FinishCurrentNotification(){
+            timerProgress.Stop();
+        }
+
+        public override void PauseNotification(){
+            if (!IsPaused){
+                pausedDuringNotification = IsNotificationVisible;
+                timerProgress.Stop();
+                StopMouseHook();
+            }
+
+            base.PauseNotification();
+        }
+
+        public override void ResumeNotification(){
+            bool wasPaused = IsPaused;
+            base.ResumeNotification();
+
+            if (wasPaused && !IsPaused && pausedDuringNotification){
+                OnNotificationReady();
+            }
+        }
+
+        protected override string GetTweetHTML(TweetNotification tweet){
+            string html = base.GetTweetHTML(tweet);
+
+            foreach(InjectedHTML injection in plugins.Bridge.NotificationInjections){
+                html = injection.Inject(html);
+            }
+
+            return html;
+        }
+
+        protected override void LoadTweet(TweetNotification tweet){
+            timerProgress.Stop();
+            totalTime = timeLeft = tweet.GetDisplayDuration(Program.UserConfig.NotificationDurationValue);
+            progressBarTimer.Value = Program.UserConfig.NotificationTimerCountDown ? 1000 : 0;
+
+            base.LoadTweet(tweet);
+        }
+
+        protected override void SetNotificationSize(int width, int height){
+            if (Program.UserConfig.DisplayNotificationTimer){
+                ClientSize = new Size(width, height+4);
+                progressBarTimer.Visible = true;
+            }
+            else{
+                ClientSize = new Size(width, height);
+                progressBarTimer.Visible = false;
+            }
+
+            browser.ClientSize = new Size(width, height);
+        }
+        
+        private void PrepareAndDisplayWindow(){
+            if (RequiresResize){
+                RequiresResize = false;
+                SetNotificationSize(BaseClientWidth, BaseClientHeight);
+            }
+            
+            MoveToVisibleLocation();
+            StartMouseHook();
+        }
+
+        protected override void OnNotificationReady(){
+            PrepareAndDisplayWindow();
+            timerProgress.Start();
+        }
+    }
+}

Core/Notification/FormNotificationTweet.Designer.cs

@@ -0,0 +1,59 @@
+using System;
+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.
+        /// </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.timerCursorCheck = new System.Windows.Forms.Timer(this.components);
+            this.timerIdlePauseCheck = new System.Windows.Forms.Timer(this.components);
+            this.SuspendLayout();
+            // 
+            // timerCursorCheck
+            // 
+            this.timerCursorCheck.Interval = 200;
+            this.timerCursorCheck.Tick += new System.EventHandler(this.timerCursorCheck_Tick);
+            // 
+            // timerIdlePauseCheck
+            // 
+            this.timerIdlePauseCheck.Interval = 750;
+            this.timerIdlePauseCheck.Tick += new System.EventHandler(this.timerIdlePauseCheck_Tick);
+            // 
+            // FormNotificationTweet
+            // 
+            this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.FormNotificationTweet_FormClosing);
+            this.ResumeLayout(true);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Timer timerCursorCheck;
+        private System.Windows.Forms.Timer timerIdlePauseCheck;
+    }
+}

Core/Notification/FormNotificationTweet.cs

@@ -0,0 +1,128 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using TweetDck.Plugins;
+using System.Windows.Forms;
+using TweetDck.Core.Utils;
+
+namespace TweetDck.Core.Notification{
+    sealed partial class FormNotificationTweet : FormNotificationMain{
+        private const int NonIntrusiveIdleLimit = 30;
+
+        private bool IsCursorOverNotificationArea{
+            get{
+                return new Rectangle(PrimaryLocation, Size).Contains(Cursor.Position);
+            }
+        }
+
+        private readonly Queue<TweetNotification> tweetQueue = new Queue<TweetNotification>(4);
+
+        public FormNotificationTweet(FormBrowser owner, PluginManager pluginManager) : base(owner, pluginManager, true){
+            InitializeComponent();
+
+            Program.UserConfig.MuteToggled += Config_MuteToggled;
+            Disposed += (sender, args) => Program.UserConfig.MuteToggled -= Config_MuteToggled;
+
+            if (Program.UserConfig.MuteNotifications){
+                PauseNotification();
+            }
+        }
+
+        private void FormNotificationTweet_FormClosing(object sender, FormClosingEventArgs e){
+            if (e.CloseReason == CloseReason.UserClosing){
+                tweetQueue.Clear(); // already canceled
+            }
+        }
+
+        // event handlers
+
+        private void Config_MuteToggled(object sender, EventArgs e){
+            if (Program.UserConfig.MuteNotifications){
+                PauseNotification();
+            }
+            else{
+                ResumeNotification();
+            }
+        }
+
+        private void timerCursorCheck_Tick(object sender, EventArgs e){
+            if (!IsCursorOverNotificationArea){
+                ResumeNotification();
+                timerCursorCheck.Stop();
+            }
+        }
+
+        private void timerIdlePauseCheck_Tick(object sender, EventArgs e){
+            if (NativeMethods.GetIdleSeconds() < Program.UserConfig.NotificationIdlePauseSeconds){
+                ResumeNotification();
+                timerIdlePauseCheck.Stop();
+            }
+        }
+
+        // notification methods
+
+        public override void ShowNotification(TweetNotification notification){
+            if (IsPaused){
+                tweetQueue.Enqueue(notification);
+            }
+            else{
+                tweetQueue.Enqueue(notification);
+                UpdateTitle();
+
+                if (totalTime == 0){
+                    LoadNextNotification();
+                }
+            }
+        }
+
+        public override void FinishCurrentNotification(){
+            if (tweetQueue.Count > 0){
+                LoadNextNotification();
+            }
+            else{
+                HideNotification(true);
+            }
+        }
+
+        public override void ResumeNotification(){
+            bool wasPaused = IsPaused;
+            base.ResumeNotification();
+
+            if (wasPaused && !IsPaused && !pausedDuringNotification && tweetQueue.Count > 0){
+                LoadNextNotification();
+            }
+        }
+
+        private void LoadNextNotification(){
+            if (!IsNotificationVisible){
+                if (Program.UserConfig.NotificationNonIntrusiveMode && IsCursorOverNotificationArea && NativeMethods.GetIdleSeconds() < NonIntrusiveIdleLimit){
+                    if (!timerCursorCheck.Enabled){
+                        PauseNotification();
+                        timerCursorCheck.Start();
+                    }
+
+                    return;
+                }
+                else if (Program.UserConfig.NotificationIdlePauseSeconds > 0 && NativeMethods.GetIdleSeconds() >= Program.UserConfig.NotificationIdlePauseSeconds){
+                    if (!timerIdlePauseCheck.Enabled){
+                        PauseNotification();
+                        timerIdlePauseCheck.Start();
+                    }
+
+                    return;
+                }
+            }
+            
+            LoadTweet(tweetQueue.Dequeue());
+        }
+
+        protected override void UpdateTitle(){
+            Text = tweetQueue.Count > 0 ? Program.BrandName+" ("+tweetQueue.Count+" more left)" : Program.BrandName;
+        }
+
+        protected override void OnNotificationReady(){
+            UpdateTitle();
+            base.OnNotificationReady();
+        }
+    }
+}

Core/Notification/NotificationFlags.cs

@@ -1,13 +0,0 @@
-using System;
-
-namespace TweetDck.Core.Notification{
-    [Flags]
-    public enum NotificationFlags{
-        None = 0,
-        AutoHide = 1,
-        DisableScripts = 2,
-        DisableContextMenu = 4,
-        TopMost = 8,
-        ManualDisplay = 16
-    }
-}

Core/Notification/Screenshot/FormNotificationScreenshotable.cs

@@ -4,40 +4,49 @@ using CefSharp;
 using TweetDck.Core.Bridge;
 using TweetDck.Core.Controls;
 using TweetDck.Resources;
+using System.Drawing;
+using System.Drawing.Imaging;
+using TweetDck.Core.Utils;
 
 namespace TweetDck.Core.Notification.Screenshot{
-    sealed class FormNotificationScreenshotable : FormNotification{
-        public FormNotificationScreenshotable(Action callback, FormBrowser owner, NotificationFlags flags) : base(owner, null, flags){
+    sealed class FormNotificationScreenshotable : FormNotificationBase{
+        public FormNotificationScreenshotable(Action callback, Form owner) : base(owner, false){
             browser.RegisterAsyncJsObject("$TD_NotificationScreenshot", new CallbackBridge(this, callback));
 
             browser.FrameLoadEnd += (sender, args) => {
                 if (args.Frame.IsMain && browser.Address != "about:blank"){
-                    ScriptLoader.ExecuteScript(args.Frame, "window.setTimeout($TD_NotificationScreenshot.trigger, 25)", "gen:screenshot");
+                    ScriptLoader.ExecuteScript(args.Frame, "window.setTimeout($TD_NotificationScreenshot.trigger, 67)", "gen:screenshot");
                 }
             };
-
-            UpdateTitle();
         }
 
         public void LoadNotificationForScreenshot(TweetNotification tweet, int width, int height){
             browser.LoadHtml(tweet.GenerateHtml(enableCustomCSS: false), "http://tweetdeck.twitter.com/?"+DateTime.Now.Ticks);
             
             Location = ControlExtensions.InvisibleLocation;
-            FormBorderStyle = Program.UserConfig.ShowScreenshotBorder ? FormBorderStyle.FixedToolWindow : FormBorderStyle.None;
-
-            SetNotificationSize(width, height, false);
+            SetNotificationSize(width, height);
         }
 
-        public void TakeScreenshotAndHide(){
+        public void TakeScreenshot(){
             MoveToVisibleLocation();
-            Activate();
-            SendKeys.SendWait("%{PRTSC}");
-            Reset();
+            
+            bool border = Program.UserConfig.ShowScreenshotBorder;
+            IntPtr context = NativeMethods.GetDeviceContext(this, border);
+
+            if (context == IntPtr.Zero){
+                MessageBox.Show("Could not retrieve a graphics context handle for the notification window to take the screenshot.", "Screenshot Failed", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+            else{
+                using(Bitmap bmp = new Bitmap(border ? Width : ClientSize.Width, border ? Height : ClientSize.Height, PixelFormat.Format32bppRgb)){
+                    try{
+                        NativeMethods.RenderSourceIntoBitmap(context, bmp);
+                    }finally{
+                        NativeMethods.ReleaseDeviceContext(this, context);
                     }
 
-        public void Reset(){
-            Location = ControlExtensions.InvisibleLocation;
-            browser.LoadHtml("", "about:blank");
+                    Clipboard.SetImage(bmp);
+                }
+            }
         }
     }
 }

Core/Notification/Screenshot/TweetScreenshotManager.cs

@@ -1,25 +1,49 @@
-using System;
+// Uncomment to keep screenshot windows visible for debugging
+// #define NO_HIDE_SCREENSHOTS
+
+using System;
 using System.Windows.Forms;
-using TweetDck.Core.Utils;
+using TweetDck.Core.Controls;
 
 namespace TweetDck.Core.Notification.Screenshot{
     sealed class TweetScreenshotManager : IDisposable{
-        private readonly FormBrowser browser;
-        private readonly FormNotificationScreenshotable screenshot;
+        private readonly Form owner;
         private readonly Timer timeout;
+        private readonly Timer disposer;
         
-        public TweetScreenshotManager(FormBrowser browser){
-            this.browser = browser;
+        private FormNotificationScreenshotable screenshot;
 
-            this.screenshot = new FormNotificationScreenshotable(Callback, browser, NotificationFlags.DisableScripts | NotificationFlags.DisableContextMenu | NotificationFlags.TopMost | NotificationFlags.ManualDisplay){
-                CanMoveWindow = () => false
-            };
+        public TweetScreenshotManager(Form owner){
+            this.owner = owner;
 
-            this.timeout = WindowsUtils.CreateSingleTickTimer(10000);
-            this.timeout.Tick += (sender, args) => screenshot.Reset();
+            this.timeout = new Timer{ Interval = 5000 };
+            this.timeout.Tick += timeout_Tick;
+
+            this.disposer = new Timer{ Interval = 1 };
+            this.disposer.Tick += disposer_Tick;
+        }
+
+        private void timeout_Tick(object sender, EventArgs e){
+            timeout.Stop();
+            screenshot.Location = ControlExtensions.InvisibleLocation;
+            disposer.Start();
+        }
+
+        private void disposer_Tick(object sender, EventArgs e){
+            disposer.Stop();
+            screenshot.Dispose();
+            screenshot = null;
         }
 
         public void Trigger(string html, int width, int height){
+            if (screenshot != null){
+                return;
+            }
+
+            screenshot = new FormNotificationScreenshotable(Callback, owner){
+                CanMoveWindow = () => false
+            };
+
             screenshot.LoadNotificationForScreenshot(new TweetNotification(html, string.Empty, 0), width, height);
             screenshot.Show();
             timeout.Start();
@@ -31,15 +55,23 @@ namespace TweetDck.Core.Notification.Screenshot{
             }
 
             timeout.Stop();
+            screenshot.TakeScreenshot();
 
-            browser.PauseNotification();
-            screenshot.TakeScreenshotAndHide();
-            browser.ResumeNotification();
+            #if !(DEBUG && NO_HIDE_SCREENSHOTS)
+            screenshot.Location = ControlExtensions.InvisibleLocation;
+            disposer.Start();
+            #else
+            screenshot.FormClosed += (sender, args) => disposer.Start();
+            #endif
         }
 
         public void Dispose(){
             timeout.Dispose();
+            disposer.Dispose();
+
+            if (screenshot != null){
                 screenshot.Dispose();
             }
         }
+    }
 }

Core/Notification/Sound/ISoundNotificationPlayer.cs

@@ -0,0 +1,12 @@
+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/Sound/PlaybackErrorEventArgs.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace TweetDck.Core.Notification.Sound{
+    sealed class PlaybackErrorEventArgs : EventArgs{
+        public string Message { get; private set; }
+        public bool Ignore { get; set; }
+
+        public PlaybackErrorEventArgs(string message){
+            this.Message = message;
+            this.Ignore = false;
+        }
+    }
+}

Core/Notification/Sound/SoundPlayerImplFallback.cs

@@ -0,0 +1,57 @@
+using System;
+using System.IO;
+using System.Media;
+
+namespace TweetDck.Core.Notification.Sound{
+    sealed class SoundPlayerImplFallback : ISoundNotificationPlayer{
+        string ISoundNotificationPlayer.SupportedFormats{
+            get{
+                return "*.wav";
+            }
+        }
+
+        public event EventHandler<PlaybackErrorEventArgs> PlaybackError;
+
+        private readonly SoundPlayer player;
+        private bool ignorePlaybackError;
+
+        public SoundPlayerImplFallback(){
+            player = new SoundPlayer{
+                LoadTimeout = 5000
+            };
+        }
+
+        void ISoundNotificationPlayer.Play(string file){
+            if (player.SoundLocation != file){
+                player.SoundLocation = file;
+                ignorePlaybackError = false;
+            }
+
+            try{
+                player.Play();
+            }catch(FileNotFoundException e){
+                OnNotificationSoundError("File not found: "+e.FileName);
+            }catch(InvalidOperationException){
+                OnNotificationSoundError("File format was not recognized.");
+            }catch(TimeoutException){
+                OnNotificationSoundError("File took too long to load.");
+            }
+        }
+
+        void ISoundNotificationPlayer.Stop(){
+            player.Stop();
+        }
+
+        void IDisposable.Dispose(){
+            player.Dispose();
+        }
+
+        private void OnNotificationSoundError(string message){
+            if (!ignorePlaybackError && PlaybackError != null){
+                PlaybackErrorEventArgs args = new PlaybackErrorEventArgs(message);
+                PlaybackError(this, args);
+                ignorePlaybackError = args.Ignore;
+            }
+        }
+    }
+}

Core/Notification/Sound/SoundPlayerImplWMP.cs

@@ -0,0 +1,109 @@
+using System;
+using System.Runtime.InteropServices;
+using TweetDck.Core.Utils;
+using WMPLib;
+
+namespace TweetDck.Core.Notification.Sound{
+    sealed class SoundPlayerImplWMP : ISoundNotificationPlayer{
+        string ISoundNotificationPlayer.SupportedFormats{
+            get{
+                return "*.wav;*.mp3;*.mp2;*.m4a;*.mid;*.midi;*.rmi;*.wma;*.aif;*.aifc;*.aiff;*.snd;*.au";
+            }
+        }
+
+        public event EventHandler<PlaybackErrorEventArgs> PlaybackError;
+
+        private readonly WindowsMediaPlayer player;
+        private bool wasTryingToPlay;
+        private bool ignorePlaybackError;
+
+        // changing the player volume also affects the value in the Windows mixer
+        // however, the initial value is always 50 or some other stupid shit
+        // so we have to tell the player to set its volume to whatever the mixer is set to
+        // using the most code required for the least functionality with a sorry excuse for an API
+        // thanks, Microsoft
+
+        public SoundPlayerImplWMP(){
+            player = new WindowsMediaPlayer();
+            player.settings.autoStart = false;
+            player.settings.enableErrorDialogs = false;
+            player.settings.invokeURLs = false;
+            player.settings.volume = (int)Math.Floor(100.0*NativeCoreAudio.GetMixerVolumeForCurrentProcess());
+            player.MediaChange += player_MediaChange;
+            player.MediaError += player_MediaError;
+        }
+
+        void ISoundNotificationPlayer.Play(string file){
+            wasTryingToPlay = true;
+
+            if (player.URL != file){
+                player.close();
+                player.URL = file;
+                ignorePlaybackError = false;
+            }
+            else{
+                player.controls.stop();
+            }
+            
+            player.controls.play();
+        }
+
+        void ISoundNotificationPlayer.Stop(){
+            player.controls.stop();
+        }
+
+        void IDisposable.Dispose(){
+            player.close();
+            Marshal.ReleaseComObject(player);
+        }
+
+        private void player_MediaChange(object item){
+            IWMPMedia2 media = item as IWMPMedia2;
+
+            if (media == null){
+                OnNotificationSoundError("Unknown error.");
+                return;
+            }
+            // ReSharper disable once CompareOfFloatsByEqualityOperator
+            else if (media.Error == null && media.duration == 0.0){
+                OnNotificationSoundError("File does not contain an audio track.");
+            }
+            else if (media.Error != null){
+                OnNotificationSoundError(media.Error);
+            }
+
+            Marshal.ReleaseComObject(media);
+        }
+
+        private void player_MediaError(object pMediaObject){
+            IWMPMedia2 media = pMediaObject as IWMPMedia2;
+
+            if (media == null){
+                OnNotificationSoundError("Unknown error.");
+                return;
+            }
+            else if (media.Error != null){
+                OnNotificationSoundError(media.Error);
+            }
+
+            Marshal.ReleaseComObject(media);
+        }
+
+        private void OnNotificationSoundError(IWMPErrorItem error){
+            OnNotificationSoundError(error.errorCode == -1072885353 ? "Invalid media file." : error.errorDescription);
+            Marshal.ReleaseComObject(error);
+        }
+
+        private void OnNotificationSoundError(string message){
+            if (wasTryingToPlay){
+                wasTryingToPlay = false;
+
+                if (!ignorePlaybackError && PlaybackError != null){
+                    PlaybackErrorEventArgs args = new PlaybackErrorEventArgs(message);
+                    PlaybackError(this, args);
+                    ignorePlaybackError = args.Ignore;
+                }
+            }
+        }
+    }
+}

Core/Notification/SoundNotification.cs

@@ -1,65 +1,27 @@
-using System;
-using System.Drawing;
-using System.IO;
-using System.Media;
-using System.Windows.Forms;
-using TweetDck.Core.Other;
+using System.Runtime.InteropServices;
+using TweetDck.Core.Notification.Sound;
 
 namespace TweetDck.Core.Notification{
-    class SoundNotification : IDisposable{
-        private readonly FormBrowser browserForm;
+    static class SoundNotification{
+        private static bool? IsWMPAvailable;
 
-        private SoundPlayer notificationSound;
-        private bool ignoreNotificationSoundError;
-
-        public SoundNotification(FormBrowser browserForm){
-            this.browserForm = browserForm;
+        public static ISoundNotificationPlayer New(){
+            if (IsWMPAvailable.HasValue){
+                if (IsWMPAvailable.Value){
+                    return new SoundPlayerImplWMP();
                 }
-
-        public void Play(string file){
-            if (notificationSound == null){
-                notificationSound = new SoundPlayer{
-                    LoadTimeout = 5000
-                };
+                else{
+                    return new SoundPlayerImplFallback();
                 }
-
-            if (notificationSound.SoundLocation != file){
-                notificationSound.SoundLocation = file;
-                ignoreNotificationSoundError = false;
             }
 
             try{
-                notificationSound.Play();
-            }catch(FileNotFoundException e){
-                OnNotificationSoundError("File not found: "+e.FileName);
-            }catch(InvalidOperationException){
-                OnNotificationSoundError("File is not a valid sound file.");
-            }catch(TimeoutException){
-                OnNotificationSoundError("File took too long to load.");
-            }
-        }
-
-        private void OnNotificationSoundError(string message){
-            if (!ignoreNotificationSoundError){
-                ignoreNotificationSoundError = true;
-
-                using(FormMessage form = new FormMessage("Notification Sound Error", "Could not play custom notification sound."+Environment.NewLine+message, MessageBoxIcon.Error)){
-                    form.AddButton("Ignore");
-
-                    Button btnOpenSettings = form.AddButton("Open Settings");
-                    btnOpenSettings.Width += 16;
-                    btnOpenSettings.Location = new Point(btnOpenSettings.Location.X-16, btnOpenSettings.Location.Y);
-
-                    if (form.ShowDialog() == DialogResult.OK && form.ClickedButton == btnOpenSettings){
-                        browserForm.OpenSettings(FormSettings.TabIndexNotification);
-                    }
-                }
-            }
-        }
-
-        public void Dispose(){
-            if (notificationSound != null){
-                notificationSound.Dispose();
+                SoundPlayerImplWMP implWMP = new SoundPlayerImplWMP();
+                IsWMPAvailable = true;
+                return implWMP;
+            }catch(COMException){
+                IsWMPAvailable = false;
+                return new SoundPlayerImplFallback();
             }
         }
     }

Core/Notification/TweetNotification.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Text;
+using TweetDck.Resources;
 
 namespace TweetDck.Core.Notification{
     sealed class TweetNotification{
@@ -8,9 +9,7 @@ namespace TweetDck.Core.Notification{
 
         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 FixedCSS = @"a[data-full-url]{word-break:break-all}.txt-base-smallest .badge-verified:before{height:13px!important}";
-        private const string CustomCSS = @".scroll-styled-v::-webkit-scrollbar{width:8px}.scroll-styled-v::-webkit-scrollbar-thumb{border-radius:0}#td-skip{opacity:0;cursor:pointer;transition:opacity 0.15s ease}.td-hover #td-skip{opacity:0.75}#td-skip:hover{opacity:1}";
+        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{
             get{
@@ -24,26 +23,19 @@ namespace TweetDck.Core.Notification{
             }
         }
 
+        private static string ExampleTweetHTML;
+
         public static TweetNotification ExampleTweet{
             get{
-                StringBuilder build = new StringBuilder();
-                build.Append(@"<article><div class='js-stream-item-content item-box js-show-detail'><div class='js-tweet tweet'>");
-                build.Append(@"<header class='tweet-header'>");
-                build.Append(@"<time class='tweet-timestamp js-timestamp pull-right txt-mute'><a target='_blank' rel='url' href='https://twitter.com/chylexmc' class='txt-small'>0s</a></time>");
-                build.Append(@"<a target='_blank' rel='user' href='https://twitter.com/chylexmc' class='account-link link-complex block'>");
-                build.Append(@"<div class='obj-left item-img tweet-img'><img width='48' height='48' alt='chylexmc's avatar' src='https://pbs.twimg.com/profile_images/765161905312980992/AhDP9iY-_normal.jpg' class='tweet-avatar avatar pull-right'></div>");
-                build.Append(@"<div class='nbfc'><span class='account-inline txt-ellipsis'><b class='fullname link-complex-target'>chylex</b> <span class='username txt-mute'>@chylexmc</span></span></div>");
-                build.Append(@"</a>");
-                build.Append(@"</header>");
-                build.Append(@"<div class='tweet-body'><p class='js-tweet-text tweet-text with-linebreaks'>This is an example tweet, which lets you test the location and duration of popup notifications.</p></div>");
+                if (ExampleTweetHTML == null){
+                    ExampleTweetHTML = ScriptLoader.LoadResource("pages/example.html", true);
 
                     #if DEBUG
-                build.Append(@"<div style='margin-top:64px'>Scrollbar test padding...</div>");
+                    ExampleTweetHTML = ExampleTweetHTML.Replace("</p>", @"</p><div style='margin-top:64px'>Scrollbar test padding...</div>");
                     #endif
+                }
 
-                build.Append(@"</div></div></article>");
-
-                return new TweetNotification(build.ToString(), "", 95, true);
+                return new TweetNotification(ExampleTweetHTML, "", 95, true);
             }
         }
 
@@ -90,26 +82,23 @@ namespace TweetDck.Core.Notification{
             build.Append("<head>").Append(HeadTag ?? DefaultHeadTag);
             
             if (enableCustomCSS){
-                build.Append("<style type='text/css'>").Append(FixedCSS).Append(CustomCSS).Append("</style>");
+                build.Append("<style type='text/css'>").Append(CustomCSS).Append("</style>");
 
                 if (!string.IsNullOrEmpty(Program.UserConfig.CustomNotificationCSS)){
                     build.Append("<style type='text/css'>").Append(Program.UserConfig.CustomNotificationCSS).Append("</style>");
                 }
             }
-            else{
-                build.Append("<style type='text/css'>").Append(FixedCSS).Append("</style>");
-            }
             
             build.Append("</head>");
-            build.Append("<body class='hearty");
+            build.Append("<body class='hearty scroll-styled-v");
 
             if (!string.IsNullOrEmpty(bodyClasses)){
                 build.Append(' ').Append(bodyClasses);
             }
 
-            build.Append('\'').Append(isExample ? " td-example-notification" : "").Append("><div class='app-columns-container'><div class='column scroll-styled-v' style='width:100%;overflow-y:auto'>");
+            build.Append('\'').Append(isExample ? " td-example-notification" : "").Append("><div class='column' style='width:100%;height:auto;overflow:initial;'>");
             build.Append(html);
-            build.Append("</div></div></body>");
+            build.Append("</div></body>");
             build.Append("</html>");
             return build.ToString();
         }

Core/Other/FormAbout.cs

@@ -19,7 +19,7 @@ namespace TweetDck.Core.Other{
         }
 
         private void OnLinkClicked(object sender, LinkLabelLinkClickedEventArgs e){
-            BrowserUtils.OpenExternalBrowser(e.Link.LinkData as string);
+            BrowserUtils.OpenExternalBrowserUnsafe(e.Link.LinkData as string);
         }
     }
 }

Core/Other/FormMessage.Designer.cs

@@ -33,7 +33,7 @@
             this.panelActions.Dock = System.Windows.Forms.DockStyle.Bottom;
             this.panelActions.Location = new System.Drawing.Point(0, 84);
             this.panelActions.Name = "panelActions";
-            this.panelActions.Size = new System.Drawing.Size(233, 49);
+            this.panelActions.Size = new System.Drawing.Size(98, 49);
             this.panelActions.TabIndex = 0;
             // 
             // labelMessage
@@ -66,6 +66,7 @@
             this.Name = "FormMessage";
             this.ShowIcon = false;
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.SizeChanged += new System.EventHandler(this.FormMessage_SizeChanged);
             this.ResumeLayout(false);
             this.PerformLayout();
 

Core/Other/FormMessage.cs

@@ -6,6 +6,22 @@ namespace TweetDck.Core.Other{
     sealed partial class FormMessage : Form{
         public Button ClickedButton { get; private set; }
 
+        public int ActionPanelY{
+            get{
+                return panelActions.Location.Y;
+            }
+        }
+
+        private int ClientWidth{
+            get{
+                return ClientSize.Width;
+            }
+
+            set{
+                ClientSize = new Size(value, ClientSize.Height);
+            }
+        }
+
         private readonly Icon icon;
         private readonly bool isReady;
 
@@ -19,7 +35,7 @@ namespace TweetDck.Core.Other{
 
             this.prevLabelWidth = labelMessage.Width;
             this.prevLabelHeight = labelMessage.Height;
-            this.minFormWidth = 18;
+            this.minFormWidth = 40;
 
             switch(messageIcon){
                 case MessageBoxIcon.Information:
@@ -40,7 +56,7 @@ namespace TweetDck.Core.Other{
 
                 default:
                     icon = null;
-                    labelMessage.Location = new Point(labelMessage.Location.X-37, labelMessage.Location.Y);
+                    labelMessage.Location = new Point(labelMessage.Location.X-38, labelMessage.Location.Y);
                     break;
             }
 
@@ -50,11 +66,15 @@ namespace TweetDck.Core.Other{
             this.labelMessage.Text = text;
         }
 
-        public Button AddButton(string title){
+        private void FormMessage_SizeChanged(object sender, EventArgs e){
+            RecalculateButtonLocation();
+        }
+
+        public Button AddButton(string title, DialogResult result = DialogResult.OK){
             Button button = new Button{
-                Anchor = AnchorStyles.Bottom | AnchorStyles.Right,
+                Anchor = AnchorStyles.Bottom,
                 Font = SystemFonts.MessageBoxFont,
-                Location = new Point(Width-112-buttonCount*96, 12),
+                Location = new Point(0, 12),
                 Size = new Size(88, 26),
                 TabIndex = buttonCount,
                 Text = title,
@@ -63,16 +83,17 @@ namespace TweetDck.Core.Other{
 
             button.Click += (sender, args) => {
                 ClickedButton = (Button)sender;
-                DialogResult = DialogResult.OK;
+                DialogResult = result;
                 Close();
             };
 
             panelActions.Controls.Add(button);
+            ++buttonCount;
 
             minFormWidth += 96;
-            Width = Math.Max(realFormWidth, minFormWidth);
+            ClientWidth = Math.Max(realFormWidth, minFormWidth);
+            RecalculateButtonLocation();
 
-            ++buttonCount;
             return button;
         }
 
@@ -80,7 +101,14 @@ namespace TweetDck.Core.Other{
             panelActions.Controls.Add(control);
 
             minFormWidth += control.Width+control.Margin.Horizontal;
-            Width = Math.Max(realFormWidth, minFormWidth);
+            ClientWidth = Math.Max(realFormWidth, minFormWidth);
+        }
+        
+        private void RecalculateButtonLocation(){
+            for(int index = 0; index < buttonCount; index++){
+                Control control = panelActions.Controls[index];
+                control.Location = new Point(ClientWidth-97-index*96, control.Location.Y);
+            }
         }
 
         private void labelMessage_SizeChanged(object sender, EventArgs e){
@@ -99,8 +127,8 @@ namespace TweetDck.Core.Other{
                 prevLabelHeight -= 8;
             }
 
-            realFormWidth = Width-(icon == null ? 32+35+(labelMessage.Margin.Left-labelMessage.Margin.Right) : 0)+labelMessage.Margin.Right+labelMessage.Width-prevLabelWidth;
-            Width = Math.Max(realFormWidth, minFormWidth);
+            realFormWidth = ClientWidth-(icon == null ? 50 : 0)+labelMessage.Width-prevLabelWidth;
+            ClientWidth = Math.Max(realFormWidth, minFormWidth);
             Height += labelMessage.Height-prevLabelHeight;
 
             prevLabelWidth = labelMessage.Width;

Core/Other/FormPlugins.cs

@@ -36,17 +36,19 @@ namespace TweetDck.Core.Other{
             this.tabBtnOfficial = tabPanelPlugins.AddButton("", () => SelectGroup(PluginGroup.Official));
             this.tabBtnCustom = tabPanelPlugins.AddButton("", () => SelectGroup(PluginGroup.Custom));
 
-            this.tabPanelPlugins.SelectTab(tabBtnOfficial);
             this.pluginManager_Reloaded(pluginManager, null);
 
             Shown += (sender, args) => {
                 Program.UserConfig.PluginsWindow.Restore(this, false);
+                this.tabPanelPlugins.SelectTab(tabBtnOfficial);
             };
 
             FormClosed += (sender, args) => {
                 Program.UserConfig.PluginsWindow.Save(this);
                 Program.UserConfig.Save();
             };
+
+            Disposed += (sender, args) => this.pluginManager.Reloaded -= pluginManager_Reloaded;
         }
 
         private void SelectGroup(PluginGroup group){
@@ -76,11 +78,11 @@ namespace TweetDck.Core.Other{
                 }
             }
 
-            flowLayoutPlugins_Resize(flowLayoutPlugins, new EventArgs());
             flowLayoutPlugins.ResumeLayout(true);
+            flowLayoutPlugins_Resize(flowLayoutPlugins, new EventArgs());
         }
 
-        private void pluginManager_Reloaded(object sender, PluginLoadEventArgs e){
+        private void pluginManager_Reloaded(object sender, PluginErrorEventArgs e){
             tabBtnOfficial.Text = "Official: "+pluginManager.CountPluginByGroup(PluginGroup.Official);
             tabBtnCustom.Text = "Custom: "+pluginManager.CountPluginByGroup(PluginGroup.Custom);
         }

Core/Other/FormSettings.cs

@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Windows.Forms;
-using TweetDck.Core.Notification;
 using TweetDck.Core.Other.Settings;
 using TweetDck.Plugins;
 using TweetDck.Updates;
@@ -13,7 +12,6 @@ namespace TweetDck.Core.Other{
 
         private readonly FormBrowser browser;
         private readonly Dictionary<Type, BaseTabSettings> tabs = new Dictionary<Type, BaseTabSettings>(4);
-        private readonly bool hasFinishedLoading;
 
         public FormSettings(FormBrowser browser, PluginManager plugins, UpdateHandler updates, int startTabIndex = 0){
             InitializeComponent();
@@ -24,17 +22,12 @@ namespace TweetDck.Core.Other{
             this.browser.PauseNotification();
 
             this.tabPanel.SetupTabPanel(100);
-            this.tabPanel.AddButton("General", SelectTab<TabSettingsGeneral>);
-            this.tabPanel.AddButton("Notifications", () => SelectTab(() => new TabSettingsNotifications(browser.CreateNotificationForm(NotificationFlags.DisableContextMenu), !hasFinishedLoading)));
-            this.tabPanel.AddButton("Updates", () => SelectTab(() => new TabSettingsUpdates(updates)));
+            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));
-            hasFinishedLoading = true;
-        }
-
-        private void SelectTab<T>() where T : BaseTabSettings, new(){
-            SelectTab(() => new T());
         }
 
         private void SelectTab<T>(Func<T> constructor) where T : BaseTabSettings{
@@ -45,7 +38,7 @@ namespace TweetDck.Core.Other{
             }
             else{
                 control = tabs[typeof(T)] = constructor();
-                control.Ready = true;
+                control.OnReady();
                 tabPanel.ReplaceContent(control);
             }
         }

Core/Other/Settings/BaseTabSettings.cs

@@ -9,12 +9,11 @@ namespace TweetDck.Core.Other.Settings{
             }
         }
 
-        public bool Ready { get; set; }
-
         public BaseTabSettings(){
             Padding = new Padding(6);
         }
 
+        public virtual void OnReady(){}
         public virtual void OnClosing(){}
 
         protected static void PromptRestart(){

Core/Other/Settings/Dialogs/DialogSettingsCSS.cs

@@ -44,7 +44,7 @@ namespace TweetDck.Core.Other.Settings.Dialogs{
         }
 
         private void btnOpenWiki_Click(object sender, EventArgs e){
-            BrowserUtils.OpenExternalBrowser("https://github.com/chylex/TweetDuck/wiki");
+            BrowserUtils.OpenExternalBrowserUnsafe("https://github.com/chylex/TweetDuck/wiki");
         }
 
         private void btnApply_Click(object sender, EventArgs e){

Core/Other/Settings/Dialogs/DialogSettingsCefArgs.cs

@@ -22,7 +22,7 @@ namespace TweetDck.Core.Other.Settings.Dialogs{
         }
 
         private void btnHelp_Click(object sender, EventArgs e){
-            BrowserUtils.OpenExternalBrowser("http://peter.sh/experiments/chromium-command-line-switches/");
+            BrowserUtils.OpenExternalBrowserUnsafe("http://peter.sh/experiments/chromium-command-line-switches/");
         }
 
         private void btnApply_Click(object sender, EventArgs e){

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

@@ -49,11 +49,13 @@
             // 
             this.btnApply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
             this.btnApply.AutoSize = true;
-            this.btnApply.Location = new System.Drawing.Point(117, 97);
+            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(53, 23);
+            this.btnApply.Size = new System.Drawing.Size(26, 23);
             this.btnApply.TabIndex = 1;
+            this.btnApply.Text = " ";
             this.btnApply.UseVisualStyleBackColor = true;
             this.btnApply.Click += new System.EventHandler(this.btnApply_Click);
             // 
@@ -105,6 +107,8 @@
             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;

Core/Other/Settings/Dialogs/DialogSettingsExport.cs

@@ -18,30 +18,28 @@ namespace TweetDck.Core.Other.Settings.Dialogs{
             }
 
             set{
-                selectedFlags = value;
-                btnApply.Enabled = selectedFlags != ExportFileFlags.None;
-
-                cbConfig.Checked = selectedFlags.HasFlag(ExportFileFlags.Config);
-                cbSession.Checked = selectedFlags.HasFlag(ExportFileFlags.Session);
-                cbPluginData.Checked = selectedFlags.HasFlag(ExportFileFlags.PluginData);
+                // 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();
 
-            bool isExporting = importFlags == ExportFileFlags.None;
+            this.isExporting = importFlags == ExportFileFlags.None;
 
             if (isExporting){
                 Text = "Export Profile";
-                btnApply.Text = "Export";
+                btnApply.Text = "Export Profile";
                 Flags = ExportFileFlags.All & ~ExportFileFlags.Session;
             }
             else{
                 Text = "Import Profile";
-                btnApply.Text = "Import";
                 Flags = importFlags;
 
                 cbConfig.Enabled = cbConfig.Checked;
@@ -53,6 +51,10 @@ namespace TweetDck.Core.Other.Settings.Dialogs{
         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){

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

@@ -0,0 +1,161 @@
+namespace TweetDck.Core.Other.Settings.Dialogs {
+    partial class DialogSettingsRestart {
+        /// <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.btnRestart = new System.Windows.Forms.Button();
+            this.cbLogging = new System.Windows.Forms.CheckBox();
+            this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+            this.cbDebugUpdates = new System.Windows.Forms.CheckBox();
+            this.labelLocale = new System.Windows.Forms.Label();
+            this.comboLocale = new System.Windows.Forms.ComboBox();
+            this.labelDataFolder = new System.Windows.Forms.Label();
+            this.tbDataFolder = new System.Windows.Forms.TextBox();
+            this.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(160, 171);
+            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 = 1;
+            this.btnCancel.Text = "Cancel";
+            this.btnCancel.UseVisualStyleBackColor = true;
+            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+            // 
+            // 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);
+            this.btnRestart.Size = new System.Drawing.Size(57, 23);
+            this.btnRestart.TabIndex = 2;
+            this.btnRestart.Text = "Restart";
+            this.btnRestart.UseVisualStyleBackColor = true;
+            this.btnRestart.Click += new System.EventHandler(this.btnRestart_Click);
+            // 
+            // cbLogging
+            // 
+            this.cbLogging.AutoSize = true;
+            this.cbLogging.Location = new System.Drawing.Point(12, 12);
+            this.cbLogging.Name = "cbLogging";
+            this.cbLogging.Size = new System.Drawing.Size(64, 17);
+            this.cbLogging.TabIndex = 3;
+            this.cbLogging.Text = "Logging";
+            this.toolTip.SetToolTip(this.cbLogging, "Logging JavaScript output into a\r\ndebug.txt file in the data folder.");
+            this.cbLogging.UseVisualStyleBackColor = true;
+            // 
+            // cbDebugUpdates
+            // 
+            this.cbDebugUpdates.AutoSize = true;
+            this.cbDebugUpdates.Location = new System.Drawing.Point(12, 35);
+            this.cbDebugUpdates.Name = "cbDebugUpdates";
+            this.cbDebugUpdates.Size = new System.Drawing.Size(127, 17);
+            this.cbDebugUpdates.TabIndex = 4;
+            this.cbDebugUpdates.Text = "Pre-Release Updates";
+            this.toolTip.SetToolTip(this.cbDebugUpdates, "Allows updating to pre-releases.");
+            this.cbDebugUpdates.UseVisualStyleBackColor = true;
+            // 
+            // labelLocale
+            // 
+            this.labelLocale.AutoSize = true;
+            this.labelLocale.Location = new System.Drawing.Point(12, 67);
+            this.labelLocale.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
+            this.labelLocale.Name = "labelLocale";
+            this.labelLocale.Size = new System.Drawing.Size(39, 13);
+            this.labelLocale.TabIndex = 5;
+            this.labelLocale.Text = "Locale";
+            // 
+            // comboLocale
+            // 
+            this.comboLocale.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.comboLocale.FormattingEnabled = true;
+            this.comboLocale.Location = new System.Drawing.Point(15, 83);
+            this.comboLocale.Name = "comboLocale";
+            this.comboLocale.Size = new System.Drawing.Size(201, 21);
+            this.comboLocale.TabIndex = 6;
+            // 
+            // labelDataFolder
+            // 
+            this.labelDataFolder.AutoSize = true;
+            this.labelDataFolder.Location = new System.Drawing.Point(12, 119);
+            this.labelDataFolder.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
+            this.labelDataFolder.Name = "labelDataFolder";
+            this.labelDataFolder.Size = new System.Drawing.Size(62, 13);
+            this.labelDataFolder.TabIndex = 7;
+            this.labelDataFolder.Text = "Data Folder";
+            // 
+            // tbDataFolder
+            // 
+            this.tbDataFolder.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.tbDataFolder.Location = new System.Drawing.Point(15, 135);
+            this.tbDataFolder.Name = "tbDataFolder";
+            this.tbDataFolder.Size = new System.Drawing.Size(201, 20);
+            this.tbDataFolder.TabIndex = 8;
+            // 
+            // DialogSettingsRestart
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.ClientSize = new System.Drawing.Size(228, 206);
+            this.Controls.Add(this.tbDataFolder);
+            this.Controls.Add(this.labelDataFolder);
+            this.Controls.Add(this.comboLocale);
+            this.Controls.Add(this.labelLocale);
+            this.Controls.Add(this.cbDebugUpdates);
+            this.Controls.Add(this.cbLogging);
+            this.Controls.Add(this.btnRestart);
+            this.Controls.Add(this.btnCancel);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "DialogSettingsRestart";
+            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 btnRestart;
+        private System.Windows.Forms.CheckBox cbLogging;
+        private System.Windows.Forms.ToolTip toolTip;
+        private System.Windows.Forms.CheckBox cbDebugUpdates;
+        private System.Windows.Forms.Label labelLocale;
+        private System.Windows.Forms.ComboBox comboLocale;
+        private System.Windows.Forms.Label labelDataFolder;
+        private System.Windows.Forms.TextBox tbDataFolder;
+    }
+}

Core/Other/Settings/Dialogs/DialogSettingsRestart.cs

@@ -0,0 +1,62 @@
+using System;
+using System.IO;
+using System.Linq;
+using System.Windows.Forms;
+using TweetDck.Configuration;
+using TweetDck.Core.Utils;
+
+namespace TweetDck.Core.Other.Settings.Dialogs{
+    sealed partial class DialogSettingsRestart : Form{
+        private const string DefaultLocale = "en-US";
+
+        public CommandLineArgs Args { get; private set; }
+
+        public DialogSettingsRestart(CommandLineArgs currentArgs){
+            InitializeComponent();
+
+            try{
+                object[] locales = Directory.EnumerateFiles(Path.Combine(Program.ProgramPath, "locales"), "*.pak", SearchOption.TopDirectoryOnly).Select(Path.GetFileNameWithoutExtension).ToArray<object>();
+                comboLocale.Items.AddRange(locales);
+            }catch{
+                comboLocale.Items.Add(DefaultLocale);
+            }
+
+            cbLogging.Checked = currentArgs.HasFlag(Arguments.ArgLogging);
+            cbDebugUpdates.Checked = currentArgs.HasFlag(Arguments.ArgDebugUpdates);
+            comboLocale.SelectedItem = currentArgs.GetValue(Arguments.ArgLocale, DefaultLocale);
+            tbDataFolder.Text = currentArgs.GetValue(Arguments.ArgDataFolder, string.Empty);
+
+            Text = Program.BrandName+" Arguments";
+        }
+
+        private void btnRestart_Click(object sender, EventArgs e){
+            Args = new CommandLineArgs();
+            
+            if (cbLogging.Checked){
+                Args.AddFlag(Arguments.ArgLogging);
+            }
+            
+            if (cbDebugUpdates.Checked){
+                Args.AddFlag(Arguments.ArgDebugUpdates);
+            }
+
+            string locale = comboLocale.SelectedItem as string;
+
+            if (!string.IsNullOrWhiteSpace(locale) && locale != DefaultLocale){
+                Args.SetValue(Arguments.ArgLocale, locale);
+            }
+
+            if (!string.IsNullOrWhiteSpace(tbDataFolder.Text)){
+                Args.SetValue(Arguments.ArgDataFolder, tbDataFolder.Text);
+            }
+
+            DialogResult = DialogResult.OK;
+            Close();
+        }
+
+        private void btnCancel_Click(object sender, EventArgs e){
+            DialogResult = DialogResult.Cancel;
+            Close();
+        }
+    }
+}

Core/Other/Settings/Export/ExportManager.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
+using TweetDck.Configuration;
 using TweetDck.Plugins;
 using TweetDck.Plugins.Enums;
 
@@ -98,7 +99,6 @@ namespace TweetDck.Core.Other.Settings.Export{
                             case "config":
                                 if (flags.HasFlag(ExportFileFlags.Config)){
                                     entry.WriteToFile(Program.ConfigFilePath);
-                                    Program.ReloadConfig();
                                 }
 
                                 break;
@@ -117,7 +117,7 @@ namespace TweetDck.Core.Other.Settings.Export{
                                 break;
 
                             case "cookies":
-                                if (flags.HasFlag(ExportFileFlags.Session) && MessageBox.Show("Do you want to import the login session? This will restart "+Program.BrandName+".", "Importing "+Program.BrandName+" Profile", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) == DialogResult.Yes){
+                                if (flags.HasFlag(ExportFileFlags.Session)){
                                     entry.WriteToFile(Path.Combine(Program.StoragePath, TempCookiesPath));
                                     IsRestarting = true;
                                 }
@@ -132,10 +132,10 @@ namespace TweetDck.Core.Other.Settings.Export{
                 }
 
                 if (IsRestarting){
-                    Program.Restart(new string[]{ "-importcookies" });
+                    Program.Restart(new string[]{ Arguments.ArgImportCookies });
                 }
                 else{
-                    plugins.Reload();
+                    Program.ReloadConfig();
                 }
 
                 return true;

Core/Other/Settings/TabSettingsAdvanced.Designer.cs

@@ -29,7 +29,7 @@
             this.toolTip = new System.Windows.Forms.ToolTip(this.components);
             this.btnEditCefArgs = new System.Windows.Forms.Button();
             this.btnEditCSS = new System.Windows.Forms.Button();
-            this.btnRestartLog = new System.Windows.Forms.Button();
+            this.btnRestartArgs = new System.Windows.Forms.Button();
             this.btnRestart = new System.Windows.Forms.Button();
             this.btnOpenAppFolder = new System.Windows.Forms.Button();
             this.btnOpenDataFolder = new System.Windows.Forms.Button();
@@ -54,7 +54,6 @@
             this.toolTip.SetToolTip(this.btnClearCache, "Clearing cache will free up space taken by downloaded images and other resources." +
         "");
             this.btnClearCache.UseVisualStyleBackColor = true;
-            this.btnClearCache.Click += new System.EventHandler(this.btnClearCache_Click);
             // 
             // checkHardwareAcceleration
             // 
@@ -68,7 +67,6 @@
             this.toolTip.SetToolTip(this.checkHardwareAcceleration, "Uses your graphics card to improve performance.\r\nDisable if you experience issues" +
         " with rendering.");
             this.checkHardwareAcceleration.UseVisualStyleBackColor = true;
-            this.checkHardwareAcceleration.CheckedChanged += new System.EventHandler(this.checkHardwareAcceleration_CheckedChanged);
             // 
             // btnEditCefArgs
             // 
@@ -79,7 +77,6 @@
             this.btnEditCefArgs.Text = "Edit CEF Arguments";
             this.toolTip.SetToolTip(this.btnEditCefArgs, "Set custom command line arguments for Chromium Embedded Framework.");
             this.btnEditCefArgs.UseVisualStyleBackColor = true;
-            this.btnEditCefArgs.Click += new System.EventHandler(this.btnEditCefArgs_Click);
             // 
             // btnEditCSS
             // 
@@ -90,19 +87,16 @@
             this.btnEditCSS.Text = "Edit CSS";
             this.toolTip.SetToolTip(this.btnEditCSS, "Set custom CSS for browser and notification windows.");
             this.btnEditCSS.UseVisualStyleBackColor = true;
-            this.btnEditCSS.Click += new System.EventHandler(this.btnEditCSS_Click);
             // 
-            // btnRestartLog
+            // btnRestartArgs
             // 
-            this.btnRestartLog.Location = new System.Drawing.Point(6, 106);
-            this.btnRestartLog.Name = "btnRestartLog";
-            this.btnRestartLog.Size = new System.Drawing.Size(171, 23);
-            this.btnRestartLog.TabIndex = 18;
-            this.btnRestartLog.Text = "Restart with Logging";
-            this.toolTip.SetToolTip(this.btnRestartLog, "Restarts the program and enables logging\r\ninto a debug.txt file in the data folde" +
-        "r.");
-            this.btnRestartLog.UseVisualStyleBackColor = true;
-            this.btnRestartLog.Click += new System.EventHandler(this.btnRestartLog_Click);
+            this.btnRestartArgs.Location = new System.Drawing.Point(6, 106);
+            this.btnRestartArgs.Name = "btnRestartArgs";
+            this.btnRestartArgs.Size = new System.Drawing.Size(171, 23);
+            this.btnRestartArgs.TabIndex = 18;
+            this.btnRestartArgs.Text = "Restart with Arguments";
+            this.toolTip.SetToolTip(this.btnRestartArgs, "Restarts the program with customizable\r\ncommand line arguments.");
+            this.btnRestartArgs.UseVisualStyleBackColor = true;
             // 
             // btnRestart
             // 
@@ -114,7 +108,6 @@
             this.toolTip.SetToolTip(this.btnRestart, "Restarts the program using the same command\r\nline arguments that were used at lau" +
         "nch.");
             this.btnRestart.UseVisualStyleBackColor = true;
-            this.btnRestart.Click += new System.EventHandler(this.btnRestart_Click);
             // 
             // btnOpenAppFolder
             // 
@@ -125,7 +118,6 @@
             this.btnOpenAppFolder.Text = "Open Program Folder";
             this.toolTip.SetToolTip(this.btnOpenAppFolder, "Opens the folder where the app is located.");
             this.btnOpenAppFolder.UseVisualStyleBackColor = true;
-            this.btnOpenAppFolder.Click += new System.EventHandler(this.btnOpenAppFolder_Click);
             // 
             // btnOpenDataFolder
             // 
@@ -136,7 +128,6 @@
             this.btnOpenDataFolder.Text = "Open Data Folder";
             this.toolTip.SetToolTip(this.btnOpenDataFolder, "Opens the folder where your profile data is located.");
             this.btnOpenDataFolder.UseVisualStyleBackColor = true;
-            this.btnOpenDataFolder.Click += new System.EventHandler(this.btnOpenDataFolder_Click);
             // 
             // btnReset
             // 
@@ -149,7 +140,6 @@
             this.btnReset.TabIndex = 17;
             this.btnReset.Text = "Restore Defaults";
             this.btnReset.UseVisualStyleBackColor = true;
-            this.btnReset.Click += new System.EventHandler(this.btnReset_Click);
             // 
             // btnImport
             // 
@@ -162,7 +152,6 @@
             this.btnImport.TabIndex = 16;
             this.btnImport.Text = "Import Profile";
             this.btnImport.UseVisualStyleBackColor = true;
-            this.btnImport.Click += new System.EventHandler(this.btnImport_Click);
             // 
             // btnExport
             // 
@@ -176,7 +165,6 @@
             this.btnExport.TabIndex = 15;
             this.btnExport.Text = "Export Profile";
             this.btnExport.UseVisualStyleBackColor = true;
-            this.btnExport.Click += new System.EventHandler(this.btnExport_Click);
             // 
             // groupPerformance
             // 
@@ -204,7 +192,7 @@
             // 
             this.groupApp.Controls.Add(this.btnOpenDataFolder);
             this.groupApp.Controls.Add(this.btnOpenAppFolder);
-            this.groupApp.Controls.Add(this.btnRestartLog);
+            this.groupApp.Controls.Add(this.btnRestartArgs);
             this.groupApp.Controls.Add(this.btnRestart);
             this.groupApp.Location = new System.Drawing.Point(198, 9);
             this.groupApp.Name = "groupApp";
@@ -247,7 +235,7 @@
         private System.Windows.Forms.Button btnEditCefArgs;
         private System.Windows.Forms.Button btnEditCSS;
         private System.Windows.Forms.GroupBox groupApp;
-        private System.Windows.Forms.Button btnRestartLog;
+        private System.Windows.Forms.Button btnRestartArgs;
         private System.Windows.Forms.Button btnRestart;
         private System.Windows.Forms.Button btnOpenAppFolder;
         private System.Windows.Forms.Button btnOpenDataFolder;

Core/Other/Settings/TabSettingsAdvanced.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Diagnostics;
 using System.Windows.Forms;
+using TweetDck.Configuration;
 using TweetDck.Core.Controls;
 using TweetDck.Core.Other.Settings.Dialogs;
 using TweetDck.Core.Other.Settings.Export;
@@ -30,9 +31,24 @@ namespace TweetDck.Core.Other.Settings{
             }));
         }
 
-        private void btnClearCache_Click(object sender, EventArgs e){
-            if (!Ready)return;
+        public override void OnReady(){
+            btnClearCache.Click += btnClearCache_Click;
+            checkHardwareAcceleration.CheckedChanged += checkHardwareAcceleration_CheckedChanged;
 
+            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;
+            btnRestartArgs.Click += btnRestartArgs_Click;
+        }
+
+        private void btnClearCache_Click(object sender, EventArgs e){
             btnClearCache.Enabled = false;
             BrowserCache.SetClearOnExit();
 
@@ -40,8 +56,6 @@ namespace TweetDck.Core.Other.Settings{
         }
 
         private void checkHardwareAcceleration_CheckedChanged(object sender, EventArgs e){
-            if (!Ready)return;
-
             bool succeeded = false;
 
             if (checkHardwareAcceleration.Checked){
@@ -184,8 +198,12 @@ namespace TweetDck.Core.Other.Settings{
             Program.Restart();
         }
 
-        private void btnRestartLog_Click(object sender, EventArgs e){
-            Program.Restart(new string[]{ "-log" });
+        private void btnRestartArgs_Click(object sender, EventArgs e){
+            using(DialogSettingsRestart dialog = new DialogSettingsRestart(Arguments.GetCurrentClean())){
+                if (dialog.ShowDialog() == DialogResult.OK){
+                    Program.RestartWithArgs(dialog.Args);
+                }
+            }
         }
     }
 }

Core/Other/Settings/TabSettingsGeneral.Designer.cs

@@ -33,8 +33,12 @@
             this.groupTray = new System.Windows.Forms.GroupBox();
             this.labelTrayIcon = new System.Windows.Forms.Label();
             this.groupInterface = new System.Windows.Forms.GroupBox();
+            this.groupUpdates = new System.Windows.Forms.GroupBox();
+            this.checkUpdateNotifications = new System.Windows.Forms.CheckBox();
+            this.btnCheckUpdates = new System.Windows.Forms.Button();
             this.groupTray.SuspendLayout();
             this.groupInterface.SuspendLayout();
+            this.groupUpdates.SuspendLayout();
             this.SuspendLayout();
             // 
             // checkExpandLinks
@@ -49,7 +53,6 @@
             this.toolTip.SetToolTip(this.checkExpandLinks, "Expands links inside the tweets. If disabled,\r\nthe full links show up in a toolti" +
         "p instead.");
             this.checkExpandLinks.UseVisualStyleBackColor = true;
-            this.checkExpandLinks.CheckedChanged += new System.EventHandler(this.checkExpandLinks_CheckedChanged);
             // 
             // comboBoxTrayType
             // 
@@ -60,7 +63,6 @@
             this.comboBoxTrayType.Size = new System.Drawing.Size(171, 21);
             this.comboBoxTrayType.TabIndex = 13;
             this.toolTip.SetToolTip(this.comboBoxTrayType, "Changes behavior of the Tray icon.\r\nRight-click the icon for an action menu.");
-            this.comboBoxTrayType.SelectedIndexChanged += new System.EventHandler(this.comboBoxTrayType_SelectedIndexChanged);
             // 
             // checkTrayHighlight
             // 
@@ -74,7 +76,6 @@
             this.toolTip.SetToolTip(this.checkTrayHighlight, "Highlights the tray icon if there are new tweets.\r\nOnly works for columns with po" +
         "pup or audio notifications.\r\nThe icon resets when the main window is restored.");
             this.checkTrayHighlight.UseVisualStyleBackColor = true;
-            this.checkTrayHighlight.CheckedChanged += new System.EventHandler(this.checkTrayHighlight_CheckedChanged);
             // 
             // checkSpellCheck
             // 
@@ -86,7 +87,6 @@
             this.checkSpellCheck.Text = "Enable Spell Check";
             this.toolTip.SetToolTip(this.checkSpellCheck, "Underlines words that are spelled incorrectly.");
             this.checkSpellCheck.UseVisualStyleBackColor = true;
-            this.checkSpellCheck.CheckedChanged += new System.EventHandler(this.checkSpellCheck_CheckedChanged);
             // 
             // checkScreenshotBorder
             // 
@@ -96,9 +96,9 @@
             this.checkScreenshotBorder.Size = new System.Drawing.Size(169, 17);
             this.checkScreenshotBorder.TabIndex = 16;
             this.checkScreenshotBorder.Text = "Include Border In Screenshots";
-            this.toolTip.SetToolTip(this.checkScreenshotBorder, "Shows the window border in tweet screenshots.");
+            this.toolTip.SetToolTip(this.checkScreenshotBorder, "Shows the window border in tweet screenshots.\r\nMay be glitchy in some cases, espe" +
+        "cially on Windows 10.");
             this.checkScreenshotBorder.UseVisualStyleBackColor = true;
-            this.checkScreenshotBorder.CheckedChanged += new System.EventHandler(this.checkScreenshotBorder_CheckedChanged);
             // 
             // groupTray
             // 
@@ -134,10 +134,45 @@
             this.groupInterface.TabStop = false;
             this.groupInterface.Text = "User Interface";
             // 
+            // groupUpdates
+            // 
+            this.groupUpdates.Controls.Add(this.checkUpdateNotifications);
+            this.groupUpdates.Controls.Add(this.btnCheckUpdates);
+            this.groupUpdates.Location = new System.Drawing.Point(198, 9);
+            this.groupUpdates.Name = "groupUpdates";
+            this.groupUpdates.Size = new System.Drawing.Size(183, 75);
+            this.groupUpdates.TabIndex = 17;
+            this.groupUpdates.TabStop = false;
+            this.groupUpdates.Text = "Updates";
+            // 
+            // checkUpdateNotifications
+            // 
+            this.checkUpdateNotifications.AutoSize = true;
+            this.checkUpdateNotifications.Location = new System.Drawing.Point(6, 21);
+            this.checkUpdateNotifications.Margin = new System.Windows.Forms.Padding(3, 5, 3, 3);
+            this.checkUpdateNotifications.Name = "checkUpdateNotifications";
+            this.checkUpdateNotifications.Size = new System.Drawing.Size(165, 17);
+            this.checkUpdateNotifications.TabIndex = 14;
+            this.checkUpdateNotifications.Text = "Check Updates Automatically";
+            this.toolTip.SetToolTip(this.checkUpdateNotifications, "Checks for updates every hour.\r\nIf an update is dismissed, it will not appear aga" +
+        "in.");
+            this.checkUpdateNotifications.UseVisualStyleBackColor = true;
+            // 
+            // btnCheckUpdates
+            // 
+            this.btnCheckUpdates.Location = new System.Drawing.Point(6, 44);
+            this.btnCheckUpdates.Name = "btnCheckUpdates";
+            this.btnCheckUpdates.Size = new System.Drawing.Size(171, 23);
+            this.btnCheckUpdates.TabIndex = 15;
+            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;
+            // 
             // 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.groupInterface);
             this.Controls.Add(this.groupTray);
             this.Name = "TabSettingsGeneral";
@@ -146,6 +181,8 @@
             this.groupTray.PerformLayout();
             this.groupInterface.ResumeLayout(false);
             this.groupInterface.PerformLayout();
+            this.groupUpdates.ResumeLayout(false);
+            this.groupUpdates.PerformLayout();
             this.ResumeLayout(false);
 
         }
@@ -161,5 +198,8 @@
         private System.Windows.Forms.CheckBox checkTrayHighlight;
         private System.Windows.Forms.CheckBox checkSpellCheck;
         private System.Windows.Forms.CheckBox checkScreenshotBorder;
+        private System.Windows.Forms.GroupBox groupUpdates;
+        private System.Windows.Forms.CheckBox checkUpdateNotifications;
+        private System.Windows.Forms.Button btnCheckUpdates;
     }
 }

Core/Other/Settings/TabSettingsGeneral.cs

@@ -1,10 +1,20 @@
 using System;
+using System.Windows.Forms;
+using TweetDck.Updates;
+using TweetDck.Updates.Events;
 
 namespace TweetDck.Core.Other.Settings{
     partial class TabSettingsGeneral : BaseTabSettings{
-        public TabSettingsGeneral(){
+        private readonly UpdateHandler updates;
+        private int updateCheckEventId = -1;
+
+        public TabSettingsGeneral(UpdateHandler updates){
             InitializeComponent();
 
+            this.updates = updates;
+            this.updates.CheckFinished += updates_CheckFinished;
+            Disposed += (sender, args) => this.updates.CheckFinished -= updates_CheckFinished;
+            
             comboBoxTrayType.Items.Add("Disabled");
             comboBoxTrayType.Items.Add("Display Icon Only");
             comboBoxTrayType.Items.Add("Minimize to Tray");
@@ -16,37 +26,67 @@ namespace TweetDck.Core.Other.Settings{
             checkSpellCheck.Checked = Config.EnableSpellCheck;
             checkScreenshotBorder.Checked = Config.ShowScreenshotBorder;
             checkTrayHighlight.Checked = Config.EnableTrayHighlight;
+
+            checkUpdateNotifications.Checked = Config.EnableUpdateCheck;
+        }
+
+        public override void OnReady(){
+            checkExpandLinks.CheckedChanged += checkExpandLinks_CheckedChanged;
+            checkSpellCheck.CheckedChanged += checkSpellCheck_CheckedChanged;
+            checkScreenshotBorder.CheckedChanged += checkScreenshotBorder_CheckedChanged;
+
+            comboBoxTrayType.SelectedIndexChanged += comboBoxTrayType_SelectedIndexChanged;
+            checkTrayHighlight.CheckedChanged += checkTrayHighlight_CheckedChanged;
+
+            checkUpdateNotifications.CheckedChanged += checkUpdateNotifications_CheckedChanged;
+            btnCheckUpdates.Click += btnCheckUpdates_Click;
         }
 
         private void checkExpandLinks_CheckedChanged(object sender, EventArgs e){
-            if (!Ready)return;
-
             Config.ExpandLinksOnHover = checkExpandLinks.Checked;
         }
 
         private void checkSpellCheck_CheckedChanged(object sender, EventArgs e){
-            if (!Ready)return;
-
             Config.EnableSpellCheck = checkSpellCheck.Checked;
             PromptRestart();
         }
 
         private void checkScreenshotBorder_CheckedChanged(object sender, EventArgs e){
-            if (!Ready)return;
-
             Config.ShowScreenshotBorder = checkScreenshotBorder.Checked;
         }
 
         private void comboBoxTrayType_SelectedIndexChanged(object sender, EventArgs e){
-            if (!Ready)return;
-
             Config.TrayBehavior = (TrayIcon.Behavior)comboBoxTrayType.SelectedIndex;
         }
 
         private void checkTrayHighlight_CheckedChanged(object sender, EventArgs e){
-            if (!Ready)return;
-            
             Config.EnableTrayHighlight = checkTrayHighlight.Checked;
         }
+
+        private void checkUpdateNotifications_CheckedChanged(object sender, EventArgs e){
+            Config.EnableUpdateCheck = checkUpdateNotifications.Checked;
+        }
+
+        private void btnCheckUpdates_Click(object sender, EventArgs e){
+            updateCheckEventId = updates.Check(true);
+
+            if (updateCheckEventId == -1){
+                MessageBox.Show("Sorry, your system is no longer supported.", "Unsupported System", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+            }
+            else{
+                btnCheckUpdates.Enabled = false;
+                updates.DismissUpdate(string.Empty);
+            }
+        }
+
+        private void updates_CheckFinished(object sender, UpdateCheckEventArgs e){
+            if (e.EventId == updateCheckEventId){
+                btnCheckUpdates.Enabled = true;
+
+                if (!e.UpdateAvailable){
+                    MessageBox.Show("Your version of "+Program.BrandName+" is up to date.", "No Updates Available", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                }
+            }
+        }
     }
 }

Core/Other/Settings/TabSettingsNotifications.Designer.cs

@@ -43,20 +43,18 @@
             this.labelDurationValue = new System.Windows.Forms.Label();
             this.trackBarDuration = new System.Windows.Forms.TrackBar();
             this.groupUserInterface = new System.Windows.Forms.GroupBox();
+            this.labelIdlePause = new System.Windows.Forms.Label();
+            this.comboBoxIdlePause = new System.Windows.Forms.ComboBox();
+            this.checkNonIntrusive = new System.Windows.Forms.CheckBox();
             this.checkTimerCountDown = new System.Windows.Forms.CheckBox();
             this.checkNotificationTimer = new System.Windows.Forms.CheckBox();
             this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-            this.groupCustomSound = new System.Windows.Forms.GroupBox();
-            this.btnResetSound = new System.Windows.Forms.Button();
-            this.btnBrowseSound = new System.Windows.Forms.Button();
-            this.tbCustomSound = new System.Windows.Forms.TextBox();
             this.groupNotificationLocation.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.trackBarEdgeDistance)).BeginInit();
             this.groupNotificationDuration.SuspendLayout();
             this.tableLayoutDurationButtons.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.trackBarDuration)).BeginInit();
             this.groupUserInterface.SuspendLayout();
-            this.groupCustomSound.SuspendLayout();
             this.SuspendLayout();
             // 
             // groupNotificationLocation
@@ -109,7 +107,6 @@
             this.comboBoxDisplay.Name = "comboBoxDisplay";
             this.comboBoxDisplay.Size = new System.Drawing.Size(171, 21);
             this.comboBoxDisplay.TabIndex = 7;
-            this.comboBoxDisplay.SelectedValueChanged += new System.EventHandler(this.comboBoxDisplay_SelectedValueChanged);
             // 
             // labelEdgeDistance
             // 
@@ -132,7 +129,6 @@
             this.radioLocCustom.Text = "Custom";
             this.toolTip.SetToolTip(this.radioLocCustom, "Drag the notification window to the desired location.");
             this.radioLocCustom.UseVisualStyleBackColor = true;
-            this.radioLocCustom.CheckedChanged += new System.EventHandler(this.radioLoc_CheckedChanged);
             // 
             // radioLocBR
             // 
@@ -144,7 +140,6 @@
             this.radioLocBR.TabStop = true;
             this.radioLocBR.Text = "Bottom Right";
             this.radioLocBR.UseVisualStyleBackColor = true;
-            this.radioLocBR.CheckedChanged += new System.EventHandler(this.radioLoc_CheckedChanged);
             // 
             // radioLocBL
             // 
@@ -156,7 +151,6 @@
             this.radioLocBL.TabStop = true;
             this.radioLocBL.Text = "Bottom Left";
             this.radioLocBL.UseVisualStyleBackColor = true;
-            this.radioLocBL.CheckedChanged += new System.EventHandler(this.radioLoc_CheckedChanged);
             // 
             // radioLocTR
             // 
@@ -168,7 +162,6 @@
             this.radioLocTR.TabStop = true;
             this.radioLocTR.Text = "Top Right";
             this.radioLocTR.UseVisualStyleBackColor = true;
-            this.radioLocTR.CheckedChanged += new System.EventHandler(this.radioLoc_CheckedChanged);
             // 
             // radioLocTL
             // 
@@ -180,7 +173,6 @@
             this.radioLocTL.TabStop = true;
             this.radioLocTL.Text = "Top Left";
             this.radioLocTL.UseVisualStyleBackColor = true;
-            this.radioLocTL.CheckedChanged += new System.EventHandler(this.radioLoc_CheckedChanged);
             // 
             // trackBarEdgeDistance
             // 
@@ -196,14 +188,13 @@
             this.trackBarEdgeDistance.TabIndex = 5;
             this.trackBarEdgeDistance.TickFrequency = 4;
             this.trackBarEdgeDistance.Value = 8;
-            this.trackBarEdgeDistance.ValueChanged += new System.EventHandler(this.trackBarEdgeDistance_ValueChanged);
             // 
             // 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, 83);
+            this.groupNotificationDuration.Location = new System.Drawing.Point(9, 160);
             this.groupNotificationDuration.Name = "groupNotificationDuration";
             this.groupNotificationDuration.Size = new System.Drawing.Size(183, 89);
             this.groupNotificationDuration.TabIndex = 9;
@@ -242,7 +233,6 @@
             this.btnDurationMedium.TabIndex = 2;
             this.btnDurationMedium.Text = "Medium";
             this.btnDurationMedium.UseVisualStyleBackColor = true;
-            this.btnDurationMedium.Click += new System.EventHandler(this.btnDurationMedium_Click);
             // 
             // btnDurationLong
             // 
@@ -258,7 +248,6 @@
             this.btnDurationLong.TabIndex = 1;
             this.btnDurationLong.Text = "Long";
             this.btnDurationLong.UseVisualStyleBackColor = true;
-            this.btnDurationLong.Click += new System.EventHandler(this.btnDurationLong_Click);
             // 
             // btnDurationShort
             // 
@@ -274,7 +263,6 @@
             this.btnDurationShort.TabIndex = 0;
             this.btnDurationShort.Text = "Short";
             this.btnDurationShort.UseVisualStyleBackColor = true;
-            this.btnDurationShort.Click += new System.EventHandler(this.btnDurationShort_Click);
             // 
             // labelDurationValue
             // 
@@ -301,19 +289,55 @@
             this.trackBarDuration.TabIndex = 12;
             this.trackBarDuration.TickFrequency = 5;
             this.trackBarDuration.Value = 25;
-            this.trackBarDuration.ValueChanged += new System.EventHandler(this.trackBarDuration_ValueChanged);
             // 
             // groupUserInterface
             // 
+            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, 68);
+            this.groupUserInterface.Size = new System.Drawing.Size(183, 145);
             this.groupUserInterface.TabIndex = 10;
             this.groupUserInterface.TabStop = false;
             this.groupUserInterface.Text = "General";
             // 
+            // labelIdlePause
+            // 
+            this.labelIdlePause.AutoSize = true;
+            this.labelIdlePause.Location = new System.Drawing.Point(3, 99);
+            this.labelIdlePause.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
+            this.labelIdlePause.Name = "labelIdlePause";
+            this.labelIdlePause.Size = new System.Drawing.Size(89, 13);
+            this.labelIdlePause.TabIndex = 10;
+            this.labelIdlePause.Text = "Pause When Idle";
+            // 
+            // comboBoxIdlePause
+            // 
+            this.comboBoxIdlePause.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | 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, 115);
+            this.comboBoxIdlePause.Name = "comboBoxIdlePause";
+            this.comboBoxIdlePause.Size = new System.Drawing.Size(171, 21);
+            this.comboBoxIdlePause.TabIndex = 9;
+            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(6, 67);
+            this.checkNonIntrusive.Name = "checkNonIntrusive";
+            this.checkNonIntrusive.Size = new System.Drawing.Size(128, 17);
+            this.checkNonIntrusive.TabIndex = 7;
+            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;
+            // 
             // checkTimerCountDown
             // 
             this.checkTimerCountDown.AutoSize = true;
@@ -324,7 +348,6 @@
             this.checkTimerCountDown.Text = "Timer Counts Down";
             this.toolTip.SetToolTip(this.checkTimerCountDown, "The notification timer counts down instead of up.");
             this.checkTimerCountDown.UseVisualStyleBackColor = true;
-            this.checkTimerCountDown.CheckedChanged += new System.EventHandler(this.checkTimerCountDown_CheckedChanged);
             // 
             // checkNotificationTimer
             // 
@@ -337,57 +360,11 @@
             this.checkNotificationTimer.Text = "Display Notification Timer";
             this.toolTip.SetToolTip(this.checkNotificationTimer, "Shows how much time is left before the current notification disappears.");
             this.checkNotificationTimer.UseVisualStyleBackColor = true;
-            this.checkNotificationTimer.CheckedChanged += new System.EventHandler(this.checkNotificationTimer_CheckedChanged);
-            // 
-            // groupCustomSound
-            // 
-            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, 178);
-            this.groupCustomSound.Name = "groupCustomSound";
-            this.groupCustomSound.Size = new System.Drawing.Size(183, 72);
-            this.groupCustomSound.TabIndex = 11;
-            this.groupCustomSound.TabStop = false;
-            this.groupCustomSound.Text = "Custom Sound";
-            // 
-            // btnResetSound
-            // 
-            this.btnResetSound.AutoSize = true;
-            this.btnResetSound.Location = new System.Drawing.Point(126, 43);
-            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);
-            this.btnResetSound.TabIndex = 2;
-            this.btnResetSound.Text = "Reset";
-            this.btnResetSound.UseVisualStyleBackColor = true;
-            this.btnResetSound.Click += new System.EventHandler(this.btnResetSound_Click);
-            // 
-            // btnBrowseSound
-            // 
-            this.btnBrowseSound.AutoSize = true;
-            this.btnBrowseSound.Location = new System.Drawing.Point(53, 43);
-            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);
-            this.btnBrowseSound.TabIndex = 1;
-            this.btnBrowseSound.Text = "Browse...";
-            this.btnBrowseSound.UseVisualStyleBackColor = true;
-            this.btnBrowseSound.Click += new System.EventHandler(this.btnBrowseSound_Click);
-            // 
-            // tbCustomSound
-            // 
-            this.tbCustomSound.Location = new System.Drawing.Point(6, 19);
-            this.tbCustomSound.Name = "tbCustomSound";
-            this.tbCustomSound.Size = new System.Drawing.Size(170, 20);
-            this.tbCustomSound.TabIndex = 0;
-            this.tbCustomSound.TextChanged += new System.EventHandler(this.tbCustomSound_TextChanged);
             // 
             // TabSettingsNotifications
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.groupCustomSound);
             this.Controls.Add(this.groupUserInterface);
             this.Controls.Add(this.groupNotificationDuration);
             this.Controls.Add(this.groupNotificationLocation);
@@ -403,8 +380,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.trackBarDuration)).EndInit();
             this.groupUserInterface.ResumeLayout(false);
             this.groupUserInterface.PerformLayout();
-            this.groupCustomSound.ResumeLayout(false);
-            this.groupCustomSound.PerformLayout();
             this.ResumeLayout(false);
 
         }
@@ -433,9 +408,8 @@
         private TweetDck.Core.Controls.FlatButton btnDurationMedium;
         private TweetDck.Core.Controls.FlatButton btnDurationLong;
         private TweetDck.Core.Controls.FlatButton btnDurationShort;
-        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.CheckBox checkNonIntrusive;
+        private System.Windows.Forms.Label labelIdlePause;
+        private System.Windows.Forms.ComboBox comboBoxIdlePause;
     }
 }

Core/Other/Settings/TabSettingsNotifications.cs

@@ -1,18 +1,16 @@
 using System;
-using System.Drawing;
 using System.Globalization;
-using System.IO;
 using System.Windows.Forms;
 using TweetDck.Core.Controls;
 using TweetDck.Core.Notification;
-using TweetDck.Core.Utils;
 
 namespace TweetDck.Core.Other.Settings{
     partial class TabSettingsNotifications : BaseTabSettings{
-        private readonly FormNotification notification;
-        private readonly Point initCursorPosition;
+        private static readonly int[] IdlePauseSeconds = { 0, 30, 60, 120, 300 };
 
-        public TabSettingsNotifications(FormNotification notification, bool ignoreAutoClick){
+        private readonly FormNotificationMain notification;
+
+        public TabSettingsNotifications(FormNotificationMain notification){
             InitializeComponent();
 
             this.notification = notification;
@@ -25,13 +23,11 @@ namespace TweetDck.Core.Other.Settings{
             };
             
             this.notification.Initialized += (sender, args) => {
-                this.InvokeSafe(() => this.notification.ShowNotificationForSettings(true));
+                this.InvokeAsyncSafe(() => this.notification.ShowNotificationForSettings(true));
             };
 
             this.notification.Activated += notification_Activated;
-            this.notification.Show(this);
-
-            initCursorPosition = ignoreAutoClick ? ControlExtensions.InvisibleLocation : Cursor.Position;
+            this.notification.Show();
 
             switch(Config.NotificationPosition){
                 case TweetNotification.Position.TopLeft: radioLocTL.Checked = true; break;
@@ -44,6 +40,13 @@ namespace TweetDck.Core.Other.Settings{
             trackBarDuration.SetValueSafe(Config.NotificationDurationValue);
             labelDurationValue.Text = Config.NotificationDurationValue+" ms/c";
 
+            comboBoxIdlePause.Items.Add("Disabled");
+            comboBoxIdlePause.Items.Add("30 seconds");
+            comboBoxIdlePause.Items.Add("1 minute");
+            comboBoxIdlePause.Items.Add("2 minutes");
+            comboBoxIdlePause.Items.Add("5 minutes");
+            comboBoxIdlePause.SelectedIndex = Math.Max(0, Array.FindIndex(IdlePauseSeconds, val => val == Config.NotificationIdlePauseSeconds));
+
             comboBoxDisplay.Items.Add("(Same As "+Program.BrandName+")");
 
             foreach(Screen screen in Screen.AllScreens){
@@ -55,17 +58,34 @@ namespace TweetDck.Core.Other.Settings{
             checkNotificationTimer.Checked = Config.DisplayNotificationTimer;
             checkTimerCountDown.Enabled = checkNotificationTimer.Checked;
             checkTimerCountDown.Checked = Config.NotificationTimerCountDown;
+            checkNonIntrusive.Checked = Config.NotificationNonIntrusiveMode;
 
             trackBarEdgeDistance.SetValueSafe(Config.NotificationEdgeDistance);
             labelEdgeDistanceValue.Text = trackBarEdgeDistance.Value.ToString(CultureInfo.InvariantCulture)+" px";
 
-            tbCustomSound.Text = Config.NotificationSoundPath;
-
             Disposed += (sender, args) => this.notification.Dispose();
         }
 
-        public override void OnClosing(){
-            Config.NotificationSoundPath = tbCustomSound.Text;
+        public override void OnReady(){
+            radioLocTL.CheckedChanged += radioLoc_CheckedChanged;
+            radioLocTR.CheckedChanged += radioLoc_CheckedChanged;
+            radioLocBL.CheckedChanged += radioLoc_CheckedChanged;
+            radioLocBR.CheckedChanged += radioLoc_CheckedChanged;
+            radioLocCustom.CheckedChanged += radioLoc_CheckedChanged;
+
+            trackBarDuration.ValueChanged += trackBarDuration_ValueChanged;
+            btnDurationShort.Click += btnDurationShort_Click;
+            btnDurationMedium.Click += btnDurationMedium_Click;
+            btnDurationLong.Click += btnDurationLong_Click;
+
+            checkNotificationTimer.CheckedChanged += checkNotificationTimer_CheckedChanged;
+            checkTimerCountDown.CheckedChanged += checkTimerCountDown_CheckedChanged;
+            checkNonIntrusive.CheckedChanged += checkNonIntrusive_CheckedChanged;
+
+            comboBoxIdlePause.SelectedValueChanged += comboBoxIdlePause_SelectedValueChanged;
+
+            comboBoxDisplay.SelectedValueChanged += comboBoxDisplay_SelectedValueChanged;
+            trackBarEdgeDistance.ValueChanged += trackBarEdgeDistance_ValueChanged;
         }
 
         private void TabSettingsNotifications_ParentChanged(object sender, EventArgs e){
@@ -78,23 +98,11 @@ namespace TweetDck.Core.Other.Settings{
         }
 
         private void notification_Activated(object sender, EventArgs e){
-            if (Cursor.Position == initCursorPosition && initCursorPosition != ControlExtensions.InvisibleLocation){
-                Timer delay = WindowsUtils.CreateSingleTickTimer(1);
-
-                delay.Tick += (sender2, args2) => { // here you can see a disgusting hack to force the freshly opened notification window out of focus
-                    NativeMethods.SimulateMouseClick(NativeMethods.MouseButton.Left); // because for some reason, the stupid thing keeps stealing it
-                    delay.Dispose(); // even after using ShowWithoutActivation, the CreateParams bullshit, and about a million different combinations
-                }; // of trying to force the original form back into focus in various events, so you will have to fucking deal with it, alright
-
-                delay.Start();
-            }
-
+            notification.Hide();
             notification.Activated -= notification_Activated;
         }
 
         private void radioLoc_CheckedChanged(object sender, EventArgs e){
-            if (!Ready)return;
-
             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;
@@ -112,8 +120,6 @@ namespace TweetDck.Core.Other.Settings{
         }
 
         private void trackBarDuration_ValueChanged(object sender, EventArgs e){
-            if (!Ready)return;
-            
             Config.NotificationDurationValue = trackBarDuration.Value;
             labelDurationValue.Text = Config.NotificationDurationValue+" ms/c";
 
@@ -121,75 +127,45 @@ namespace TweetDck.Core.Other.Settings{
         }
 
         private void btnDurationShort_Click(object sender, EventArgs e){
-            if (!Ready)return;
-
             trackBarDuration.Value = 15;
         }
 
         private void btnDurationMedium_Click(object sender, EventArgs e){
-            if (!Ready)return;
-
             trackBarDuration.Value = 25;
         }
 
         private void btnDurationLong_Click(object sender, EventArgs e){
-            if (!Ready)return;
-
             trackBarDuration.Value = 35;
         }
 
         private void checkNotificationTimer_CheckedChanged(object sender, EventArgs e){
-            if (!Ready)return;
-
             Config.DisplayNotificationTimer = checkNotificationTimer.Checked;
             checkTimerCountDown.Enabled = checkNotificationTimer.Checked;
             notification.ShowNotificationForSettings(true);
         }
 
         private void checkTimerCountDown_CheckedChanged(object sender, EventArgs e){
-            if (!Ready)return;
-
             Config.NotificationTimerCountDown = checkTimerCountDown.Checked;
             notification.ShowNotificationForSettings(true);
         }
 
-        private void comboBoxDisplay_SelectedValueChanged(object sender, EventArgs e){
-            if (!Ready)return;
+        private void checkNonIntrusive_CheckedChanged(object sender, EventArgs e){
+            Config.NotificationNonIntrusiveMode = checkNonIntrusive.Checked;
+        }
 
+        private void comboBoxIdlePause_SelectedValueChanged(object sender, EventArgs e){
+            Config.NotificationIdlePauseSeconds = IdlePauseSeconds[comboBoxIdlePause.SelectedIndex];
+        }
+
+        private void comboBoxDisplay_SelectedValueChanged(object sender, EventArgs e){
             Config.NotificationDisplay = comboBoxDisplay.SelectedIndex;
             notification.ShowNotificationForSettings(false);
         }
 
         private void trackBarEdgeDistance_ValueChanged(object sender, EventArgs e){
-            if (!Ready)return;
-            
             labelEdgeDistanceValue.Text = trackBarEdgeDistance.Value.ToString(CultureInfo.InvariantCulture)+" px";
             Config.NotificationEdgeDistance = trackBarEdgeDistance.Value;
             notification.ShowNotificationForSettings(false);
         }
-
-        private void tbCustomSound_TextChanged(object sender, EventArgs e){
-            // also runs when the control is created, i.e. when Ready is false
-
-            bool fileExists = string.IsNullOrEmpty(tbCustomSound.Text) || File.Exists(tbCustomSound.Text);
-            tbCustomSound.ForeColor = fileExists ? SystemColors.WindowText : Color.Maroon;
-        }
-
-        private void btnBrowseSound_Click(object sender, EventArgs e){
-            using(OpenFileDialog dialog = new OpenFileDialog{
-                AutoUpgradeEnabled = true,
-                DereferenceLinks = true,
-                Title = "Custom Notification Sound",
-                Filter = "Wave file (*.wav)|*.wav"
-            }){
-                if (dialog.ShowDialog() == DialogResult.OK){
-                    tbCustomSound.Text = dialog.FileName;
-                }
-            }
-        }
-
-        private void btnResetSound_Click(object sender, EventArgs e){
-            tbCustomSound.Text = string.Empty;
-        }
     }
 }

Core/Other/Settings/TabSettingsSounds.Designer.cs

@@ -0,0 +1,111 @@
+namespace TweetDck.Core.Other.Settings {
+    partial class TabSettingsSounds {
+        /// <summary> 
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing) {
+            if (disposing && (components != null)) {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Component Designer generated code
+
+        /// <summary> 
+        /// Required method for Designer support - do not modify 
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent() {
+            this.components = new System.ComponentModel.Container();
+            this.toolTip = new System.Windows.Forms.ToolTip(this.components);
+            this.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.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 = 11;
+            this.groupCustomSound.TabStop = false;
+            this.groupCustomSound.Text = "Custom Sound Notification";
+            // 
+            // btnPlaySound
+            // 
+            this.btnPlaySound.AutoSize = true;
+            this.btnPlaySound.Location = new System.Drawing.Point(250, 45);
+            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);
+            this.btnPlaySound.TabIndex = 3;
+            this.btnPlaySound.Text = "Play";
+            this.btnPlaySound.UseVisualStyleBackColor = true;
+            // 
+            // btnResetSound
+            // 
+            this.btnResetSound.AutoSize = true;
+            this.btnResetSound.Location = new System.Drawing.Point(6, 45);
+            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);
+            this.btnResetSound.TabIndex = 2;
+            this.btnResetSound.Text = "Reset";
+            this.btnResetSound.UseVisualStyleBackColor = true;
+            // 
+            // btnBrowseSound
+            // 
+            this.btnBrowseSound.AutoSize = true;
+            this.btnBrowseSound.Location = new System.Drawing.Point(299, 45);
+            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);
+            this.btnBrowseSound.TabIndex = 1;
+            this.btnBrowseSound.Text = "Browse...";
+            this.btnBrowseSound.UseVisualStyleBackColor = true;
+            // 
+            // tbCustomSound
+            // 
+            this.tbCustomSound.Location = new System.Drawing.Point(6, 19);
+            this.tbCustomSound.Name = "tbCustomSound";
+            this.tbCustomSound.Size = new System.Drawing.Size(360, 20);
+            this.tbCustomSound.TabIndex = 0;
+            // 
+            // TabSettingsSounds
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.groupCustomSound);
+            this.Name = "TabSettingsSounds";
+            this.Size = new System.Drawing.Size(478, 282);
+            this.groupCustomSound.ResumeLayout(false);
+            this.groupCustomSound.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #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;
+    }
+}

Core/Other/Settings/TabSettingsSounds.cs

@@ -0,0 +1,67 @@
+using System;
+using System.Drawing;
+using System.IO;
+using System.Windows.Forms;
+using TweetDck.Core.Notification;
+using TweetDck.Core.Notification.Sound;
+
+namespace TweetDck.Core.Other.Settings{
+    partial class TabSettingsSounds : BaseTabSettings{
+        private readonly ISoundNotificationPlayer soundNotification;
+
+        public TabSettingsSounds(){
+            InitializeComponent();
+
+            soundNotification = SoundNotification.New();
+            soundNotification.PlaybackError += sound_PlaybackError;
+
+            tbCustomSound.Text = Config.NotificationSoundPath;
+            tbCustomSound_TextChanged(tbCustomSound, new EventArgs());
+
+            Disposed += (sender, args) => soundNotification.Dispose();
+        }
+
+        public override void OnReady(){
+            tbCustomSound.TextChanged += tbCustomSound_TextChanged;
+            btnPlaySound.Click += btnPlaySound_Click;
+            btnBrowseSound.Click += btnBrowseSound_Click;
+            btnResetSound.Click += btnResetSound_Click;
+        }
+
+        public override void OnClosing(){
+            Config.NotificationSoundPath = tbCustomSound.Text;
+        }
+
+        private void tbCustomSound_TextChanged(object sender, EventArgs e){
+            bool isEmpty = string.IsNullOrEmpty(tbCustomSound.Text);
+            tbCustomSound.ForeColor = isEmpty || File.Exists(tbCustomSound.Text) ? SystemColors.WindowText : Color.Maroon;
+            btnPlaySound.Enabled = !isEmpty;
+            btnResetSound.Enabled = !isEmpty;
+        }
+
+        private void btnPlaySound_Click(object sender, EventArgs e){
+            soundNotification.Play(tbCustomSound.Text);
+        }
+
+        private void sound_PlaybackError(object sender, PlaybackErrorEventArgs e){
+            MessageBox.Show("Could not play custom notification sound."+Environment.NewLine+e.Message, "Notification Sound Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+        }
+
+        private void btnBrowseSound_Click(object sender, EventArgs e){
+            using(OpenFileDialog dialog = new OpenFileDialog{
+                AutoUpgradeEnabled = true,
+                DereferenceLinks = true,
+                Title = "Custom Notification Sound",
+                Filter = "Sound file ("+soundNotification.SupportedFormats+")|"+soundNotification.SupportedFormats+"|All files (*.*)|*.*"
+            }){
+                if (dialog.ShowDialog() == DialogResult.OK){
+                    tbCustomSound.Text = dialog.FileName;
+                }
+            }
+        }
+
+        private void btnResetSound_Click(object sender, EventArgs e){
+            tbCustomSound.Text = string.Empty;
+        }
+    }
+}

Core/Other/Settings/TabSettingsUpdates.Designer.cs

@@ -1,90 +0,0 @@
-namespace TweetDck.Core.Other.Settings {
-    partial class TabSettingsUpdates {
-        /// <summary> 
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary> 
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing) {
-            if (disposing && (components != null)) {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Component Designer generated code
-
-        /// <summary> 
-        /// Required method for Designer support - do not modify 
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent() {
-            this.components = new System.ComponentModel.Container();
-            this.btnCheckUpdates = new System.Windows.Forms.Button();
-            this.checkUpdateNotifications = new System.Windows.Forms.CheckBox();
-            this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-            this.groupGeneral = new System.Windows.Forms.GroupBox();
-            this.groupGeneral.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // btnCheckUpdates
-            // 
-            this.btnCheckUpdates.Location = new System.Drawing.Point(6, 44);
-            this.btnCheckUpdates.Name = "btnCheckUpdates";
-            this.btnCheckUpdates.Size = new System.Drawing.Size(171, 23);
-            this.btnCheckUpdates.TabIndex = 15;
-            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;
-            this.btnCheckUpdates.Click += new System.EventHandler(this.btnCheckUpdates_Click);
-            // 
-            // checkUpdateNotifications
-            // 
-            this.checkUpdateNotifications.AutoSize = true;
-            this.checkUpdateNotifications.Location = new System.Drawing.Point(6, 21);
-            this.checkUpdateNotifications.Margin = new System.Windows.Forms.Padding(3, 5, 3, 3);
-            this.checkUpdateNotifications.Name = "checkUpdateNotifications";
-            this.checkUpdateNotifications.Size = new System.Drawing.Size(165, 17);
-            this.checkUpdateNotifications.TabIndex = 14;
-            this.checkUpdateNotifications.Text = "Check Updates Automatically";
-            this.toolTip.SetToolTip(this.checkUpdateNotifications, "Checks for updates every hour.\r\nIf an update is dismissed, it will not appear aga" +
-        "in.");
-            this.checkUpdateNotifications.UseVisualStyleBackColor = true;
-            this.checkUpdateNotifications.CheckedChanged += new System.EventHandler(this.checkUpdateNotifications_CheckedChanged);
-            // 
-            // groupGeneral
-            // 
-            this.groupGeneral.Controls.Add(this.checkUpdateNotifications);
-            this.groupGeneral.Controls.Add(this.btnCheckUpdates);
-            this.groupGeneral.Location = new System.Drawing.Point(9, 9);
-            this.groupGeneral.Name = "groupGeneral";
-            this.groupGeneral.Size = new System.Drawing.Size(183, 75);
-            this.groupGeneral.TabIndex = 16;
-            this.groupGeneral.TabStop = false;
-            this.groupGeneral.Text = "General";
-            // 
-            // TabSettingsUpdates
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.groupGeneral);
-            this.Name = "TabSettingsUpdates";
-            this.Size = new System.Drawing.Size(478, 282);
-            this.groupGeneral.ResumeLayout(false);
-            this.groupGeneral.PerformLayout();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Button btnCheckUpdates;
-        private System.Windows.Forms.CheckBox checkUpdateNotifications;
-        private System.Windows.Forms.ToolTip toolTip;
-        private System.Windows.Forms.GroupBox groupGeneral;
-    }
-}

Core/Other/Settings/TabSettingsUpdates.cs

@@ -1,55 +0,0 @@
-using System;
-using System.Windows.Forms;
-using TweetDck.Updates;
-using TweetDck.Updates.Events;
-
-namespace TweetDck.Core.Other.Settings{
-    partial class TabSettingsUpdates : BaseTabSettings{
-        private readonly UpdateHandler updates;
-        private int updateCheckEventId = -1;
-
-        public TabSettingsUpdates(UpdateHandler updates){
-            InitializeComponent();
-
-            this.updates = updates;
-
-            this.updates.CheckFinished += updates_CheckFinished;
-            Disposed += (sender, args) => this.updates.CheckFinished -= updates_CheckFinished;
-
-            checkUpdateNotifications.Checked = Config.EnableUpdateCheck;
-        }
-
-        private void checkUpdateNotifications_CheckedChanged(object sender, EventArgs e){
-            if (!Ready)return;
-
-            Config.EnableUpdateCheck = checkUpdateNotifications.Checked;
-        }
-
-        private void btnCheckUpdates_Click(object sender, EventArgs e){
-            if (!Ready)return;
-
-            updateCheckEventId = updates.Check(true);
-
-            if (updateCheckEventId == -1){
-                MessageBox.Show("Sorry, your system is no longer supported.", "Unsupported System", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-            }
-            else{
-                btnCheckUpdates.Enabled = false;
-                
-                updates.Settings.DismissedUpdate = string.Empty;
-                Config.DismissedUpdate = string.Empty;
-                Config.Save();
-            }
-        }
-
-        private void updates_CheckFinished(object sender, UpdateCheckEventArgs e){
-            if (e.EventId == updateCheckEventId){
-                btnCheckUpdates.Enabled = true;
-
-                if (!e.UpdateAvailable){
-                    MessageBox.Show("Your version of "+Program.BrandName+" is up to date.", "No Updates Available", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                }
-            }
-        }
-    }
-}

Core/TrayIcon.Designer.cs

@@ -25,65 +25,17 @@
         private void InitializeComponent() {
             this.components = new System.ComponentModel.Container();
             this.notifyIcon = new System.Windows.Forms.NotifyIcon(this.components);
-            this.contextMenu = new System.Windows.Forms.ContextMenuStrip(this.components);
-            this.restoreToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.muteNotificationsToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.closeToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-            this.contextMenu.SuspendLayout();
             // 
             // notifyIcon
             // 
-            this.notifyIcon.ContextMenuStrip = this.contextMenu;
-            this.notifyIcon.Icon = global::TweetDck.Properties.Resources.icon_tray;
             this.notifyIcon.MouseClick += new System.Windows.Forms.MouseEventHandler(this.trayIcon_MouseClick);
             //
-            // contextMenu
-            // 
-            this.contextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.restoreToolStripMenuItem,
-            this.muteNotificationsToolStripMenuItem,
-            this.closeToolStripMenuItem});
-            this.contextMenu.Name = "contextMenuTray";
-            this.contextMenu.ShowCheckMargin = true;
-            this.contextMenu.ShowImageMargin = false;
-            this.contextMenu.ShowItemToolTips = false;
-            this.contextMenu.Size = new System.Drawing.Size(174, 92);
-            this.contextMenu.Opening += new System.ComponentModel.CancelEventHandler(this.contextMenuTray_Opening);
-            this.contextMenu.Opened += new System.EventHandler(this.contextMenuTray_Opened);
-            // 
-            // restoreToolStripMenuItem
-            // 
-            this.restoreToolStripMenuItem.Name = "restoreToolStripMenuItem";
-            this.restoreToolStripMenuItem.Size = new System.Drawing.Size(173, 22);
-            this.restoreToolStripMenuItem.Text = "Restore";
-            this.restoreToolStripMenuItem.Click += new System.EventHandler(this.restoreToolStripMenuItem_Click);
-            // 
-            // muteNotificationsToolStripMenuItem
-            // 
-            this.muteNotificationsToolStripMenuItem.CheckOnClick = true;
-            this.muteNotificationsToolStripMenuItem.Name = "muteNotificationsToolStripMenuItem";
-            this.muteNotificationsToolStripMenuItem.Size = new System.Drawing.Size(173, 22);
-            this.muteNotificationsToolStripMenuItem.Text = "Mute Notifications";
-            this.muteNotificationsToolStripMenuItem.CheckedChanged += new System.EventHandler(this.muteNotificationsToolStripMenuItem_CheckedChanged);
-            // 
-            // closeToolStripMenuItem
-            // 
-            this.closeToolStripMenuItem.Name = "closeToolStripMenuItem";
-            this.closeToolStripMenuItem.Size = new System.Drawing.Size(173, 22);
-            this.closeToolStripMenuItem.Text = "Close";
-            this.closeToolStripMenuItem.Click += new System.EventHandler(this.closeToolStripMenuItem_Click);
-            //
             // TrayIcon
             //
-            this.contextMenu.ResumeLayout(false);
         }
 
         #endregion
 
         private System.Windows.Forms.NotifyIcon notifyIcon;
-        private System.Windows.Forms.ContextMenuStrip contextMenu;
-        private System.Windows.Forms.ToolStripMenuItem restoreToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem closeToolStripMenuItem;
-        private System.Windows.Forms.ToolStripMenuItem muteNotificationsToolStripMenuItem;
     }
 }

Core/TrayIcon.cs

@@ -17,7 +17,12 @@ namespace TweetDck.Core{
             }
 
             set{
+                if (value){
+                    notifyIcon.Icon = Properties.Resources.icon_tray;
+                }
+                
                 notifyIcon.Visible = value;
+                hasNotifications = false;
             }
         }
 
@@ -27,49 +32,57 @@ namespace TweetDck.Core{
             }
 
             set{
-                if (hasNotifications != value){
+                if (hasNotifications != value && Visible){
                     notifyIcon.Icon = value ? Properties.Resources.icon_tray_new : Properties.Resources.icon_tray;
                     hasNotifications = value;
                 }
             }
         }
 
+        private readonly ContextMenu contextMenu;
         private bool hasNotifications;
 
         public TrayIcon(){
             InitializeComponent();
-            notifyIcon.Text = Program.BrandName;
+
+            this.contextMenu = new ContextMenu();
+            this.contextMenu.MenuItems.Add("Restore", menuItemRestore_Click);
+            this.contextMenu.MenuItems.Add("Mute notifications", menuItemMuteNotifications_Click);
+            this.contextMenu.MenuItems.Add("Close", menuItemClose_Click);
+            this.contextMenu.Popup += contextMenu_Popup;
+                
+            this.notifyIcon.ContextMenu = contextMenu;
+            this.notifyIcon.Text = Program.BrandName;
+        }
+
+        public TrayIcon(IContainer container) : this(){
+            container.Add(this);
         }
 
         // event handlers
 
         private void trayIcon_MouseClick(object sender, MouseEventArgs e){
             if (e.Button == MouseButtons.Left){
-                restoreToolStripMenuItem_Click(sender, e);
+                menuItemRestore_Click(sender, e);
             }
         }
 
-        private void contextMenuTray_Opening(object sender, CancelEventArgs e){
-            muteNotificationsToolStripMenuItem.CheckedChanged -= muteNotificationsToolStripMenuItem_CheckedChanged;
-            muteNotificationsToolStripMenuItem.Checked = Program.UserConfig.MuteNotifications;
+        private void contextMenu_Popup(object sender, EventArgs e){
+            contextMenu.MenuItems[1].Checked = Program.UserConfig.MuteNotifications;
         }
 
-        private void contextMenuTray_Opened(object sender, EventArgs e){
-            muteNotificationsToolStripMenuItem.CheckedChanged += muteNotificationsToolStripMenuItem_CheckedChanged;
-        }
-
-        private void restoreToolStripMenuItem_Click(object sender, EventArgs e){
+        private void menuItemRestore_Click(object sender, EventArgs e){
             if (ClickRestore != null){
                 ClickRestore(this, e);
             }
         }
 
-        private void muteNotificationsToolStripMenuItem_CheckedChanged(object sender, EventArgs e){
-            Program.UserConfig.MuteNotifications = muteNotificationsToolStripMenuItem.Checked;
+        private void menuItemMuteNotifications_Click(object sender, EventArgs e){
+            Program.UserConfig.MuteNotifications = !contextMenu.MenuItems[1].Checked;
             Program.UserConfig.Save();
         }
 
-        private void closeToolStripMenuItem_Click(object sender, EventArgs e){
+        private void menuItemClose_Click(object sender, EventArgs e){
             if (ClickClose != null){
                 ClickClose(this, e);
             }

Core/Utils/BrowserCache.cs

@@ -31,21 +31,6 @@ namespace TweetDck.Core.Utils{
             task.Start();
         }
 
-        public static void ClearOldCacheFiles(){
-            if (!Directory.Exists(CacheFolder)){
-                foreach(string file in Directory.EnumerateFiles(Program.StoragePath).Where(path => {
-                    string file = Path.GetFileName(path);
-                    return file != null && (file.StartsWith("data_", StringComparison.Ordinal) || file.StartsWith("f_", StringComparison.Ordinal));
-                }).Concat(new[]{ Path.Combine(Program.StoragePath, "index") })){
-                    try{
-                        File.Delete(file);
-                    }catch{
-                        // welp, too bad
-                    }
-                }
-            }
-        }
-
         public static void SetClearOnExit(){
             ClearOnExit = true;
         }

Core/Utils/BrowserUtils.cs

@@ -5,6 +5,8 @@ using System.IO;
 using System.Net;
 using System.Windows.Forms;
 using CefSharp;
+using System.Text.RegularExpressions;
+using System.Drawing;
 
 namespace TweetDck.Core.Utils{
     static class BrowserUtils{
@@ -27,7 +29,36 @@ namespace TweetDck.Core.Utils{
             }
         }
 
-        public static void OpenExternalBrowser(string url){ // TODO implement mailto
+        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}'";
+
+        public static readonly string[] DictionaryWords = {
+            "tweetdeck", "TweetDeck", "tweetduck", "TweetDuck", "TD"
+        };
+
+        public static bool IsValidUrl(string url){
+            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;
+            }
+
+            return false;
+        }
+
+        public static void OpenExternalBrowser(string url){
+            if (string.IsNullOrWhiteSpace(url))return;
+
+            if (IsValidUrl(url)){
+                OpenExternalBrowserUnsafe(url);
+            }
+            else{
+                MessageBox.Show("A potentially malicious URL was blocked from opening:"+Environment.NewLine+url, "Blocked URL", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+            }
+        }
+
+        public static void OpenExternalBrowserUnsafe(string url){
             using(Process.Start(url)){}
         }
 
@@ -36,6 +67,14 @@ namespace TweetDck.Core.Utils{
             return string.IsNullOrEmpty(file) ? null : file;
         }
 
+        public static string ConvertPascalCaseToScreamingSnakeCase(string str){
+            return Regex.Replace(str, @"(\p{Ll})(\P{Ll})|(\P{Ll})(\P{Ll}\p{Ll})", "$1$3_$2$4").ToUpperInvariant();
+        }
+
+        public static string GetErrorName(CefErrorCode code){
+            return ConvertPascalCaseToScreamingSnakeCase(Enum.GetName(typeof(CefErrorCode), code) ?? string.Empty);
+        }
+
         public static void DownloadFileAsync(string url, string target, Action<Exception> onFailure){
             WebClient client = new WebClient{ Proxy = null };
             client.Headers[HttpRequestHeader.UserAgent] = HeaderUserAgent;

Core/Utils/InjectedHTML.cs

@@ -0,0 +1,37 @@
+using System;
+
+namespace TweetDck.Core.Utils{
+    class InjectedHTML{
+        public enum Position{
+            Before, After
+        }
+
+        private readonly Position position;
+        private readonly string search;
+        private readonly string html;
+
+        public InjectedHTML(Position position, string search, string html){
+            this.position = position;
+            this.search = search;
+            this.html = html;
+        }
+
+        public string Inject(string targetHTML){
+            int index = targetHTML.IndexOf(search, StringComparison.Ordinal);
+
+            if (index == -1){
+                return targetHTML;
+            }
+
+            int cutIndex;
+
+            switch(position){
+                case Position.Before: cutIndex = index; break;
+                case Position.After: cutIndex = index+search.Length; break;
+                default: return targetHTML;
+            }
+
+            return targetHTML.Insert(cutIndex, html);
+        }
+    }
+}

Core/Utils/NativeCoreAudio.cs

@@ -0,0 +1,129 @@
+using System;
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.IO;
+using System.Runtime.InteropServices;
+
+namespace TweetDck.Core.Utils{
+    static class NativeCoreAudio{
+        private const int EDATAFLOW_RENDER = 0;
+        private const int EROLE_MULTIMEDIA = 1;
+
+        [ComImport]
+        [Guid("BCDE0395-E52F-467C-8E3D-C4579291692E")]
+        private class MMDeviceEnumerator{}
+
+        [Guid("A95664D2-9614-4F35-A746-DE8DB63617E6")]
+        [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+        private interface IMMDeviceEnumerator{
+            int Unimpl_EnumAudioEndpoints();
+            IMMDevice GetDefaultAudioEndpoint(int dataFlow, int role);
+        }
+
+        [Guid("D666063F-1587-4E43-81F1-B948E807363F")]
+        [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+        private interface IMMDevice{
+            [return:MarshalAs(UnmanagedType.IUnknown)]
+            object Activate(ref Guid id, int clsCtx, IntPtr activationParams);
+        }
+
+        [Guid("77AA99A0-1BD6-484F-8BC7-2C654C9A9B6F")]
+        [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+        private interface IAudioSessionManager2{
+            int Unimpl_FindWillToLive();
+            int Unimpl_HelloDarknessMyOldFriend();
+            IAudioSessionEnumerator GetSessionEnumerator();
+        }
+
+        [Guid("E2F5BB11-0570-40CA-ACDD-3AA01277DEE8")]
+        [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+        private interface IAudioSessionEnumerator{
+            int GetCount();
+            IAudioSessionControl GetSession(int sessionIndex);
+        }
+
+        [Guid("F4B1A599-7266-4319-A8CA-E70ACB11E8CD")]
+        [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+        private interface IAudioSessionControl{}
+
+        [Guid("BFB7FF88-7239-4FC9-8FA2-07C950BE9C6D")]
+        [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+        private interface IAudioSessionControl2{
+            int Unimpl_GetState();
+            int Unimpl_GetDisplayName();
+            int Unimpl_SetDisplayName();
+            int Unimpl_GetIconPath();
+            int Unimpl_SetIconPath();
+            int Unimpl_GetGroupingParam();
+            int Unimpl_SetGroupingParam();
+            int Unimpl_RegisterAudioSessionNotification();
+            int Unimpl_UnregisterAudioSessionNotification();
+
+            [return:MarshalAs(UnmanagedType.LPWStr)]
+            string GetSessionIdentifier();
+        }
+
+        [Guid("87CE5498-68D6-44E5-9215-6DA47EF883D8")]
+        [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+        private interface ISimpleAudioVolume{
+            void SetMasterVolume(float level, ref Guid eventContext);
+            float GetMasterVolume();
+        }
+
+        [SuppressMessage("ReSharper", "SuspiciousTypeConversion.Global")]
+        private static ISimpleAudioVolume GetVolumeObject(string name){
+            IMMDeviceEnumerator devices = (IMMDeviceEnumerator)new MMDeviceEnumerator();
+            IMMDevice device = devices.GetDefaultAudioEndpoint(EDATAFLOW_RENDER, EROLE_MULTIMEDIA);
+
+            Guid sessionManagerGUID = typeof(IAudioSessionManager2).GUID;
+            IAudioSessionManager2 manager = (IAudioSessionManager2)device.Activate(ref sessionManagerGUID, 0, IntPtr.Zero);
+            IAudioSessionEnumerator sessions = manager.GetSessionEnumerator();
+
+            ISimpleAudioVolume volumeObj = null;
+
+            for(int index = sessions.GetCount()-1; index >= 0; index--){
+                IAudioSessionControl2 ctl = sessions.GetSession(index) as IAudioSessionControl2;
+
+                if (ctl != null){
+                    string identifier = ctl.GetSessionIdentifier();
+
+                    if (identifier != null && identifier.Contains(name)){
+                        volumeObj = ctl as ISimpleAudioVolume;
+                        break;
+                    }
+
+                    Marshal.ReleaseComObject(ctl);
+                }
+            }
+
+            Marshal.ReleaseComObject(devices);
+            Marshal.ReleaseComObject(device);
+            Marshal.ReleaseComObject(manager);
+            Marshal.ReleaseComObject(sessions);
+            return volumeObj;
+        }
+
+        public static double GetMixerVolume(string appPath){
+            ISimpleAudioVolume obj = GetVolumeObject(appPath);
+            float level = 1F;
+
+            if (obj != null){
+                level = obj.GetMasterVolume();
+                Marshal.ReleaseComObject(obj);
+            }
+
+            return Math.Round(level, 2);
+        }
+
+        public static double GetMixerVolumeForCurrentProcess(){
+            string path;
+
+            using(Process process = Process.GetCurrentProcess()){
+                path = process.MainModule.FileName;
+                path = path.Substring(Path.GetPathRoot(path).Length);
+            }
+
+            return GetMixerVolume(path);
+        }
+    }
+}

Core/Utils/NativeMethods.cs

@@ -1,37 +1,45 @@
 using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Drawing;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
 
 namespace TweetDck.Core.Utils{
+    [SuppressMessage("ReSharper", "FieldCanBeMadeReadOnly.Local")]
+    [SuppressMessage("ReSharper", "MemberCanBePrivate.Local")]
     static class NativeMethods{
         public static readonly IntPtr HWND_BROADCAST = new IntPtr(0xFFFF);
 
         public const int HWND_TOPMOST = -1;
         public const uint SWP_NOACTIVATE = 0x0010;
 
-        public const int MOUSEEVENTF_LEFTDOWN = 0x02;
-        public const int MOUSEEVENTF_LEFTUP = 0x04;
-        public const int MOUSEEVENTF_RIGHTDOWN = 0x08;
-        public const int MOUSEEVENTF_RIGHTUP = 0x10;
-
         public const int SB_HORZ = 0;
         public const int BCM_SETSHIELD = 0x160C;
 
-        public const int WH_MOUSE_LL = 14;
-        public const int WH_MOUSEWHEEL = 0x020A;
-
-        public enum MouseButton{
-            Left, Right
-        }
+        public const int WM_MOUSE_LL = 14;
+        public const int WM_MOUSEWHEEL = 0x020A;
         
+        [StructLayout(LayoutKind.Sequential)]
         private struct LASTINPUTINFO{
             public static readonly uint Size = (uint)Marshal.SizeOf(typeof(LASTINPUTINFO));
 
-            // ReSharper disable once NotAccessedField.Local
             public uint cbSize;
-            #pragma warning disable 649
             public uint dwTime;
-            #pragma warning restore 649
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        private struct POINT{
+            public int X;
+            public int Y;
+        }
+
+        [StructLayout(LayoutKind.Sequential)]
+        private struct MSLLHOOKSTRUCT{
+            public POINT pt;
+            public int mouseData;
+            public int flags;
+            public int time;
+            public UIntPtr dwExtraInfo;
         }
 
         public delegate IntPtr HookProc(int nCode, IntPtr wParam, IntPtr lParam);
@@ -40,10 +48,20 @@ namespace TweetDck.Core.Utils{
         private static extern bool SetWindowPos(int hWnd, int hWndOrder, int x, int y, int width, int height, uint flags);
 
         [DllImport("user32.dll")]
-        private static extern void mouse_event(int dwFlags, int dx, int dy, int cButtons, int dwExtraInfo);
+        private static extern bool GetLastInputInfo(ref LASTINPUTINFO info);
 
         [DllImport("user32.dll")]
-        private static extern bool GetLastInputInfo(ref LASTINPUTINFO info);
+        private static extern IntPtr GetWindowDC(IntPtr hWnd);
+
+        [DllImport("user32.dll")]
+        private static extern IntPtr GetDC(IntPtr hWnd);
+
+        [DllImport("user32.dll")]
+        private static extern bool ReleaseDC(IntPtr hWnd, IntPtr hDC);
+
+        [DllImport("gdi32.dll")]
+        [return: MarshalAs(UnmanagedType.Bool)]
+        private static extern bool BitBlt(IntPtr hdc, int nXDest, int nYDest, int nWidth, int nHeight, IntPtr hdcSrc, int nXSrc, int nYSrc, uint dwRop);
 
         [DllImport("user32.dll")]
         public static extern IntPtr SendMessage(IntPtr hWnd, uint msg, int wParam, IntPtr lParam);
@@ -68,25 +86,8 @@ namespace TweetDck.Core.Utils{
             SetWindowPos(form.Handle.ToInt32(), hWndOrder, form.Left, form.Top, form.Width, form.Height, flags);
         }
 
-        public static void SimulateMouseClick(MouseButton button){
-            int flagHold, flagRelease;
-
-            switch(button){
-                case MouseButton.Left:
-                    flagHold = SystemInformation.MouseButtonsSwapped ? MOUSEEVENTF_RIGHTDOWN : MOUSEEVENTF_LEFTDOWN;
-                    flagRelease = SystemInformation.MouseButtonsSwapped ? MOUSEEVENTF_RIGHTUP : MOUSEEVENTF_LEFTUP;
-                    break;
-
-                case MouseButton.Right:
-                    flagHold = SystemInformation.MouseButtonsSwapped ? MOUSEEVENTF_LEFTDOWN : MOUSEEVENTF_RIGHTDOWN;
-                    flagRelease = SystemInformation.MouseButtonsSwapped ? MOUSEEVENTF_LEFTUP : MOUSEEVENTF_RIGHTUP;
-                    break;
-
-                default: return;
-            }
-
-            mouse_event(flagHold, Cursor.Position.X, Cursor.Position.Y, 0, 0);
-            mouse_event(flagRelease, Cursor.Position.X, Cursor.Position.Y, 0, 0);
+        public static int GetHookWheelDelta(IntPtr ptr){
+            return Marshal.PtrToStructure<MSLLHOOKSTRUCT>(ptr).mouseData >> 16;
         }
 
         public static int GetIdleSeconds(){
@@ -106,5 +107,25 @@ namespace TweetDck.Core.Utils{
             int seconds = (int)Math.Floor(TimeSpan.FromMilliseconds(ticks-info.dwTime).TotalSeconds);
             return Math.Max(0, seconds); // ignore rollover after several weeks of uptime
         }
+
+        public static IntPtr GetDeviceContext(Form form, bool includeBorder){
+            return includeBorder ? GetWindowDC(form.Handle) : GetDC(form.Handle);
+        }
+
+        public static void RenderSourceIntoBitmap(IntPtr source, Bitmap target){
+            using(Graphics graphics = Graphics.FromImage(target)){
+                IntPtr graphicsHandle = graphics.GetHdc();
+
+                try{
+                    BitBlt(graphicsHandle, 0, 0, target.Width, target.Height, source, 0, 0, 0x00CC0020);
+                }finally{
+                    graphics.ReleaseHdc(graphicsHandle);
+                }
+            }
+        }
+
+        public static void ReleaseDeviceContext(Form form, IntPtr ctx){
+            ReleaseDC(form.Handle, ctx);
+        }
     }
 }

Core/Utils/TwoKeyDictionary.cs

@@ -31,6 +31,16 @@ namespace TweetDck.Core.Utils{
             }
         }
 
+        public IEnumerable<V> InnerValues{
+            get{
+                foreach(Dictionary<K2, V> innerDict in dict.Values){
+                    foreach(V value in innerDict.Values){
+                        yield return value;
+                    }
+                }
+            }
+        }
+
         // Members
 
         public void Add(K1 outerKey, K2 innerKey, V value){ // throws on duplicate

Core/Utils/WindowsUtils.cs

@@ -1,14 +1,13 @@
-using System.Diagnostics;
+using System;
+using System.Diagnostics;
 using System.IO;
 using System.Runtime.InteropServices;
 using System.Text.RegularExpressions;
+using System.Threading;
 using System.Windows.Forms;
 
 namespace TweetDck.Core.Utils{
     static class WindowsUtils{
-        private static readonly Regex RegexStripHtmlStyles = new Regex(@"\s?(?:style|class)="".*?""");
-        private static readonly Regex RegexOffsetClipboardHtml = new Regex(@"(?<=EndHTML:|EndFragment:)(\d+)");
-
         public static bool CheckFolderWritePermission(string path){
             string testFile = Path.Combine(path, ".test");
 
@@ -36,13 +35,16 @@ namespace TweetDck.Core.Utils{
             return Process.Start(processInfo);
         }
 
-        public static Timer CreateSingleTickTimer(int timeout){
-            Timer timer = new Timer{
-                Interval = timeout
-            };
+        public static bool TrySleepUntil(Func<bool> test, int timeoutMillis, int timeStepMillis){
+            for(int waited = 0; waited < timeoutMillis; waited += timeStepMillis){
+                if (test()){
+                    return true;
+                }
 
-            timer.Tick += (sender, args) => timer.Stop();
-            return timer;
+                Thread.Sleep(timeStepMillis);
+            }
+
+            return false;
         }
 
         public static void ClipboardStripHtmlStyles(){
@@ -53,10 +55,10 @@ namespace TweetDck.Core.Utils{
             string originalText = Clipboard.GetText(TextDataFormat.UnicodeText);
             string originalHtml = Clipboard.GetText(TextDataFormat.Html);
 
-            string updatedHtml = RegexStripHtmlStyles.Replace(originalHtml, string.Empty);
+            string updatedHtml = ClipboardRegexes.RegexStripHtmlStyles.Replace(originalHtml, string.Empty);
 
             int removed = originalHtml.Length-updatedHtml.Length;
-            updatedHtml = RegexOffsetClipboardHtml.Replace(updatedHtml, match => (int.Parse(match.Value)-removed).ToString().PadLeft(match.Value.Length, '0'));
+            updatedHtml = ClipboardRegexes.RegexOffsetClipboardHtml.Replace(updatedHtml, match => (int.Parse(match.Value)-removed).ToString().PadLeft(match.Value.Length, '0'));
 
             DataObject obj = new DataObject();
             obj.SetText(originalText, TextDataFormat.UnicodeText);
@@ -81,5 +83,10 @@ 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

@@ -56,6 +56,7 @@
             this.labelName.Size = new System.Drawing.Size(61, 24);
             this.labelName.TabIndex = 1;
             this.labelName.Text = "Name";
+            this.labelName.UseMnemonic = false;
             // 
             // panelDescription
             // 
@@ -81,6 +82,7 @@
             this.labelDescription.Size = new System.Drawing.Size(13, 39);
             this.labelDescription.TabIndex = 3;
             this.labelDescription.Text = "a\r\nb\r\nc";
+            this.labelDescription.UseMnemonic = false;
             // 
             // labelAuthor
             // 
@@ -91,6 +93,7 @@
             this.labelAuthor.Size = new System.Drawing.Size(38, 13);
             this.labelAuthor.TabIndex = 3;
             this.labelAuthor.Text = "Author";
+            this.labelAuthor.UseMnemonic = false;
             // 
             // flowLayoutInfo
             // 
@@ -115,6 +118,7 @@
             this.labelWebsite.Size = new System.Drawing.Size(46, 13);
             this.labelWebsite.TabIndex = 5;
             this.labelWebsite.Text = "Website";
+            this.labelWebsite.UseMnemonic = false;
             this.labelWebsite.Click += new System.EventHandler(this.labelWebsite_Click);
             // 
             // labelVersion
@@ -128,6 +132,7 @@
             this.labelVersion.TabIndex = 5;
             this.labelVersion.Text = "Version";
             this.labelVersion.TextAlign = System.Drawing.ContentAlignment.TopRight;
+            this.labelVersion.UseMnemonic = false;
             // 
             // btnOpenConfig
             // 

Plugins/Events/PluginErrorEventArgs.cs

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

Plugins/PluginBridge.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Text;
 using TweetDck.Core.Utils;
@@ -13,6 +14,13 @@ namespace TweetDck.Plugins{
 
         private readonly PluginManager manager;
         private readonly TwoKeyDictionary<int, string, string> fileCache = new TwoKeyDictionary<int, string, string>(4, 2);
+        private readonly TwoKeyDictionary<int, string, InjectedHTML> notificationInjections = new TwoKeyDictionary<int,string,InjectedHTML>(4, 1);
+
+        public IEnumerable<InjectedHTML> NotificationInjections{
+            get{
+                return notificationInjections.InnerValues;
+            }
+        }
 
         public PluginBridge(PluginManager manager){
             this.manager = manager;
@@ -20,16 +28,23 @@ namespace TweetDck.Plugins{
             this.manager.PluginChangedState += manager_PluginChangedState;
         }
 
-        private void manager_Reloaded(object sender, PluginLoadEventArgs e){
+        // Event handlers
+
+        private void manager_Reloaded(object sender, PluginErrorEventArgs e){
             fileCache.Clear();
         }
 
         private void manager_PluginChangedState(object sender, PluginChangedStateEventArgs e){
             if (!e.IsEnabled){
-                fileCache.Remove(manager.GetTokenFromPlugin(e.Plugin));
+                int token = manager.GetTokenFromPlugin(e.Plugin);
+
+                fileCache.Remove(token);
+                notificationInjections.Remove(token);
             }
         }
 
+        // Utility methods
+
         private string GetFullPathOrThrow(int token, PluginFolder folder, string path){
             Plugin plugin = manager.GetPluginFromToken(token);
             string fullPath = plugin == null ? string.Empty : plugin.GetFullPathIfSafe(folder, path);
@@ -98,5 +113,13 @@ namespace TweetDck.Plugins{
         public bool CheckFileExistsRoot(int token, string path){
             return File.Exists(GetFullPathOrThrow(token, PluginFolder.Root, path));
         }
+
+        public void InjectIntoNotificationsBefore(int token, string key, string search, string html){
+            notificationInjections[token, key] = new InjectedHTML(InjectedHTML.Position.Before, search, html);
+        }
+
+        public void InjectIntoNotificationsAfter(int token, string key, string search, string html){
+            notificationInjections[token, key] = new InjectedHTML(InjectedHTML.Position.After, search, html);
+        }
     }
 }

Plugins/PluginManager.cs

@@ -8,7 +8,7 @@ using TweetDck.Plugins.Events;
 using TweetDck.Resources;
 
 namespace TweetDck.Plugins{
-    class PluginManager{
+    sealed class PluginManager{
         public const string PluginBrowserScriptFile = "plugins.browser.js";
         public const string PluginNotificationScriptFile = "plugins.notification.js";
         public const string PluginGlobalScriptFile = "plugins.js";
@@ -22,7 +22,8 @@ namespace TweetDck.Plugins{
         public PluginConfig Config { get; private set; }
         public PluginBridge Bridge { get; private set; }
         
-        public event EventHandler<PluginLoadEventArgs> Reloaded;
+        public event EventHandler<PluginErrorEventArgs> Reloaded;
+        public event EventHandler<PluginErrorEventArgs> Executed;
         public event EventHandler<PluginChangedStateEventArgs> PluginChangedState;
 
         private readonly string rootPath;
@@ -36,11 +37,13 @@ namespace TweetDck.Plugins{
             this.rootPath = path;
             this.SetConfig(config);
             this.Bridge = new PluginBridge(this);
+
+            Program.UserConfigReplaced += Program_UserConfigReplaced;
         }
 
-        public void SetConfig(PluginConfig config){
-            this.Config = config;
-            this.Config.InternalPluginChangedState += Config_InternalPluginChangedState;
+        private void Program_UserConfigReplaced(object sender, EventArgs e){
+            SetConfig(Program.UserConfig.Plugins);
+            Reload();
         }
 
         private void Config_InternalPluginChangedState(object sender, PluginChangedStateEventArgs e){
@@ -49,6 +52,15 @@ namespace TweetDck.Plugins{
             }
         }
 
+        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));
         }
@@ -95,7 +107,7 @@ namespace TweetDck.Plugins{
             }
 
             if (Reloaded != null){
-                Reloaded(this, new PluginLoadEventArgs(loadErrors));
+                Reloaded(this, new PluginErrorEventArgs(loadErrors));
             }
         }
 
@@ -104,6 +116,8 @@ namespace TweetDck.Plugins{
                 ScriptLoader.ExecuteScript(frame, PluginScriptGenerator.GenerateConfig(Config), "gen:pluginconfig");
             }
 
+            List<string> failedPlugins = new List<string>(1);
+
             foreach(Plugin plugin in Plugins){
                 string path = plugin.GetScriptPath(environment);
                 if (string.IsNullOrEmpty(path) || !plugin.CanRun || (!includeDisabled && !Config.IsEnabled(plugin)))continue;
@@ -112,8 +126,8 @@ namespace TweetDck.Plugins{
 
                 try{
                     script = File.ReadAllText(path);
-                }catch{
-                    // TODO
+                }catch(Exception e){
+                    failedPlugins.Add(plugin.Identifier+" ("+Path.GetFileName(path)+"): "+e.Message);
                     continue;
                 }
 
@@ -129,6 +143,10 @@ namespace TweetDck.Plugins{
 
                 ScriptLoader.ExecuteScript(frame, PluginScriptGenerator.GeneratePlugin(plugin.Identifier, script, token, environment), "plugin:"+plugin);
             }
+
+            if (Executed != null){
+                Executed(this, new PluginErrorEventArgs(failedPlugins));
+            }
         }
 
         private IEnumerable<Plugin> LoadPluginsFrom(string path, PluginGroup group){

Program.cs

@@ -15,19 +15,16 @@ using TweetDck.Core.Handling;
 using TweetDck.Core.Other;
 using TweetDck.Updates;
 
-[assembly: CLSCompliant(true)]
 namespace TweetDck{
     static class Program{
         public const string BrandName = "TweetDuck";
         public const string Website = "https://tweetduck.chylex.com";
 
-        public const string VersionTag = "1.6.4";
-        public const string VersionFull = "1.6.4.0";
+        public const string VersionTag = "1.7";
+        public const string VersionFull = "1.7.0.0";
 
         public static readonly Version Version = new Version(VersionTag);
-
         public static readonly bool IsPortable = File.Exists("makeportable");
-        private static readonly CommandLineArgs Args = CommandLineArgs.FromStringArray('-', Environment.GetCommandLineArgs());
 
         public static readonly string ProgramPath = AppDomain.CurrentDomain.BaseDirectory;
         public static readonly string StoragePath = IsPortable ? Path.Combine(ProgramPath, "portable", "storage") : GetDataStoragePath();
@@ -35,7 +32,8 @@ namespace TweetDck{
 
         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 LogFilePath = Path.Combine(StoragePath, "TD_Log.txt");
+        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");
@@ -48,6 +46,8 @@ namespace TweetDck{
         public static UserConfig UserConfig { get; private set; }
         public static Reporter Reporter { get; private set; }
 
+        public static event EventHandler UserConfigReplaced;
+
         [STAThread]
         private static void Main(){
             Application.EnableVisualStyles();
@@ -60,10 +60,10 @@ namespace TweetDck{
                 return;
             }
 
-            Reporter = new Reporter(LogFilePath);
+            Reporter = new Reporter(ErrorLogFilePath);
             Reporter.SetupUnhandledExceptionHandler(BrandName+" Has Failed :(");
 
-            if (Args.HasFlag("-restart")){
+            if (Arguments.HasFlag(Arguments.ArgRestart)){
                 for(int attempt = 0; attempt < 21; attempt++){
                     LockManager.Result lockResult = LockManager.Lock();
 
@@ -76,34 +76,37 @@ namespace TweetDck{
                     }
                     else if (attempt == 20){
                         using(FormMessage form = new FormMessage(BrandName+" Cannot Restart", BrandName+" is taking too long to close.", MessageBoxIcon.Warning)){
-                            form.AddButton("Exit");
-                            Button btnRetry = form.AddButton("Retry");
+                            form.CancelButton = form.AddButton("Exit");
+                            form.ActiveControl = form.AddButton("Retry", DialogResult.Retry);
 
-                            if (form.ShowDialog() == DialogResult.OK){
-                                if (form.ClickedButton == btnRetry){
+                            if (form.ShowDialog() == DialogResult.Retry){
                                 attempt /= 2;
                                 continue;
                             }
-                            }
 
                             return;
                         }
                     }
-                    else{
-                        Thread.Sleep(500);
-                    }
+                    else Thread.Sleep(500);
                 }
             }
             else{
                 LockManager.Result lockResult = LockManager.Lock();
 
                 if (lockResult == LockManager.Result.HasProcess){
-                    if (LockManager.LockingProcess.MainWindowHandle == IntPtr.Zero && LockManager.LockingProcess.Responding){ // restore if the original process is in tray
-                        NativeMethods.SendMessage(NativeMethods.HWND_BROADCAST, WindowRestoreMessage, 0, IntPtr.Zero);
-                        return;
+                    if (LockManager.LockingProcess.MainWindowHandle == IntPtr.Zero){ // restore if the original process is in tray
+                        NativeMethods.SendMessage(NativeMethods.HWND_BROADCAST, WindowRestoreMessage, LockManager.LockingProcess.Id, IntPtr.Zero);
+
+                        if (WindowsUtils.TrySleepUntil(() => {
+                            LockManager.LockingProcess.Refresh();
+                            return LockManager.LockingProcess.HasExited || (LockManager.LockingProcess.MainWindowHandle != IntPtr.Zero && LockManager.LockingProcess.Responding);
+                        }, 2000, 250)){
+                            return; // should trigger on first attempt if succeeded, but wait just in case
                         }
-                    else if (MessageBox.Show("Another instance of "+BrandName+" is already running.\r\nDo you want to close it?", BrandName+" is Already Running", MessageBoxButtons.YesNo, MessageBoxIcon.Error, MessageBoxDefaultButton.Button2) == DialogResult.Yes){
-                        if (!LockManager.CloseLockingProcess(30000)){
+                    }
+                    
+                    if (MessageBox.Show("Another instance of "+BrandName+" is already running.\r\nDo you want to close it?", BrandName+" is Already Running", MessageBoxButtons.YesNo, MessageBoxIcon.Error, MessageBoxDefaultButton.Button2) == DialogResult.Yes){
+                        if (!LockManager.CloseLockingProcess(10000, 5000)){
                             MessageBox.Show("Could not close the other process.", BrandName+" Has Failed :(", MessageBoxButtons.OK, MessageBoxIcon.Error);
                             return;
                         }
@@ -120,23 +123,21 @@ namespace TweetDck{
 
             ReloadConfig();
 
-            if (Args.HasFlag("-importcookies")){
+            if (Arguments.HasFlag(Arguments.ArgImportCookies)){
                 ExportManager.ImportCookies();
             }
             
-            BrowserCache.ClearOldCacheFiles();
-            
             CefSharpSettings.WcfEnabled = false;
 
             CefSettings settings = new CefSettings{
                 AcceptLanguageList = BrowserUtils.HeaderAcceptLanguage,
                 UserAgent = BrowserUtils.HeaderUserAgent,
-                Locale = Args.GetValue("-locale", "en"),
+                Locale = Arguments.GetValue(Arguments.ArgLocale, string.Empty),
                 CachePath = StoragePath,
-                LogFile = Path.Combine(StoragePath, "TD_Console.txt"),
+                LogFile = ConsoleLogFilePath,
                 #if !DEBUG
                 BrowserSubprocessPath = BrandName+".Browser.exe",
-                LogSeverity = Args.HasFlag("-log") ? LogSeverity.Info : LogSeverity.Disable
+                LogSeverity = Arguments.HasFlag(Arguments.ArgLogging) ? LogSeverity.Info : LogSeverity.Disable
                 #endif
             };
 
@@ -147,17 +148,21 @@ namespace TweetDck{
                 settings.CefCommandLineArgs["disable-gpu-vsync"] = "1";
             }
             
+            settings.CefCommandLineArgs["disable-extensions"] = "1";
+            settings.CefCommandLineArgs["disable-plugins-discovery"] = "1";
+            settings.CefCommandLineArgs["enable-system-flash"] = "0";
+
             Cef.Initialize(settings, false, new BrowserProcessHandler());
 
             Application.ApplicationExit += (sender, args) => ExitCleanup();
 
             PluginManager plugins = new PluginManager(PluginPath, UserConfig.Plugins);
             plugins.Reloaded += plugins_Reloaded;
-            plugins.PluginChangedState += (sender, args) => UserConfig.Save();
+            plugins.Executed += plugins_Executed;
             plugins.Reload();
 
             FormBrowser mainForm = new FormBrowser(plugins, new UpdaterSettings{
-                AllowPreReleases = Args.HasFlag("-debugupdates"),
+                AllowPreReleases = Arguments.HasFlag(Arguments.ArgDebugUpdates),
                 DismissedUpdate = UserConfig.DismissedUpdate
             });
 
@@ -166,24 +171,31 @@ namespace TweetDck{
             if (mainForm.UpdateInstallerPath != null){
                 ExitCleanup();
 
-                string updaterArgs = "/SP- /SILENT /CLOSEAPPLICATIONS /UPDATEPATH=\""+ProgramPath+"\" /RUNARGS=\""+GetArgsClean().ToString().Replace("\"", "^\"")+"\""+(IsPortable ? " /PORTABLE=1" : "");
+                // ProgramPath has a trailing backslash
+                string updaterArgs = "/SP- /SILENT /CLOSEAPPLICATIONS /UPDATEPATH=\""+ProgramPath+"\" /RUNARGS=\""+Arguments.GetCurrentClean().ToString().Replace("\"", "^\"")+"\""+(IsPortable ? " /PORTABLE=1" : "");
                 bool runElevated = !IsPortable || !WindowsUtils.CheckFolderWritePermission(ProgramPath);
 
-                WindowsUtils.StartProcess(mainForm.UpdateInstallerPath, updaterArgs, runElevated); // ProgramPath has a trailing backslash
+                WindowsUtils.StartProcess(mainForm.UpdateInstallerPath, updaterArgs, runElevated);
                 Application.Exit();
             }
         }
 
-        private static void plugins_Reloaded(object sender, PluginLoadEventArgs e){
-            if (!e.Success){
-                MessageBox.Show("The following plugins will not be available until the issues are resolved:\n"+string.Join("\n", e.Errors), "Error Loading Plugins", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+        private static void plugins_Reloaded(object sender, PluginErrorEventArgs e){
+            if (e.HasErrors){
+                string doubleNL = Environment.NewLine+Environment.NewLine;
+                MessageBox.Show("The following plugins will not be available until the issues are resolved:"+doubleNL+string.Join(doubleNL, e.Errors), "Error Loading Plugins", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
         }
 
-            ((PluginManager)sender).SetConfig(UserConfig.Plugins);
+        private static void plugins_Executed(object sender, PluginErrorEventArgs e){
+            if (e.HasErrors){
+                string doubleNL = Environment.NewLine+Environment.NewLine;
+                MessageBox.Show("Failed to execute the following plugins:"+doubleNL+string.Join(doubleNL, e.Errors), "Error Executing Plugins", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
         }
 
         private static string GetDataStoragePath(){
-            string custom = Args.GetValue("-datafolder", null);
+            string custom = Arguments.GetValue(Arguments.ArgDataFolder, null);
 
             if (custom != null && (custom.Contains(Path.DirectorySeparatorChar) || custom.Contains(Path.AltDirectorySeparatorChar))){
                 if (Path.GetInvalidPathChars().Any(custom.Contains)){
@@ -202,6 +214,10 @@ namespace TweetDck{
 
         public static void ReloadConfig(){
             UserConfig = UserConfig.Load(ConfigFilePath);
+
+            if (UserConfigReplaced != null){
+                UserConfigReplaced(UserConfig, new EventArgs());
+            }
         }
 
         public static void ResetConfig(){
@@ -216,27 +232,21 @@ namespace TweetDck{
             ReloadConfig();
         }
 
-        private static CommandLineArgs GetArgsClean(){
-            CommandLineArgs args = Args.Clone();
-            args.RemoveFlag("-importcookies");
-            return args;
-        }
-
         public static void Restart(){
             Restart(new string[0]);
         }
 
         public static void Restart(string[] extraArgs){
-            FormBrowser browserForm = Application.OpenForms.OfType<FormBrowser>().FirstOrDefault();
-
-            if (browserForm == null){
-                return;
+            CommandLineArgs args = Arguments.GetCurrentClean();
+            CommandLineArgs.ReadStringArray('-', extraArgs, args);
+            RestartWithArgs(args);
         }
 
-            CommandLineArgs args = GetArgsClean();
-            args.AddFlag("-restart");
+        public static void RestartWithArgs(CommandLineArgs args){
+            FormBrowser browserForm = Application.OpenForms.OfType<FormBrowser>().FirstOrDefault();
+            if (browserForm == null)return;
             
-            CommandLineArgs.ReadStringArray('-', extraArgs, args);
+            args.AddFlag(Arguments.ArgRestart);
 
             browserForm.ForceClose();
             ExitCleanup();

Properties/AssemblyInfo.cs

@@ -1,4 +1,5 @@
-using System.Reflection;
+using System;
+using System.Reflection;
 using System.Runtime.InteropServices;
 using System.Resources;
 using TweetDck;
@@ -38,6 +39,8 @@ using TweetDck;
 
 [assembly: NeutralResourcesLanguageAttribute("en")]
 
+[assembly: CLSCompliant(false)]
+
 #if DEBUG
 [assembly: System.Runtime.CompilerServices.InternalsVisibleTo("UnitTests")]
 #endif

README.md

@@ -1,11 +1,11 @@
 # 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. For **CefSharp**, you will need version 53 or newer currently available as a pre-release.
+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.
 ```
-PM> Install-Package CefSharp.WinForms -Version 53.0.1
+PM> Install-Package CefSharp.WinForms -Version 57.0.0-pre01
 PM> Install-Package Microsoft.VC120.CRT.JetBrains
 ```
 
-After building, run **_postbuild.bat** which deletes unnecessary files that CefSharp adds after post-build events >_>
+After building, run either `_postbuild.bat` if you want to package the files yourself, or `bld/RUN BUILD.bat` to generate installer files using Inno Setup (make sure the Inno Setup binaries are on your PATH).
 
-Built files are then available in **bin/x86** and/or **bin/x64**.
+Built files are then available in **bin/x86**, installer files are generated in **bld/Output**. If you decide to release a custom version publicly, please make it clear that it is not the original TweetDuck. 

Reporter.cs

@@ -48,14 +48,18 @@ namespace TweetDck{
 
             FormMessage form = new FormMessage(caption, message+"\r\nError: "+e.Message, canIgnore ? MessageBoxIcon.Warning : MessageBoxIcon.Error);
             
-            form.AddButton("Exit");
-            Button btnIgnore = form.AddButton("Ignore");
+            Button btnExit = form.AddButton("Exit");
+            Button btnIgnore = form.AddButton("Ignore", DialogResult.Ignore);
+
+            btnIgnore.Enabled = canIgnore;
+            form.ActiveControl = canIgnore ? btnIgnore : btnExit;
+            form.CancelButton = btnIgnore;
 
             Button btnOpenLog = new Button{
                 Anchor = AnchorStyles.Bottom | AnchorStyles.Left,
                 Enabled = loggedSuccessfully,
                 Font = SystemFonts.MessageBoxFont,
-                Location = new Point(12, 12),
+                Location = new Point(6, 12),
                 Margin = new Padding(0, 0, 48, 0),
                 Size = new Size(88, 26),
                 Text = "Show Error Log",
@@ -68,15 +72,9 @@ namespace TweetDck{
 
             form.AddActionControl(btnOpenLog);
 
-            if (!canIgnore){
-                btnIgnore.Enabled = false;
-            }
-
-            if (form.ShowDialog() == DialogResult.OK){
-                if (form.ClickedButton == btnIgnore){
+            if (form.ShowDialog() == DialogResult.Ignore){
                 return;
             }
-            }
 
             try{
                 Process.GetCurrentProcess().Kill();
@@ -90,7 +88,7 @@ namespace TweetDck{
             Application.SetCompatibleTextRenderingDefault(false);
 
             FormMessage form = new FormMessage(caption, message, MessageBoxIcon.Error);
-            form.AddButton("Exit");
+            form.ActiveControl = form.AddButton("Exit");
             form.ShowDialog();
 
             try{

Resources/Plugins/.debug/.meta

@@ -2,13 +2,14 @@
 Debug plugin
 
 [description]
-- Runs several tests on startup, only included in debug configuration
+- Enables debug functionality and tests
+- Only included in debug configuration
 
 [author]
 chylex
 
 [version]
-1.0
+1.1
 
 [website]
 https://tweetduck.chylex.com

Resources/Plugins/.debug/browser.js

@@ -1,3 +1,56 @@
 enabled(){
+  this.isDebugging = false;
   
+  this.onKeyDown = (e) => {
+    // ==========================
+    // F4 key - toggle debug mode
+    // ==========================
+    
+    if (e.keyCode === 115){
+      this.isDebugging = !this.isDebugging;
+      $(".app-title").first().css("background-color", this.isDebugging ? "#5A6B75" : "#292F33");
+    }
+    
+    // Debug mode handling
+    
+    else if (this.isDebugging){
+      e.preventDefault();
+      
+      // ===================================
+      // N key - simulate popup notification
+      // ===================================
+      
+      if (e.keyCode === 78){
+        var col = TD.controller.columnManager.getAllOrdered()[0];
+
+        $.publish("/notifications/new",[{
+          column: col,
+          items: [
+            col.updateArray[Math.floor(Math.random()*col.updateArray.length)]
+          ]
+        }]);
+      }
+      
+      // ===================================
+      // S key - simulate sound notification
+      // ===================================
+      
+      else if (e.keyCode === 83){
+        if ($TDX.hasCustomNotificationSound){
+          $TD.onTweetSound();
+        }
+        else{
+          document.getElementById("update-sound").play();
+        }
+      }
+    }
+  };
+}
+
+ready(){
+  $(document).on("keydown", this.onKeyDown);
+}
+
+disabled(){
+  $(document).off("keydown", this.onKeyDown);
 }

Resources/Plugins/design-revert/.meta

@@ -1,25 +0,0 @@
-[name]
-Revert TweetDeck design changes
-
-[description]
-- Individually configurable options to revert and tweak TweetDeck design changes
-- Moves action menu to the right and hides it by default
-- Reverts interactive texts around tweets (such as 'Details' or 'Conversation')
-
-[author]
-chylex
-
-[version]
-1.2
-
-[website]
-https://tweetduck.chylex.com
-
-[configfile]
-configuration.js
-
-[configdefault]
-configuration.default.js
-
-[requires]
-1.4.1

Resources/Plugins/design-revert/browser.js

@@ -1,46 +0,0 @@
-enabled(){
-  this.css = window.TDPF_createCustomStyle(this);
-  this.prevFooterMustache = TD.mustaches["status/tweet_single_footer.mustache"];
-  
-  // load configuration
-  window.TDPF_loadConfigurationFile(this, "configuration.js", "configuration.default.js", config => {
-    if (config.hideTweetActions){
-      this.css.insert(".tweet-action { opacity: 0; }");
-      this.css.insert(".is-favorite .tweet-action, .is-retweet .tweet-action { opacity: 0.5; visibility: visible !important; }");
-      this.css.insert(".tweet:hover .tweet-action, .is-favorite .tweet-action[rel='favorite'], .is-retweet .tweet-action[rel='retweet'] { opacity: 1; visibility: visible !important; }");
-    }
-    
-    if (config.moveTweetActionsToRight){
-      this.css.insert(".tweet-actions { float: right !important; width: auto !important; }");
-      this.css.insert(".tweet-actions > li:nth-child(4) { margin-right: 2px !important; }");
-    }
-    
-    if (config.smallComposeTextSize){
-      this.css.insert(".compose-text { font-size: 12px !important; height: 120px !important; }");
-    }
-    
-    if (config.revertConversationLinks){
-      var footer = TD.mustaches["status/tweet_single_footer.mustache"];
-      footer = footer.replace('txt-mute txt-size--12', 'txt-mute txt-small');
-      footer = footer.replace('{{#inReplyToID}}', '{{^inReplyToID}} <a class="pull-left margin-txs txt-mute txt-small is-vishidden-narrow" href="#" rel="viewDetails">{{_i}}Details{{/i}}</a> <a class="pull-left margin-txs txt-mute txt-small is-vishidden is-visshown-narrow" href="#" rel="viewDetails">{{_i}}Open{{/i}}</a> {{/inReplyToID}} {{#inReplyToID}}');
-      footer = footer.replace('<span class="link-complex-target"> {{_i}}View Conversation{{/i}}', '<i class="icon icon-conversation icon-small-context"></i> <span class="link-complex-target"> <span class="is-vishidden-wide is-vishidden-narrow">{{_i}}View{{/i}}</span> <span class="is-vishidden is-visshown-wide">{{_i}}Conversation{{/i}}</span>');
-      TD.mustaches["status/tweet_single_footer.mustache"] = footer;
-    }
-    
-    if (config.moveTweetActionsToRight){
-      $(document).on("uiShowActionsMenu", this.uiShowActionsMenuEvent);
-    }
-  });
-  
-  // fix layout for right-aligned actions menu
-  this.uiShowActionsMenuEvent = function(){
-    $(".js-dropdown.pos-r").toggleClass("pos-r pos-l");
-  };
-}
-
-disabled(){
-  this.css.remove();
-  TD.mustaches["status/tweet_single_footer.mustache"] = this.prevFooterMustache;
-  
-  $(document).off("uiShowActionsMenu", this.uiShowActionsMenuEvent);
-}

Resources/Plugins/design-revert/configuration.default.js

@@ -1,22 +0,0 @@
-{
-  /*
-   * Hides the action bar below each tweet.
-   * The action bar fully appears when the mouse is over the tweet, or at half the opacity when the tweet is liked/retweeted.
-   */
-  hideTweetActions: true,
-  
-  /*
-   * Moves the action bar to the right side of the tweet.
-   */
-  moveTweetActionsToRight: true,
-  
-  /*
-   * Reverts New Tweet font size to a smaller one.
-   */
-  smallComposeTextSize: false,
-  
-  /*
-   * Reverts design changes to the 'View Conversation' and 'Details' links.
-   */
-  revertConversationLinks: true
-}

Resources/Plugins/edit-design/.meta

@@ -0,0 +1,17 @@
+[name]
+Edit layout & design
+
+[description]
+- Adds new layout and design configuration, which can be accessed via Settings - Edit layout & design
+
+[author]
+chylex
+
+[version]
+1.0
+
+[website]
+https://tweetduck.chylex.com
+
+[requires]
+1.7

Resources/Plugins/edit-design/browser.js

@@ -0,0 +1,355 @@
+constructor(){
+  super({
+    requiresPageReload: true
+  })
+}
+
+enabled(){
+  // elements & data
+  this.css = null;
+  this.htmlModal = null;
+  this.config = null;
+  
+  this.defaultConfig = {
+    columnWidth: "310px",
+    fontSize: "12px",
+    hideTweetActions: true,
+    moveTweetActionsToRight: true,
+    revertReplies: false,
+    roundedScrollBars: false,
+    smallComposeTextSize: false,
+    optimizeAnimations: true,
+    avatarRadius: 10
+  };
+  
+  // modal dialog loading
+  $TDP.readFileRoot(this.$token, "modal.html").then(contents => {
+    this.htmlModal = contents;
+  }).catch(err => {
+    $TD.alert("error", "Problem loading data for the design edit plugin: "+err.message);
+  });
+  
+  // configuration
+  const configFile = "config.json";
+  this.tmpConfig = null;
+  
+  var loadConfigObject = obj => {
+    this.tmpConfig = obj || {};
+    
+    if (window.TD_APP_READY){
+      this.onAppReady();
+    }
+    
+    this.injectDeciderReplyHook(this.tmpConfig.revertReplies);
+  };
+  
+  this.onAppReady = () => {
+    if (this.tmpConfig !== null){
+      this.config = $.extend(this.defaultConfig, this.tmpConfig);
+      this.tmpConfig = null;
+      this.reinjectAll();
+    }
+  };
+  
+  $TDP.checkFileExists(this.$token, configFile).then(exists => {
+    if (!exists){
+      loadConfigObject(null);
+    }
+    else{
+      $TDP.readFile(this.$token, configFile, true).then(contents => {
+        try{
+          loadConfigObject(JSON.parse(contents));
+        }catch(err){
+          loadConfigObject(null);
+        }
+      }).catch(err => {
+        loadConfigObject(null);
+        $TD.alert("error", "Problem loading configuration for the design edit plugin: "+err.message);
+      });
+    }
+  });
+  
+  this.saveConfig = () => {
+    $TDP.writeFile(this.$token, configFile, JSON.stringify(this.config)).catch(err => {
+      $TD.alert("error", "Problem saving configuration for the design edit plugin: "+err.message);
+    });
+  };
+  
+  // settings click event
+  this.onSettingsMenuClickedEvent = () => {
+    if (this.htmlModal === null || this.config === null){
+      return;
+    }
+    
+    setTimeout(() => {
+      let menu = $(".js-dropdown-content").children("ul").first();
+      if (menu.length === 0)return;
+      
+      let itemTD = menu.children("[data-std]").first();
+      if (itemTD.length === 0)return;
+      
+      if (!itemTD.prev().hasClass("drp-h-divider")){
+        itemTD.before('<li class="drp-h-divider"></li>');
+      }
+      
+      let itemEditDesign = $('<li class="is-selectable"><a href="#" data-action>Edit layout &amp; design</a></li>');
+      itemTD.after(itemEditDesign);
+      
+      itemEditDesign.on("click", "a", function(){
+        new customDesignModal();
+      });
+      
+      itemEditDesign.hover(function(){
+        $(this).addClass("is-selected");
+      }, function(){
+        $(this).removeClass("is-selected");
+      });
+    }, 1);
+  };
+  
+  // modal dialog setup
+  var me = this;
+  
+  var updateKey = function(key, value){
+    me.config[key] = value;
+    
+    setTimeout(function(){
+      me.saveConfig();
+      me.reinjectAll();
+    }, 1); // delays the slight lag caused by saving and reinjection
+  };
+  
+  var customDesignModal = TD.components.BaseModal.extend(function(){
+    let modal = $("#td-design-plugin-modal");
+    this.setAndShowContainer(modal, false);
+    
+    // RELOAD
+    this.reloadPage = false;
+    modal.find("[data-td-reload]").click(() => this.reloadPage = true);
+    
+    // UI EVENTS
+    let getTextForCustom = function(key){
+      return "Custom ("+me.config[key]+")";
+    };
+    
+    modal.find("[data-td-key]").each(function(){
+      let item = $(this);
+      let tag = item.prop("tagName");
+      let key = item.attr("data-td-key");
+      
+      // INPUTS
+      if (tag === "INPUT"){
+        let type = item.attr("type");
+        
+        if (type === "checkbox"){
+          item.prop("checked", me.config[key]);
+          
+          item.change(function(){
+            updateKey(key, item.prop("checked"));
+          });
+        }
+      }
+      // SELECTS
+      else if (tag === "SELECT"){
+        if (!item.val(me.config[key]).val()){
+          let custom = item.find("option[value='custom']");
+          
+          if (custom.length === 1){
+            item.val("custom");
+            custom.text(getTextForCustom(key));
+          }
+        }
+        
+        item.change(function(){ // TODO change doesn't fire when Custom is already selected
+          let val = item.val();
+          
+          if (val === "custom"){
+            val = prompt("Enter custom value:");
+            
+            if (val){
+              updateKey(key, val);
+              item.find("option[value='custom']").text(getTextForCustom(key));
+            }
+          }
+          else{
+            updateKey(key, item.val());
+          }
+        });
+      }
+      // CUSTOM ELEMENTS
+      else{
+        let value = item.attr("data-td-value");
+        
+        if (value == me.config[key]){
+          item.addClass("selected");
+        }
+
+        item.click(function(){
+          modal.find("[data-td-key='"+key+"']").removeClass("selected");
+          item.addClass("selected");
+          updateKey(key, value);
+        });
+      }
+    });
+    
+    // THEMES
+    modal.find("[data-td-theme='"+TD.settings.getTheme()+"']").prop("checked", true);
+    
+    modal.find("[data-td-theme]").change(function(){
+      setTimeout(function(){
+        TD.settings.setTheme($(this).attr("data-td-theme"));
+        $(document).trigger("uiToggleTheme");
+      }, 1);
+    });
+  }).methods({
+    _render: () => $(this.htmlModal),
+    destroy: function(){
+      if (this.reloadPage){
+        location.reload();
+        return;
+      }
+      
+      $("#td-design-plugin-modal").hide();
+      this.supr();
+    }
+  });
+  
+  // decider injections
+  this.injectDeciderReplyHook = enable => {
+    let prevFunc = TD.decider.updateFromBackend;
+    
+    TD.decider.updateFromBackend = function(data){
+      data["simplified_replies"] = !enable;
+      return prevFunc.apply(this, arguments);
+    };
+    
+    TD.decider.updateForGuestId();
+    this.$pluginSettings.requiresPageReload = enable;
+  };
+  
+  // css and layout injection
+  this.resetDesign = () => {
+    if (this.css){
+      this.css.remove();
+    }
+    
+    this.css = window.TDPF_createCustomStyle(this);
+  };
+  
+  this.reinjectAll = () => {
+    this.resetDesign();
+    
+    this.css.insert(".txt-base-smallest:not(.icon), .txt-base-largest:not(.icon) { font-size: "+this.config.fontSize+" !important }");
+    this.css.insert(".avatar { border-radius: "+this.config.avatarRadius+"% !important }");
+    
+    if (this.config.hideTweetActions){
+      this.css.insert(".tweet-action { opacity: 0; }");
+      this.css.insert(".is-favorite .tweet-action, .is-retweet .tweet-action { opacity: 0.5; visibility: visible !important }");
+      this.css.insert(".tweet:hover .tweet-action, .is-favorite .tweet-action[rel='favorite'], .is-retweet .tweet-action[rel='retweet'] { opacity: 1; visibility: visible !important }");
+    }
+    
+    if (this.config.moveTweetActionsToRight){
+      this.css.insert(".tweet-actions { float: right !important; width: auto !important }");
+      this.css.insert(".tweet-actions > li:nth-child(4) { margin-right: 2px !important }");
+    }
+    
+    if (this.config.smallComposeTextSize){
+      this.css.insert(".compose-text { font-size: 12px !important; height: 120px !important }");
+    }
+    
+    if (!this.config.roundedScrollBars){
+      this.css.insert(".scroll-styled-v:not(.antiscroll-inner)::-webkit-scrollbar { width: 8px }");
+      this.css.insert(".scroll-styled-h:not(.antiscroll-inner)::-webkit-scrollbar { height: 8px }");
+      this.css.insert(".scroll-styled-v::-webkit-scrollbar-thumb { border-radius: 0 }");
+      this.css.insert(".scroll-styled-h::-webkit-scrollbar-thumb { border-radius: 0 }");
+      this.css.insert(".antiscroll-scrollbar { border-radius: 0 }");
+      this.css.insert(".antiscroll-scrollbar-vertical { margin-top: 0 }");
+      this.css.insert(".antiscroll-scrollbar-horizontal { margin-left: 0 }");
+    }
+    
+    if (this.config.optimizeAnimations){
+      this.css.insert(".app-content { will-change: transform }");
+      this.css.insert(".column-holder { will-change: transform }");
+    }
+    
+    if (this.config.columnWidth[0] === '/'){
+      let cols = this.config.columnWidth.slice(1);
+      
+      this.css.insert(".column { width: calc((100vw - 205px) / "+cols+" - 8px) !important }");
+      this.css.insert(".is-condensed .column { width: calc((100vw - 55px) / "+cols+" - 8px) !important }");
+    }
+    else{
+      this.css.insert(".column { width: "+this.config.columnWidth+" !important }");
+    }
+    
+    switch(this.config.columnWidth){
+      case "/6":
+        TD.settings.setColumnWidth("narrow");
+        break;
+        
+      case "310px":
+      case "/5":
+        TD.settings.setColumnWidth("medium");
+        break;
+        
+      default:
+        TD.settings.setColumnWidth(parseInt(this.config.columnWidth, 10) < 310 ? "narrow" : "wide"); // NaN will give "wide"
+        break;
+    }
+    
+    switch(this.config.fontSize){
+      case "13px": TD.settings.setFontSize("small"); break;
+      case "14px": TD.settings.setFontSize("medium"); break;
+      case "15px": TD.settings.setFontSize("large"); break;
+      default: TD.settings.setFontSize(parseInt(this.config.fontSize, 10) >= 16 ? "largest" : "smallest"); break;
+    }
+    
+    $TDP.injectIntoNotificationsBefore(this.$token, "css", "</head>", [
+      "<style type='text/css'>",
+      ".txt-base-smallest:not(.icon), .txt-base-largest:not(.icon) { font-size: "+this.config.fontSize+" !important }",
+      ".avatar { border-radius: "+this.config.avatarRadius+"% !important }",
+      "</style>"
+    ].join(""));
+  };
+  
+  this.uiShowActionsMenuEvent = () => {
+    if (this.config.moveTweetActionsToRight){
+      $(".js-dropdown.pos-r").toggleClass("pos-r pos-l");
+    }
+  };
+}
+
+ready(){
+  // configuration
+  switch(TD.settings.getColumnWidth()){
+    case "wide": this.defaultConfig.columnWidth = "350px"; break;
+    case "narrow": this.defaultConfig.columnWidth = "270px"; break;
+  }
+  
+  switch(TD.settings.getFontSize()){
+    case "small": this.defaultConfig.fontSize = "13px"; break;
+    case "medium": this.defaultConfig.fontSize = "14px"; break;
+    case "large": this.defaultConfig.fontSize = "15px"; break;
+    case "largest": this.defaultConfig.fontSize = "16px"; break;
+  }
+  
+  this.onAppReady();
+  
+  // layout events
+  $(document).on("uiShowActionsMenu", this.uiShowActionsMenuEvent);
+  
+  // modal
+  $("[data-action='settings-menu']").on("click", this.onSettingsMenuClickedEvent);
+  $(".js-app").append('<div id="td-design-plugin-modal" class="js-modal settings-modal ovl scroll-v scroll-styled-v"></div>');
+}
+
+disabled(){
+  if (this.css){
+    this.css.remove();
+  }
+  
+  $(document).off("uiShowActionsMenu", this.uiShowActionsMenuEvent);
+  
+  $("[data-action='settings-menu']").off("click", this.onSettingsMenuClickedEvent);
+  $("#td-design-plugin-modal").remove();
+}

Resources/Plugins/edit-design/modal.html

@@ -0,0 +1,235 @@
+<div class="td-modal-panel js-modal-panel mdl s-tall-fixed is-inverted-dark">
+  <header class="js-mdl-header mdl-header js-drag-handle">
+    <h3 class="mdl-header-title js-header-title">TweetDuck - Layout &amp; Design</h3>
+    <a href="#" class="mdl-dismiss js-dismiss link-normal-dark">
+      <i class="icon icon-close"></i>
+    </a>
+  </header>
+  <div class="mdl-inner">
+    <div class="td-modal-content mdl-content js-mdl-content horizontal-flow-container">
+      <div class="td-modal-inner-cols">
+        <div class="l-column mdl-column">
+          
+          <!-- THEME -->
+          
+          <label class="txt-uppercase touch-larger-label">
+            <b>Theme</b>
+          </label>
+          <label class="radio">
+            <input data-td-theme="dark" class="js-theme-radio touch-larger-label" name="theme" type="radio">
+            Dark
+          </label>
+          <label class="radio">
+            <input data-td-theme="light" class="js-theme-radio touch-larger-label" name="theme" type="radio">
+            Light
+          </label>
+          
+          <!-- COLUMN SIZE -->
+          
+          <label class="txt-uppercase touch-larger-label">
+            <b>Columns</b>
+          </label>
+          <select data-td-key="columnWidth">
+            <option disabled></option>
+            <optgroup label="Fixed width">
+              <option value="270px">Narrow (270px)</option>
+              <option value="310px">Medium (310px)</option>
+              <option value="350px">Wide (350px)</option>
+              <option value="400px">Extreme (400px)</option>
+              <option value="custom">Custom</option>
+            </optgroup>
+            <option disabled></option>
+            <optgroup label="Dynamic width">
+              <option value="/3">3 columns on screen</option>
+              <option value="/4">4 columns on screen</option>
+              <option value="/5">5 columns on screen</option>
+              <option value="/6">6 columns on screen</option>
+            </optgroup>
+            <option disabled></option>
+          </select>
+          
+          <!-- FONT SIZE -->
+          
+          <label class="txt-uppercase touch-larger-label">
+            <b>Font size</b>
+          </label>
+          <select data-td-key="fontSize">
+            <option value="12px">Tiny (12px)</option>
+            <option value="13px">Small (13px)</option>
+            <option value="14px">Medium (14px)</option>
+            <option value="15px">Large (15px)</option>
+            <option value="16px">Largest (16px)</option>
+            <option value="custom">Custom</option>
+          </select>
+        </div>
+        
+        <div class="l-column mdl-column">
+          
+          <!-- LAYOUT -->
+          
+          <label class="txt-uppercase touch-larger-label">
+            <b>Layout</b>
+          </label>
+          <label class="checkbox">
+            <input data-td-key="hideTweetActions" class="js-theme-checkbox touch-larger-label" type="checkbox">
+            Hide tweet actions
+          </label>
+          <label class="checkbox">
+            <input data-td-key="moveTweetActionsToRight" class="js-theme-checkbox touch-larger-label" type="checkbox">
+            Tweet actions on the right side
+          </label>
+          <label class="checkbox">
+            <input data-td-key="revertReplies" data-td-reload class="js-theme-checkbox touch-larger-label" type="checkbox">
+            Revert reply style (reloads page)
+          </label>
+          
+          <!-- DESIGN -->
+          
+          <label class="txt-uppercase touch-larger-label">
+            <b>Design</b>
+          </label>
+          <label class="checkbox">
+            <input data-td-key="roundedScrollBars" class="js-theme-checkbox touch-larger-label" type="checkbox">
+            Rounded scroll bars
+          </label>
+          <label class="checkbox">
+            <input data-td-key="smallComposeTextSize" class="js-theme-checkbox touch-larger-label" type="checkbox">
+            Small compose tweet font size
+          </label>
+          
+          <!-- ADVANCED -->
+          
+          <label class="txt-uppercase touch-larger-label">
+            <b>Advanced</b>
+          </label>
+          <label class="checkbox">
+            <input data-td-key="optimizeAnimations" class="js-theme-checkbox touch-larger-label" type="checkbox">
+            Optimize animations (uses more memory for smoother animations)
+          </label>
+        </div>
+        
+        <div class="l-column mdl-column">
+      
+          <!-- AVATAR SHAPE -->
+        
+          <label class="txt-uppercase touch-larger-label">
+            <b>Avatar shape</b>
+          </label>
+          <div class="td-avatar-shape-container">
+            <div class="td-avatar-shape-item-outer" data-td-key="avatarRadius" data-td-value="2">
+              <div class="td-avatar-shape" style="border-radius:2%"></div>
+              <label>Square</label>
+            </div>
+            <div class="td-avatar-shape-item-outer" data-td-key="avatarRadius" data-td-value="10">
+              <div class="td-avatar-shape" style="border-radius:10%"></div>
+              <label>Default</label>
+            </div>
+            <div class="td-avatar-shape-item-outer" data-td-key="avatarRadius" data-td-value="30">
+              <div class="td-avatar-shape" style="border-radius:30%"></div>
+              <label>Round</label>
+            </div>
+            <div class="td-avatar-shape-item-outer" data-td-key="avatarRadius" data-td-value="50">
+              <div class="td-avatar-shape" style="border-radius:50%"></div>
+              <label>Circle</label>
+            </div>
+          </div>
+        </div>
+      </div>
+      
+      <!-- END -->
+    </div>
+    <footer class="padding-vxl txt-center">
+      <button class="js-dismiss btn btn-positive pull-right">
+        <i class="icon icon-check icon-small padding-rs"></i>
+        <span class="label">Done</span>
+      </button>
+    </footer>
+  </div>
+</div>
+
+<style type="text/css">
+  
+  /* Containers */
+  
+  .td-modal-panel {
+    width: 693px;
+    height: 374px;
+  }
+  
+  .td-modal-inner-cols {
+    padding: 0 6px;
+  }
+  
+  .td-modal-inner-cols .l-column {
+    padding: 15px 9px;
+    box-sizing: border-box;
+    font-size: 0; /* fix custom font size breaking the modal layout */
+  }
+  
+  .td-modal-inner-cols .l-column:nth-child(2) {
+    width: 250px;
+  }
+  
+  .td-modal-inner-full {
+    padding: 15px;
+  }
+  
+  .td-modal-inner-full .txt-center {
+    margin-bottom: 10px;
+  }
+  
+  /* Elements */
+  
+  .td-modal-content label {
+    margin-top: 18px;
+  }
+  
+  .td-modal-content label:first-child {
+    margin-top: 0;
+  }
+  
+  .td-modal-content label.radio {
+    display: inline-block;
+    margin: 0 16px 5px 4px;
+    cursor: pointer;
+  }
+  
+  .td-modal-content label.checkbox {
+    margin: 0 0 5px 4px;
+    cursor: pointer;
+  }
+  
+  /* Avatar shape */
+  
+  .td-avatar-shape-container {
+    text-align: center;
+  }
+  
+  .td-avatar-shape-item-outer {
+    display: inline-block;
+    margin: 0 4px 10px;
+    padding: 16px 14px 8px;
+    box-sizing: border-box;
+    box-shadow: 0 0 4px rgba(0, 0, 0, 0.1);
+    border: 2px solid #F5F8FA;
+    background-color: #F5F8FA;
+  }
+  
+  .td-avatar-shape-item-outer:hover {
+    border-color: #888;
+  }
+  
+  .td-avatar-shape-item-outer.selected {
+    border-color: #666;
+  }
+  
+  .td-avatar-shape-item-outer label {
+    margin: 10px 0 0;
+  }
+  
+  .td-avatar-shape {
+    width: 48px;
+    height: 48px;
+    background-color: #71BAF2;
+  }
+</style>

Resources/Plugins/emoji-keyboard/browser.js

@@ -1,14 +1,40 @@
 enabled(){
-  this.emojiHTML = "";
+  this.selectedSkinTone = "";
+  
+  this.skinToneList = [
+    "", "1F3FB", "1F3FC", "1F3FD", "1F3FE", "1F3FF"
+  ];
+  
+  this.skinToneNonDefaultList = [
+    "1F3FB", "1F3FC", "1F3FD", "1F3FE", "1F3FF"
+  ];
+  
+  this.skinToneData = [
+    [ "", "#FFDD67" ],
+    [ "1F3FB", "#FFE1BD" ],
+    [ "1F3FC", "#FED0AC" ],
+    [ "1F3FD", "#D6A57C" ],
+    [ "1F3FE", "#B47D56" ],
+    [ "1F3FF", "#8A6859" ],
+  ];
+  
+  this.emojiHTML1 = ""; // no skin tones, prepended
+  this.emojiHTML2 = {}; // contains emojis with skin tones
+  this.emojiHTML3 = ""; // no skin tones, appended
   
   var me = this;
   
   // styles
   
   this.css = window.TDPF_createCustomStyle(this);
-  this.css.insert(".emoji-keyboard { position: absolute; width: 15.35em; height: 11.2em; background-color: white; overflow-y: auto; padding: 0.1em; box-sizing: border-box; border-radius: 2px; font-size: 24px; z-index: 9999 }");
-  this.css.insert(".emoji-keyboard .separator { height: 26px; }");
-  this.css.insert(".emoji-keyboard .emoji { padding: 0.1em !important; cursor: pointer }");
+  this.css.insert(".emoji-keyboard { position: absolute; width: 15.35em; background-color: white; border-radius: 2px 2px 3px 3px; font-size: 24px; z-index: 9999 }");
+  this.css.insert(".emoji-keyboard-list { height: 10.14em; padding: 0.1em; box-sizing: border-box; overflow-y: auto }");
+  this.css.insert(".emoji-keyboard-list .separator { height: 26px }");
+  this.css.insert(".emoji-keyboard-list .emoji { padding: 0.1em !important; cursor: pointer }");
+  this.css.insert(".emoji-keyboard-skintones { height: 1.3em; text-align: center; background-color: #292f33; border-radius: 0 0 2px 2px }");
+  this.css.insert(".emoji-keyboard-skintones div { width: 0.8em; height: 0.8em; margin: 0.25em 0.1em; border-radius: 50%; display: inline-block; box-sizing: border-box; cursor: pointer }");
+  this.css.insert(".emoji-keyboard-skintones .sel { border: 2px solid rgba(0, 0, 0, 0.35); box-shadow: 0 0 2px 0 rgba(255, 255, 255, 0.65), 0 0 1px 0 rgba(255, 255, 255, 0.4) inset }");
+  this.css.insert(".emoji-keyboard-skintones :hover { border: 2px solid rgba(0, 0, 0, 0.25); box-shadow: 0 0 1px 0 rgba(255, 255, 255, 0.65), 0 0 1px 0 rgba(255, 255, 255, 0.25) inset }");
   
   // layout
   
@@ -34,16 +60,29 @@ enabled(){
     $(".emoji-keyboard-popup-btn").removeClass("is-selected");
   };
   
-  this.generateKeyboardFor = (input, left, top) => {
-    var created = document.createElement("div");
-    document.body.appendChild(created);
+  var generateEmojiHTML = skinTone => {
+    return this.emojiHTML1+this.emojiHTML2[skinTone]+this.emojiHTML3;
+  };
   
-    created.classList.add("emoji-keyboard");
-    created.style.left = left+"px";
-    created.style.top = top+"px";
-    created.innerHTML = this.emojiHTML;
+  var selectSkinTone = skinTone => {
+    let selectedEle = this.currentKeyboard.children[1].querySelector("[data-tone='"+this.selectedSkinTone+"']");
+    selectedEle && selectedEle.classList.remove("sel");
     
-    created.addEventListener("click", function(e){
+    this.selectedSkinTone = skinTone;
+    this.currentKeyboard.children[0].innerHTML = generateEmojiHTML(skinTone);
+    this.currentKeyboard.children[1].querySelector("[data-tone='"+this.selectedSkinTone+"']").classList.add("sel");
+  };
+  
+  this.generateKeyboard = (input, left, top) => {
+    var outer = document.createElement("div");
+    outer.classList.add("emoji-keyboard");
+    outer.style.left = left+"px";
+    outer.style.top = top+"px";
+    
+    var keyboard = document.createElement("div");
+    keyboard.classList.add("emoji-keyboard-list");
+    
+    keyboard.addEventListener("click", function(e){
       if (e.target.tagName === "IMG"){
         input.val(input.val()+e.target.getAttribute("alt"));
         input.trigger("change");
@@ -53,7 +92,24 @@ enabled(){
       e.stopPropagation();
     });
     
-    return created;
+    var skintones = document.createElement("div");
+    skintones.innerHTML = me.skinToneData.map(entry => "<div data-tone='"+entry[0]+"' style='background-color:"+entry[1]+"'></div>").join("");
+    skintones.classList.add("emoji-keyboard-skintones");
+    
+    skintones.addEventListener("click", function(e){
+      if (e.target.hasAttribute("data-tone")){
+        selectSkinTone(e.target.getAttribute("data-tone") || "");
+      }
+      
+      e.stopPropagation();
+    });
+    
+    outer.appendChild(keyboard);
+    outer.appendChild(skintones);
+    document.body.appendChild(outer);
+    
+    this.currentKeyboard = outer;
+    selectSkinTone(this.selectedSkinTone);
   };
   
   this.prevTryPasteImage = window.TDGF_tryPasteImage;
@@ -75,7 +131,7 @@ enabled(){
     }
     else{
       var pos = $(this).offset();
-      me.currentKeyboard = me.generateKeyboardFor($(".js-compose-text").first(), pos.left, pos.top+$(this).outerHeight()+8);
+      me.generateKeyboard($(".js-compose-text").first(), pos.left, pos.top+$(this).outerHeight()+8);
       
       $(this).addClass("is-selected");
     }
@@ -123,38 +179,93 @@ ready(){
   };
   
   $TDP.readFileRoot(this.$token, "emoji-ordering.txt").then(contents => {
-    let generated = [];
+    let generated1 = [];
+    let generated2 = {};
+    let generated3 = [];
     
-    let addDeclaration = decl => {
-      generated.push(decl.split(" ").map(pt => convUnicode(parseInt(pt, 16))).join(""));
+    for(let skinTone of this.skinToneList){
+      generated2[skinTone] = [];
+    }
+    
+    // declaration inserters
+    
+    let addDeclaration1 = decl => {
+      generated1.push(decl.split(" ").map(pt => convUnicode(parseInt(pt, 16))).join(""));
     };
     
-    let skinTones = [
-      "1F3FB", "1F3FC", "1F3FD", "1F3FE", "1F3FF"
-    ];
+    let addDeclaration2 = (tone, decl) => {
+      let gen = decl.split(" ").map(pt => convUnicode(parseInt(pt, 16))).join("");
+      
+      if (tone === null){
+        for(let skinTone of this.skinToneList){
+          generated2[skinTone].push(gen);
+        }
+      }
+      else{
+        generated2[tone].push(gen);
+      }
+    };
+    
+    let addDeclaration3 = decl => {
+      generated3.push(decl.split(" ").map(pt => convUnicode(parseInt(pt, 16))).join(""));
+    };
+    
+    // line reading
+                      
+    let skinToneState = 0;
     
     for(let line of contents.split("\n")){
       if (line[0] === '@'){
-        generated.push("___");
+        switch(skinToneState){
+          case 0: generated1.push("___"); break;
+          case 1: this.skinToneList.forEach(skinTone => generated2[skinTone].push("___")); break;
+          case 2: generated3.push("___"); break;
         }
-      else{
-        let decl = line.slice(0, line.indexOf(";"));
+        
+        if (line[1] === '1'){
+          skinToneState = 1;
+        }
+        else if (line[1] === '2'){
+          skinToneState = 2;
+        }
+      }
+      else if (skinToneState === 1){
+        let decl = line.slice(0, line.indexOf(';'));
         let skinIndex = decl.indexOf('$');
 
         if (skinIndex !== -1){
           let declPre = decl.slice(0, skinIndex);
           let declPost = decl.slice(skinIndex+1);
           
-          skinTones.map(skinTone => declPre+skinTone+declPost).forEach(addDeclaration);
+          for(let skinTone of this.skinToneNonDefaultList){
+            generated2[skinTone].pop();
+            addDeclaration2(skinTone, declPre+skinTone+declPost);
+          }
         }
         else{
-          addDeclaration(decl);
+          addDeclaration2(null, decl);
         }
       }
+      else if (skinToneState === 2){
+        addDeclaration3(line.slice(0, line.indexOf(';')));
+      }
+      else if (skinToneState === 0){
+        addDeclaration1(line.slice(0, line.indexOf(';')));
+      }
     }
     
+    // final processing
+    
+    let replaceSeparators = str => str.replace(/___/g, "<div class='separator'></div>");
+    
     let start = "<p style='font-size:13px;color:#444;margin:4px;text-align:center'>Please, note that most emoji will not show up properly in the text box above, but they will display in the tweet.</p>";
-    this.emojiHTML = start+TD.util.cleanWithEmoji(generated.join("")).replace(/___/g, "<div class='separator'></div>");
+    this.emojiHTML1 = start+replaceSeparators(TD.util.cleanWithEmoji(generated1.join("")));
+    
+    for(let skinTone of this.skinToneList){
+      this.emojiHTML2[skinTone] = replaceSeparators(TD.util.cleanWithEmoji(generated2[skinTone].join("")));
+    }
+    
+    this.emojiHTML3 = replaceSeparators(TD.util.cleanWithEmoji(generated3.join("")));
   }).catch(err => {
     $TD.alert("error", "Problem loading emoji keyboard: "+err.message);
   });

Resources/Plugins/emoji-keyboard/emoji-ordering.txt

@@ -96,7 +96,7 @@
 1F648; 🙈 see-no-evil monkey
 1F649; 🙉 hear-no-evil monkey
 1F64A; 🙊 speak-no-evil monkey
-@
+@1 enable skin tones
 1F466; 👦 boy
 1F466 $; 👦🏻 boy
 1F467; 👧 girl
@@ -176,39 +176,27 @@
 1F468 200D 1F692; 👨‍🚒 man firefighter
 1F468 $ 200D 1F692; 👨🏻‍🚒 man firefighter
 1F469 200D 1F692; 👩‍🚒 woman firefighter
-1F469 $ 200D 1F692; 👩🏻‍🚒 woman firefighter
-1F46E; 👮 police officer
-1F46E $; 👮🏻 police officer
+1F469 $ 200D 1F692; 👩🏻‍🚒 woman firefighter !! deleted non-gendered duplicates below
 1F46E 200D 2642 FE0F; 👮‍♂️ man police officer
 1F46E $ 200D 2642 FE0F; 👮🏻‍♂️ man police officer
 1F46E 200D 2640 FE0F; 👮‍♀️ woman police officer
 1F46E $ 200D 2640 FE0F; 👮🏻‍♀️ woman police officer
-1F575; 🕵 detective
-1F575 $; 🕵🏻 detective
 1F575 FE0F 200D 2642 FE0F; 🕵️‍♂️ man detective
 1F575 $ 200D 2642 FE0F; 🕵🏻‍♂️ man detective
 1F575 FE0F 200D 2640 FE0F; 🕵️‍♀️ woman detective
 1F575 $ 200D 2640 FE0F; 🕵🏻‍♀️ woman detective
-1F482; 💂 guard
-1F482 $; 💂🏻 guard
 1F482 200D 2642 FE0F; 💂‍♂️ man guard
 1F482 $ 200D 2642 FE0F; 💂🏻‍♂️ man guard
 1F482 200D 2640 FE0F; 💂‍♀️ woman guard
 1F482 $ 200D 2640 FE0F; 💂🏻‍♀️ woman guard
-1F477; 👷 construction worker
-1F477 $; 👷🏻 construction worker
 1F477 200D 2642 FE0F; 👷‍♂️ man construction worker
 1F477 $ 200D 2642 FE0F; 👷🏻‍♂️ man construction worker
 1F477 200D 2640 FE0F; 👷‍♀️ woman construction worker
 1F477 $ 200D 2640 FE0F; 👷🏻‍♀️ woman construction worker
-1F473; 👳 person wearing turban
-1F473 $; 👳🏻 person wearing turban
 1F473 200D 2642 FE0F; 👳‍♂️ man wearing turban
 1F473 $ 200D 2642 FE0F; 👳🏻‍♂️ man wearing turban
 1F473 200D 2640 FE0F; 👳‍♀️ woman wearing turban
 1F473 $ 200D 2640 FE0F; 👳🏻‍♀️ woman wearing turban
-1F471; 👱 blond-haired person
-1F471 $; 👱🏻 blond-haired person
 1F471 200D 2642 FE0F; 👱‍♂️ blond-haired man
 1F471 $ 200D 2642 FE0F; 👱🏻‍♂️ blond-haired man
 1F471 200D 2640 FE0F; 👱‍♀️ blond-haired woman
@@ -229,80 +217,54 @@
 1F930 $; 🤰🏻 pregnant woman
 1F472; 👲 man with Chinese cap
 1F472 $; 👲🏻 man with Chinese cap
-1F64D; 🙍 person frowning
-1F64D $; 🙍🏻 person frowning
 1F64D 200D 2642 FE0F; 🙍‍♂️ man frowning
 1F64D $ 200D 2642 FE0F; 🙍🏻‍♂️ man frowning
 1F64D 200D 2640 FE0F; 🙍‍♀️ woman frowning
 1F64D $ 200D 2640 FE0F; 🙍🏻‍♀️ woman frowning
-1F64E; 🙎 person pouting
-1F64E $; 🙎🏻 person pouting
 1F64E 200D 2642 FE0F; 🙎‍♂️ man pouting
 1F64E $ 200D 2642 FE0F; 🙎🏻‍♂️ man pouting
 1F64E 200D 2640 FE0F; 🙎‍♀️ woman pouting
 1F64E $ 200D 2640 FE0F; 🙎🏻‍♀️ woman pouting
-1F645; 🙅 person gesturing NO
-1F645 $; 🙅🏻 person gesturing NO
 1F645 200D 2642 FE0F; 🙅‍♂️ man gesturing NO
 1F645 $ 200D 2642 FE0F; 🙅🏻‍♂️ man gesturing NO
 1F645 200D 2640 FE0F; 🙅‍♀️ woman gesturing NO
 1F645 $ 200D 2640 FE0F; 🙅🏻‍♀️ woman gesturing NO
-1F646; 🙆 person gesturing OK
-1F646 $; 🙆🏻 person gesturing OK
 1F646 200D 2642 FE0F; 🙆‍♂️ man gesturing OK
 1F646 $ 200D 2642 FE0F; 🙆🏻‍♂️ man gesturing OK
 1F646 200D 2640 FE0F; 🙆‍♀️ woman gesturing OK
 1F646 $ 200D 2640 FE0F; 🙆🏻‍♀️ woman gesturing OK
-1F481; 💁 person tipping hand
-1F481 $; 💁🏻 person tipping hand
 1F481 200D 2642 FE0F; 💁‍♂️ man tipping hand
 1F481 $ 200D 2642 FE0F; 💁🏻‍♂️ man tipping hand
 1F481 200D 2640 FE0F; 💁‍♀️ woman tipping hand
 1F481 $ 200D 2640 FE0F; 💁🏻‍♀️ woman tipping hand
-1F64B; 🙋 person raising hand
-1F64B $; 🙋🏻 person raising hand
 1F64B 200D 2642 FE0F; 🙋‍♂️ man raising hand
 1F64B $ 200D 2642 FE0F; 🙋🏻‍♂️ man raising hand
 1F64B 200D 2640 FE0F; 🙋‍♀️ woman raising hand
 1F64B $ 200D 2640 FE0F; 🙋🏻‍♀️ woman raising hand
-1F647; 🙇 person bowing
-1F647 $; 🙇🏻 person bowing
 1F647 200D 2642 FE0F; 🙇‍♂️ man bowing
 1F647 $ 200D 2642 FE0F; 🙇🏻‍♂️ man bowing
 1F647 200D 2640 FE0F; 🙇‍♀️ woman bowing
 1F647 $ 200D 2640 FE0F; 🙇🏻‍♀️ woman bowing
-1F926; 🤦 person facepalming
-1F926 $; 🤦🏻 person facepalming
 1F926 200D 2642 FE0F; 🤦‍♂️ man facepalming
 1F926 $ 200D 2642 FE0F; 🤦🏻‍♂️ man facepalming
 1F926 200D 2640 FE0F; 🤦‍♀️ woman facepalming
 1F926 $ 200D 2640 FE0F; 🤦🏻‍♀️ woman facepalming
-1F937; 🤷 person shrugging
-1F937 $; 🤷🏻 person shrugging
 1F937 200D 2642 FE0F; 🤷‍♂️ man shrugging
 1F937 $ 200D 2642 FE0F; 🤷🏻‍♂️ man shrugging
 1F937 200D 2640 FE0F; 🤷‍♀️ woman shrugging
 1F937 $ 200D 2640 FE0F; 🤷🏻‍♀️ woman shrugging
-1F486; 💆 person getting massage
-1F486 $; 💆🏻 person getting massage
 1F486 200D 2642 FE0F; 💆‍♂️ man getting massage
 1F486 $ 200D 2642 FE0F; 💆🏻‍♂️ man getting massage
 1F486 200D 2640 FE0F; 💆‍♀️ woman getting massage
 1F486 $ 200D 2640 FE0F; 💆🏻‍♀️ woman getting massage
-1F487; 💇 person getting haircut
-1F487 $; 💇🏻 person getting haircut
 1F487 200D 2642 FE0F; 💇‍♂️ man getting haircut
 1F487 $ 200D 2642 FE0F; 💇🏻‍♂️ man getting haircut
 1F487 200D 2640 FE0F; 💇‍♀️ woman getting haircut
 1F487 $ 200D 2640 FE0F; 💇🏻‍♀️ woman getting haircut
-1F6B6; 🚶 person walking
-1F6B6 $; 🚶🏻 person walking
 1F6B6 200D 2642 FE0F; 🚶‍♂️ man walking
 1F6B6 $ 200D 2642 FE0F; 🚶🏻‍♂️ man walking
 1F6B6 200D 2640 FE0F; 🚶‍♀️ woman walking
 1F6B6 $ 200D 2640 FE0F; 🚶🏻‍♀️ woman walking
-1F3C3; 🏃 person running
-1F3C3 $; 🏃🏻 person running
 1F3C3 200D 2642 FE0F; 🏃‍♂️ man running
 1F3C3 $ 200D 2642 FE0F; 🏃🏻‍♂️ man running
 1F3C3 200D 2640 FE0F; 🏃‍♀️ woman running
@@ -311,7 +273,6 @@
 1F483 $; 💃🏻 woman dancing
 1F57A; 🕺 man dancing
 1F57A $; 🕺🏻 man dancing
-1F46F; 👯 people with bunny ears partying
 1F46F 200D 2642 FE0F; 👯‍♂️ men with bunny ears partying
 1F46F 200D 2640 FE0F; 👯‍♀️ women with bunny ears partying
 1F574; 🕴 man in business suit levitating
@@ -325,83 +286,62 @@
 26F7; ⛷ skier
 1F3C2; 🏂 snowboarder
 1F3C2 $; 🏂🏻 snowboarder
-1F3CC; 🏌 person golfing
-1F3CC $; 🏌🏻 person golfing
 1F3CC FE0F 200D 2642 FE0F; 🏌️‍♂️ man golfing
 1F3CC $ 200D 2642 FE0F; 🏌🏻‍♂️ man golfing
 1F3CC FE0F 200D 2640 FE0F; 🏌️‍♀️ woman golfing
 1F3CC $ 200D 2640 FE0F; 🏌🏻‍♀️ woman golfing
-1F3C4; 🏄 person surfing
-1F3C4 $; 🏄🏻 person surfing
 1F3C4 200D 2642 FE0F; 🏄‍♂️ man surfing
 1F3C4 $ 200D 2642 FE0F; 🏄🏻‍♂️ man surfing
 1F3C4 200D 2640 FE0F; 🏄‍♀️ woman surfing
 1F3C4 $ 200D 2640 FE0F; 🏄🏻‍♀️ woman surfing
-1F6A3; 🚣 person rowing boat
-1F6A3 $; 🚣🏻 person rowing boat
 1F6A3 200D 2642 FE0F; 🚣‍♂️ man rowing boat
 1F6A3 $ 200D 2642 FE0F; 🚣🏻‍♂️ man rowing boat
 1F6A3 200D 2640 FE0F; 🚣‍♀️ woman rowing boat
 1F6A3 $ 200D 2640 FE0F; 🚣🏻‍♀️ woman rowing boat
-1F3CA; 🏊 person swimming
-1F3CA $; 🏊🏻 person swimming
 1F3CA 200D 2642 FE0F; 🏊‍♂️ man swimming
 1F3CA $ 200D 2642 FE0F; 🏊🏻‍♂️ man swimming
 1F3CA 200D 2640 FE0F; 🏊‍♀️ woman swimming
 1F3CA $ 200D 2640 FE0F; 🏊🏻‍♀️ woman swimming
-26F9; ⛹ person bouncing ball
-26F9 $; ⛹🏻 person bouncing ball
 26F9 FE0F 200D 2642 FE0F; ⛹️‍♂️ man bouncing ball
 26F9 $ 200D 2642 FE0F; ⛹🏻‍♂️ man bouncing ball
 26F9 FE0F 200D 2640 FE0F; ⛹️‍♀️ woman bouncing ball
 26F9 $ 200D 2640 FE0F; ⛹🏻‍♀️ woman bouncing ball
-1F3CB; 🏋 person lifting weights
-1F3CB $; 🏋🏻 person lifting weights
 1F3CB FE0F 200D 2642 FE0F; 🏋️‍♂️ man lifting weights
 1F3CB $ 200D 2642 FE0F; 🏋🏻‍♂️ man lifting weights
 1F3CB FE0F 200D 2640 FE0F; 🏋️‍♀️ woman lifting weights
 1F3CB $ 200D 2640 FE0F; 🏋🏻‍♀️ woman lifting weights
-1F6B4; 🚴 person biking
-1F6B4 $; 🚴🏻 person biking
 1F6B4 200D 2642 FE0F; 🚴‍♂️ man biking
 1F6B4 $ 200D 2642 FE0F; 🚴🏻‍♂️ man biking
 1F6B4 200D 2640 FE0F; 🚴‍♀️ woman biking
 1F6B4 $ 200D 2640 FE0F; 🚴🏻‍♀️ woman biking
-1F6B5; 🚵 person mountain biking
-1F6B5 $; 🚵🏻 person mountain biking
 1F6B5 200D 2642 FE0F; 🚵‍♂️ man mountain biking
 1F6B5 $ 200D 2642 FE0F; 🚵🏻‍♂️ man mountain biking
 1F6B5 200D 2640 FE0F; 🚵‍♀️ woman mountain biking
 1F6B5 $ 200D 2640 FE0F; 🚵🏻‍♀️ woman mountain biking
 1F3CE; 🏎 racing car
 1F3CD; 🏍 motorcycle
-1F938; 🤸 person cartwheeling
-1F938 $; 🤸🏻 person cartwheeling
 1F938 200D 2642 FE0F; 🤸‍♂️ man cartwheeling
 1F938 $ 200D 2642 FE0F; 🤸🏻‍♂️ man cartwheeling
 1F938 200D 2640 FE0F; 🤸‍♀️ woman cartwheeling
 1F938 $ 200D 2640 FE0F; 🤸🏻‍♀️ woman cartwheeling
-1F93C; 🤼 people wrestling
 1F93C 200D 2642 FE0F; 🤼‍♂️ men wrestling
 1F93C 200D 2640 FE0F; 🤼‍♀️ women wrestling
-1F93D; 🤽 person playing water polo
-1F93D $; 🤽🏻 person playing water polo
 1F93D 200D 2642 FE0F; 🤽‍♂️ man playing water polo
 1F93D $ 200D 2642 FE0F; 🤽🏻‍♂️ man playing water polo
 1F93D 200D 2640 FE0F; 🤽‍♀️ woman playing water polo
 1F93D $ 200D 2640 FE0F; 🤽🏻‍♀️ woman playing water polo
-1F93E; 🤾 person playing handball
-1F93E $; 🤾🏻 person playing handball
 1F93E 200D 2642 FE0F; 🤾‍♂️ man playing handball
 1F93E $ 200D 2642 FE0F; 🤾🏻‍♂️ man playing handball
 1F93E 200D 2640 FE0F; 🤾‍♀️ woman playing handball
 1F93E $ 200D 2640 FE0F; 🤾🏻‍♀️ woman playing handball
-1F939; 🤹 person juggling
-1F939 $; 🤹🏻 person juggling
 1F939 200D 2642 FE0F; 🤹‍♂️ man juggling
 1F939 $ 200D 2642 FE0F; 🤹🏻‍♂️ man juggling
 1F939 200D 2640 FE0F; 🤹‍♀️ woman juggling
 1F939 $ 200D 2640 FE0F; 🤹🏻‍♀️ woman juggling
+1F6CC; 🛌 person in bed !! moved
+1F6CC $; 🛌🏻 person in bed !! moved
+1F6C0; 🛀 person taking bath !! moved
+1F6C0 $; 🛀🏻 person taking bath !! moved
 1F46B; 👫 man and woman holding hands
 1F46C; 👬 two men holding hands
 1F46D; 👭 two women holding hands
@@ -439,7 +379,7 @@
 1F469 200D 1F467; 👩‍👧 family
 1F469 200D 1F467 200D 1F466; 👩‍👧‍👦 family
 1F469 200D 1F467 200D 1F467; 👩‍👧‍👧 family
-@ !! removed skin tone modifiers
+@
 1F4AA; 💪 flexed biceps
 1F4AA $; 💪🏻 flexed biceps
 1F933; 🤳 selfie
@@ -505,7 +445,6 @@
 1F443; 👃 nose
 1F443 $; 👃🏻 nose
 1F91D; 🤝 handshake !! moved
-@
 1F463; 👣 footprints
 1F440; 👀 eyes
 1F441; 👁 eye
@@ -570,7 +509,7 @@
 1F484; 💄 lipstick
 1F48D; 💍 ring
 1F48E; 💎 gem stone
-@
+@2 no more skin tones beyond this point
 1F435; 🐵 monkey face
 1F412; 🐒 monkey
 1F98D; 🦍 gorilla
@@ -895,14 +834,10 @@
 1F6F0; 🛰 satellite
 1F6CE; 🛎 bellhop bell
 1F6AA; 🚪 door
-1F6CC; 🛌 person in bed
-1F6CC $; 🛌🏻 person in bed
 1F6CF; 🛏 bed
 1F6CB; 🛋 couch and lamp
 1F6BD; 🚽 toilet
 1F6BF; 🚿 shower
-1F6C0; 🛀 person taking bath
-1F6C0 $; 🛀🏻 person taking bath
 1F6C1; 🛁 bathtub
 @
 231B; ⌛ hourglass

Resources/Plugins/reply-account/.meta

@@ -8,7 +8,7 @@ Custom reply account
 chylex
 
 [version]
-1.2
+1.2.1
 
 [website]
 https://tweetduck.chylex.com

Resources/Plugins/reply-account/browser.js

@@ -22,10 +22,19 @@ enabled(){
         var section = data.element.closest("section.column");
         
         var column = TD.controller.columnManager.get(section.attr("data-column"));
-        var header = $("h1.column-title", section);
+        var header = $(".column-title", section);
+        var title = header.children(".column-head-title");
         
-        var columnTitle = header.children(".column-head-title").text();
-        var columnAccount = header.children(".attribution").text();
+        var columnTitle, columnAccount;
+        
+        if (title.length){
+          columnTitle = title.text();
+          columnAccount = header.children(".attribution").text();
+        }
+        else{
+          columnTitle = header.children(".column-title-edit-box").val();
+          columnAccount = "";
+        }
         
         try{
           query = configuration.customSelector(column.getColumnType(), columnTitle, columnAccount, column);

Resources/Plugins/timeline-polls/.meta

@@ -9,10 +9,10 @@ Polls in timelines
 chylex
 
 [version]
-1.0
+1.0.1
 
 [website]
 https://tweetduck.chylex.com
 
 [requires]
-1.4.1
+1.7

Resources/Plugins/timeline-polls/browser.js

@@ -16,7 +16,7 @@ enabled(){
   };
 
   // add poll rendering to tweets
-  injectLayout("status/tweet_single.mustache", "status/poll", "{{/quotedTweetMissing}} {{#translation}}", "{{/quotedTweetMissing}} <div class='timeline-poll-container'>{{#poll}}{{>duck/tweet_single/poll}}{{/poll}}</div> {{#translation}}");
+  injectLayout("status/tweet_single.mustache", "status/poll", "{{/quotedTweetMissing}} {{#translation}}", "{{/quotedTweetMissing}} <div class='timeline-poll-container td-screenshot-remove'>{{#poll}}{{>duck/tweet_single/poll}}{{/poll}}</div> {{#translation}}");
   TD.mustaches["duck/tweet_single/poll.mustache"] = '<div class="js-poll margin-tl"> {{#poll}}  <ul class="margin-b--12"> {{#choices}} <li class="position-rel margin-b--8 height-3"> <div class="poll-bar pin-top height-p--100 br-1 {{#isWinner}}poll-bar--winner{{/isWinner}} {{#hasTimeLeft}}br-left{{/hasTimeLeft}} width-p--{{percentage}}"/>  <div class="poll-label position-rel padding-a--4"> <span class="txt-bold txt-right inline-block width-5 padding-r--4">{{percentage}}%</span> {{{label}}} {{#isSelectedChoice}} <i class="icon icon-check txt-size-variable--11"></i> {{/isSelectedChoice}} </div> </li> {{/choices}} </ul> <span class="inline-block txt-small padding-ls txt-seamful-deep-gray"> {{{prettyCount}}} &middot; {{#hasTimeLeft}} {{{prettyTimeLeft}}} {{/hasTimeLeft}} {{^hasTimeLeft}} {{_i}}Final results{{/i}} {{/hasTimeLeft}} </span> {{/poll}} </div>';
 }
 

Resources/ScriptLoader.cs

@@ -9,11 +9,14 @@ namespace TweetDck.Resources{
     static class ScriptLoader{
         private const string UrlPrefix = "td:";
 
-        public static string LoadResource(string name){
+        public static string LoadResource(string name, bool silent = false){
             try{
                 return File.ReadAllText(Path.Combine(Program.ScriptPath, name), Encoding.UTF8);
             }catch(Exception ex){
+                if (!silent){
                     MessageBox.Show("Unfortunately, "+Program.BrandName+" could not load the "+name+" file. The program will continue running with limited functionality.\r\n\r\n"+ex.Message, Program.BrandName+" Has Failed :(", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                }
+
                 return null;
             }
         }

Resources/Scripts/code.js

@@ -1,13 +1,13 @@
 (function($, $TD, $TDX, TD){
   //
-  // Variable: Current highlighted column jQuery object.
+  // Variable: Current highlighted column jQuery & data objects.
   //
-  var highlightedColumnEle;
+  var highlightedColumnEle, highlightedColumnObj;
   
   //
-  // Variable: Currently highlighted tweet jQuery object.
+  // Variable: Currently highlighted tweet jQuery & data objects.
   //
-  var highlightedTweetEle;
+  var highlightedTweetEle, highlightedTweetObj;
   
   //
   // Variable: Array of functions called after the website app is loaded.
@@ -39,6 +39,21 @@
     };
   };
   
+  //
+  // Function: Retrieves a property of an element with a specified class.
+  //
+  var getClassStyleProperty = function(cls, property){
+    let column = document.createElement("div");
+    column.classList.add(cls);
+    column.style.display = "none";
+    
+    document.body.appendChild(column);
+    let value = window.getComputedStyle(column).getPropertyValue(property);
+    document.body.removeChild(column);
+    
+    return value;
+  };
+  
   //
   // Function: Event callback for a new tweet.
   //
@@ -55,6 +70,7 @@
       
       html.css("border", "0");
       html.find("footer").last().remove(); // apparently withTweetActions breaks for certain tweets, nice
+      html.find(".js-media").last().remove(); // and quoted tweets still show media previews, nice nice
       html.find(".js-quote-detail").removeClass("is-actionable");
       
       var url = html.find("time").first().children("a").first().attr("href") || "";
@@ -71,12 +87,18 @@
   // Function: Retrieves the tags to be put into <head> for notification HTML code.
   //
   var getNotificationHeadContents = function(){
-    var tags = [];
+    let tags = [];
     
-    $(document.head).children("link[rel='stylesheet'],meta[charset],meta[http-equiv]").each(function(){
+    $(document.head).children("link[rel='stylesheet']:not([title]),link[title='"+TD.settings.getTheme()+"'],meta[charset],meta[http-equiv]").each(function(){
       tags.push($(this)[0].outerHTML);
     });
     
+    tags.push("<style type='text/css'>");
+    tags.push("body { background-color: "+getClassStyleProperty("column", "background-color")+" }");
+    tags.push("a[data-full-url]{ word-break: break-all }");
+    tags.push(".txt-base-smallest .badge-verified:before { height: 13px !important }");
+    tags.push("</style>");
+    
     return tags.join("");
   };
   
@@ -119,26 +141,15 @@
         var menu = $(".js-dropdown-content").children("ul").first();
         if (menu.length === 0)return;
         
-        menu.children(".drp-h-divider").last().after([
-          '<li class="is-selectable" data-std><a href="#" data-action="td-settings">TweetDuck settings</a></li>',
-          '<li class="is-selectable" data-std><a href="#" data-action="td-plugins">TweetDuck plugins</a></li>',
-          '<li class="drp-h-divider"></li>'
-        ].join(""));
+        menu.children(".drp-h-divider").last().before('<li class="is-selectable" data-std><a href="#" data-action="tweetduck">TweetDuck</a></li>');
         
-        var buttons = menu.children("[data-std]");
+        var button = menu.children("[data-std]");
 
-        buttons.on("click", "a", function(){
-          var action = $(this).attr("data-action");
-          
-          if (action === "td-settings"){
-            $TD.openSettingsMenu();
-          }
-          else if (action === "td-plugins"){
-            $TD.openPluginsMenu();
-          }
+        button.on("click", "a", function(){
+          $TD.openContextMenu();
         });
 
-        buttons.hover(function(){
+        button.hover(function(){
           $(this).addClass("is-selected");
         }, function(){
           $(this).removeClass("is-selected");
@@ -231,42 +242,62 @@
   })();
   
   //
-  // Block: Update highlighted column.
-  //
-  app.delegate("section", "mouseenter mouseleave", function(e){
-    if (e.type === "mouseenter"){
-      highlightedColumnEle = $(this);
-    }
-    else if (e.type === "mouseleave"){
-      highlightedColumnEle = null;
-    }
-  });
-  
-  //
-  // Block: Copy tweet address and update highlighted tweet.
+  // Block: Update highlighted column and tweet for context menu and other functionality.
   //
   (function(){
     var lastTweet = "";
     
-    var updateHighlightedTweet = function(link, embeddedLink){
+    var updateHighlightedColumn = function(ele){
+      highlightedColumnEle = ele;
+      highlightedColumnObj = ele ? TD.controller.columnManager.get(ele.attr("data-column")) : null;
+      return !!highlightedColumnObj;
+    };
+    
+    var updateHighlightedTweet = function(ele, obj, link, embeddedLink){
+      highlightedTweetEle = ele;
+      highlightedTweetObj = obj;
+      
       if (lastTweet !== link){
         $TD.setLastHighlightedTweet(link, embeddedLink);
         lastTweet = link;
       }
     };
     
-    app.delegate("article.js-stream-item", "mouseenter mouseleave", function(e){
+    app.delegate("section.js-column", "mouseenter mouseleave", function(e){
       if (e.type === "mouseenter"){
-        highlightedTweetEle = $(this);
-        
-        var link = $(this).parent().hasClass("js-tweet-detail") ? $(this).find("a[rel='url']").first() : $(this).find("time").first().children("a").first();
-        var embedded = $(this).find(".quoted-tweet[data-tweet-id]").first();
-        
-        updateHighlightedTweet(link.length > 0 ? link.attr("href") : "", embedded.length > 0 ? embedded.find(".account-link").first().attr("href")+"/status/"+embedded.attr("data-tweet-id") : "");
+        if (!highlightedColumnObj){
+          updateHighlightedColumn($(this));
+        }
       }
       else if (e.type === "mouseleave"){
-        highlightedTweetEle = null;
-        updateHighlightedTweet("", "");
+        updateHighlightedColumn(null);
+      }
+    });
+    
+    app.delegate("article.js-stream-item", "mouseenter mouseleave", function(e){
+      if (e.type === "mouseenter"){
+        var me = $(this);
+        
+        if (!me[0].hasAttribute("data-account-key") || (!highlightedColumnObj && !updateHighlightedColumn(me.closest("section.js-column")))){
+          return;
+        }
+        
+        var tweet = highlightedColumnObj.findChirp(me.attr("data-tweet-id")) || highlightedColumnObj.findChirp(me.attr("data-key"));
+        
+        if (tweet){
+          if (tweet.chirpType === TD.services.ChirpBase.TWEET){
+            var link = tweet.getChirpURL();
+            var embedded = tweet.quotedTweet ? tweet.quotedTweet.getChirpURL() : "";
+
+            updateHighlightedTweet(me, tweet, link || "", embedded || "");
+          }
+          else{
+            updateHighlightedTweet(me, tweet, "", "");
+          }
+        }
+      }
+      else if (e.type === "mouseleave"){
+        updateHighlightedTweet(null, null, "", "");
       }
     });
   })();
@@ -296,27 +327,36 @@
         var isReply = !isDetail && (parent.hasClass("js-replies-to") || parent.hasClass("js-replies-before"));
         
         selectedTweet = selectedTweet.clone();
-        selectedTweet.children().first().addClass($(document.documentElement).attr("class")).css("padding-bottom", "12px");
+        selectedTweet.children().first().addClass($(document.documentElement).attr("class")).css("padding-bottom", "0");
         
-        setImportantProperty(selectedTweet.find(".js-quote-detail"), "margin-bottom", "0");
-        setImportantProperty(selectedTweet.find(".js-media-preview-container"), "margin-bottom", "0");
+        setImportantProperty(selectedTweet.find(".js-tweet-text"), "margin-bottom", "8px");
+        setImportantProperty(selectedTweet.find(".js-quote-detail"), "margin-bottom", "10px");
+        setImportantProperty(selectedTweet.find(".js-poll-link").next(), "margin-bottom", "8px");
         
         if (isDetail){
-          setImportantProperty(selectedTweet.find(".js-tweet-media"), "margin-bottom", "0");
-          selectedTweet.find(".js-translate-call-to-action").first().remove();
-          selectedTweet.find(".js-cards-container").first().nextAll().remove();
-          selectedTweet.find(".js-detail-view-inline").first().remove();
+          if (selectedTweet.find("[class*='media-grid-']").length > 0){
+            setImportantProperty(selectedTweet.find(".js-tweet-media"), "margin-bottom", "10px");
           }
           else{
+            setImportantProperty(selectedTweet.find(".js-tweet-media"), "margin-bottom", "6px");
+          }
+          
+          setImportantProperty(selectedTweet.find(".js-media-preview-container"), "margin-bottom", "4px");
+          selectedTweet.find(".js-translate-call-to-action").first().remove();
+          selectedTweet.find(".js-tweet").first().nextAll().remove();
+          selectedTweet.find("footer").last().prevUntil(":not(.txt-mute.txt-small)").addBack().remove(); // footer, date, location
+        }
+        else{
+          setImportantProperty(selectedTweet.find(".js-media-preview-container"), "margin-bottom", "10px");
           selectedTweet.find("footer").last().remove();
         }
         
         if (isReply){
           selectedTweet.find(".is-conversation").removeClass("is-conversation");
-          selectedTweet.find(".timeline-poll-container").first().remove(); // fix for timeline polls plugin
         }
         
         selectedTweet.find(".js-poll-link").remove();
+        selectedTweet.find(".td-screenshot-remove").remove();
         
         var testTweet = selectedTweet.clone().css({
           position: "absolute",
@@ -344,6 +384,11 @@
     };
     
     var clickUpload = function(){
+      $(document).one("uiFilesAdded", function(){
+        getScroller().scrollTop(prevScrollTop);
+        $(".js-drawer").find(".js-compose-text").first()[0].focus();
+      });
+      
       var button = $(".js-add-image-button").first();
       
       var scroller = getScroller();
@@ -395,13 +440,6 @@
         lastPasteElement = null;
       }
     };
-    
-    window.TDGF_tryPasteImageFinish = function(){
-      setTimeout(function(){
-        getScroller().scrollTop(prevScrollTop);
-        $(".js-drawer").find(".js-compose-text").first()[0].focus();
-      }, 10);
-    };
   })();
   
   //
@@ -580,6 +618,13 @@
     });
   })();
   
+  //
+  // Block: Fix youtu.be previews not showing up for https links.
+  //
+  TD.services.TwitterMedia.YOUTUBE_TINY_RE = new RegExp(TD.services.TwitterMedia.YOUTUBE_TINY_RE.source.replace("http:", "https?:"));
+  TD.services.TwitterMedia.YOUTUBE_RE = new RegExp(TD.services.TwitterMedia.YOUTUBE_LONG_RE.source+"|"+TD.services.TwitterMedia.YOUTUBE_TINY_RE.source);
+  TD.services.TwitterMedia.SERVICES["youtube"] = TD.services.TwitterMedia.YOUTUBE_RE;
+  
   //
   // Block: Finish initialization and load plugins.
   //

Resources/Scripts/debug.js

@@ -1,49 +0,0 @@
-(function($, $TD, $TDX, TD){
-  var isDebugging = false;
-  
-  $(document).keydown(function(e){
-    
-    // ==========================
-    // F4 key - toggle debug mode
-    // ==========================
-    
-    if (e.keyCode === 115){
-      isDebugging = !isDebugging;
-      $(".app-title").first().css("background-color", isDebugging ? "#5A6B75" : "#292F33");
-    }
-    
-    // Debug mode handling
-    
-    else if (isDebugging){
-      e.preventDefault();
-      
-      // ===================================
-      // N key - simulate popup notification
-      // ===================================
-      
-      if (e.keyCode === 78){
-        var col = TD.controller.columnManager.getAllOrdered()[0];
-
-        $.publish("/notifications/new",[{
-          column: col,
-          items: [
-            col.updateArray[Math.floor(Math.random()*col.updateArray.length)]
-          ]
-        }]);
-      }
-      
-      // ===================================
-      // S key - simulate sound notification
-      // ===================================
-      
-      else if (e.keyCode === 83){
-        if ($TDX.hasCustomNotificationSound){
-          $TD.onTweetSound();
-        }
-        else{
-          document.getElementById("update-sound").play();
-        }
-      }
-    }
-  });
-})($, $TD, $TDX, TD);

Resources/Scripts/pages/error.html

@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <style type="text/css">
+      body {
+        color: #e1e8ed;
+        background-color: #1c6399;
+        font-family: Helvetica, Arial, Verdana, sans-serif;
+        font-weight: 300;
+        font-size: 24px;
+        
+        width: 100%;
+        height: 100%;
+        margin: 0;
+        position: absolute;
+        display: table;
+      }
+      
+      center {
+        display: table-cell;
+        vertical-align: middle;
+      }
+      
+      h1 {
+        margin: 0;
+      }
+      
+      p {
+        margin: 20px 0 24px;
+      }
+      
+      button {
+        width: 100px;
+        height: 35px;
+        border: 0;
+        margin: 0 2px;
+        font-size: 17px;
+      }
+    </style>
+  </head>
+  <body>
+    <center>
+      <h1>Connection Error</h1>
+      <p>{err}</p>
+      <button onclick="location.href = 'https://tweetdeck.twitter.com'; [].forEach.call(document.getElementsByTagName('button'), e => e.style.visibility = 'hidden')">Retry</button>
+      <button onclick="window.close()">Exit</button>
+    </center>
+  </body>
+</html>

Resources/Scripts/pages/example.html

@@ -0,0 +1,25 @@
+<article>
+  <div class="js-stream-item-content item-box js-show-detail">
+    <div class="js-tweet tweet">
+      <header class="tweet-header">
+        <time class="tweet-timestamp js-timestamp pull-right txt-mute">
+          <a target="_blank" rel="url" href="https://twitter.com/chylexmc" class="txt-small">0s</a>
+        </time>
+        <a target="_blank" rel="user" href="https://twitter.com/chylexmc" class="account-link link-complex block">
+          <div class="obj-left item-img tweet-img">
+            <img width="48" height="48" alt="chylexmc's avatar" src="https://pbs.twimg.com/profile_images/765161905312980992/AhDP9iY-_normal.jpg" class="tweet-avatar avatar pull-right">
+          </div>
+          <div class="nbfc">
+            <span class="account-inline txt-ellipsis">
+              <b class="fullname link-complex-target">chylex</b>
+              <span class="username txt-mute">@chylexmc</span>
+            </span>
+          </div>
+        </a>
+      </header>
+      <div class="tweet-body">
+        <p class="js-tweet-text tweet-text with-linebreaks">This is an example tweet, which lets you test the location and duration of popup notifications.</p>
+      </div>
+    </div>
+  </div>
+</article>

Resources/Scripts/plugins.browser.js

@@ -49,19 +49,26 @@
     }
     
     setState(plugin, enable){
+      let reloading = plugin.obj.$pluginSettings.requiresPageReload;
+      
       if (enable && this.isDisabled(plugin)){
+        if (reloading){
+          location.reload();
+        }
+        else{
           this.disabled.splice(this.disabled.indexOf(plugin.id), 1);
           plugin.obj.enabled();
           this.runWhenReady(plugin);
         }
+      }
       else if (!enable && !this.isDisabled(plugin)){
+        if (reloading){
+          location.reload();
+        }
+        else{
           this.disabled.push(plugin.id);
           plugin.obj.disabled();
         }
-      else return;
-
-      if (plugin.obj.$pluginSettings.requiresPageReload){
-        window.location.reload();
       }
     }
     

Resources/Scripts/update.js

@@ -19,6 +19,11 @@
   //
   const updateCheckUrlAll = "https://api.github.com/repos/chylex/TweetDuck/releases";
   
+  //
+  // Constant: Fallback url in case the update installer file is missing.
+  //
+  const updateDownloadFallback = "https://tweetduck.chylex.com/#download";
+  
   //
   // Function: Creates the update notification element. Removes the old one if already exists.
   //
@@ -28,7 +33,7 @@
     var ele = $("#tweetduck-update");
     var existed = ele.length > 0;
     
-    if (existed > 0){
+    if (existed){
       ele.remove();
     }
     
@@ -106,7 +111,13 @@
 
     buttonDiv.children(".tdu-btn-download").click(function(){
       ele.remove();
+      
+      if (download){
         $TDU.onUpdateAccepted(version, download);
+      }
+      else{
+        $TDU.openBrowser(updateDownloadFallback);
+      }
     });
 
     buttonDiv.children(".tdu-btn-unsupported").click(function(){
@@ -125,12 +136,21 @@
     return ele;
   };
   
+  //
+  // Function: Returns milliseconds until the start of the next hour, with an extra offset in seconds that can skip an hour if the clock would roll over too soon.
+  //
+  var getTimeUntilNextHour = function(extra){
+    var now = new Date();
+    var offset = new Date(+now+extra*1000);
+    return new Date(offset.getFullYear(), offset.getMonth(), offset.getDate(), offset.getHours()+1, 0, 0)-now;
+  };
+  
   //
   // Function: Runs an update check and updates all DOM elements appropriately.
   //
   var runUpdateCheck = function(eventID, versionTag, dismissedVersionTag, allowPre){
     clearTimeout(updateCheckTimeoutID);
-    updateCheckTimeoutID = setTimeout($TDU.triggerUpdateCheck, 1000*60*60); // 1 hour
+    updateCheckTimeoutID = setTimeout($TDU.triggerUpdateCheck, getTimeUntilNextHour(60*30)); // 30 minute offset
     
     $.getJSON(allowPre ? updateCheckUrlAll : updateCheckUrlLatest, function(response){
       var release = allowPre ? response[0] : response;
@@ -139,7 +159,7 @@
       var hasUpdate = tagName !== versionTag && tagName !== dismissedVersionTag && release.assets.length > 0;
       
       if (hasUpdate){
-        var obj = release.assets.find(asset => asset.name === updateFileName) || release.assets[0];
+        var obj = release.assets.find(asset => asset.name === updateFileName) || { browser_download_url: "" };
         displayNotification(tagName, obj.browser_download_url);
       }
       

TweetDck.csproj

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="packages\CefSharp.WinForms.53.0.1\build\CefSharp.WinForms.props" Condition="Exists('packages\CefSharp.WinForms.53.0.1\build\CefSharp.WinForms.props')" />
-  <Import Project="packages\CefSharp.Common.53.0.1\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.53.0.1\build\CefSharp.Common.props')" />
+  <Import Project="packages\CefSharp.WinForms.57.0.0-pre01\build\CefSharp.WinForms.props" Condition="Exists('packages\CefSharp.WinForms.57.0.0-pre01\build\CefSharp.WinForms.props')" />
+  <Import Project="packages\CefSharp.Common.57.0.0-pre01\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.57.0.0-pre01\build\CefSharp.Common.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -10,11 +10,10 @@
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TweetDck</RootNamespace>
-    <AssemblyName Condition=" '$(Configuration)' == 'Debug' ">TweetDick</AssemblyName>
-    <AssemblyName Condition=" '$(Configuration)' == 'Release' ">TweetDuck</AssemblyName>
+    <AssemblyName>TweetDuck</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>783c0e30</NuGetPackageImportStamp>
+    <NuGetPackageImportStamp>9e936308</NuGetPackageImportStamp>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
     <PublishUrl>publish\</PublishUrl>
@@ -42,6 +41,7 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
     <Prefer32Bit>false</Prefer32Bit>
+    <UseVSHostingProcess>false</UseVSHostingProcess>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>Resources\icon.ico</ApplicationIcon>
@@ -59,9 +59,6 @@
     </DefineConstants>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
-  <PropertyGroup>
-    <AssemblyName>TweetDuck</AssemblyName>
-  </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -69,6 +66,7 @@
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Configuration\Arguments.cs" />
     <Compile Include="Configuration\LockManager.cs" />
     <Compile Include="Configuration\UserConfig.cs" />
     <Compile Include="Core\Bridge\PropertyBridge.cs" />
@@ -103,17 +101,33 @@
     <Compile Include="Core\FormBrowser.Designer.cs">
       <DependentUpon>FormBrowser.cs</DependentUpon>
     </Compile>
-    <Compile Include="Core\FormNotification.cs">
+    <Compile Include="Core\Notification\FormNotificationMain.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Core\FormNotification.Designer.cs">
-      <DependentUpon>FormNotification.cs</DependentUpon>
+    <Compile Include="Core\Notification\FormNotificationMain.Designer.cs">
+      <DependentUpon>FormNotificationMain.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Core\Notification\FormNotificationBase.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Core\Notification\FormNotificationBase.Designer.cs">
+      <DependentUpon>FormNotificationBase.cs</DependentUpon>
     </Compile>
     <Compile Include="Core\Handling\ContextMenuNotification.cs" />
     <Compile Include="Core\Handling\FileDialogHandler.cs" />
     <Compile Include="Core\Handling\JavaScriptDialogHandler.cs" />
     <Compile Include="Core\Handling\LifeSpanHandler.cs" />
+    <Compile Include="Core\Notification\FormNotificationTweet.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Core\Notification\FormNotificationTweet.Designer.cs">
+      <DependentUpon>FormNotificationTweet.cs</DependentUpon>
+    </Compile>
     <Compile Include="Core\Notification\SoundNotification.cs" />
+    <Compile Include="Core\Notification\Sound\SoundPlayerImplFallback.cs" />
+    <Compile Include="Core\Notification\Sound\SoundPlayerImplWMP.cs" />
+    <Compile Include="Core\Notification\Sound\ISoundNotificationPlayer.cs" />
+    <Compile Include="Core\Notification\Sound\PlaybackErrorEventArgs.cs" />
     <Compile Include="Core\Notification\TweetNotification.cs" />
     <Compile Include="Core\Other\FormAbout.cs">
       <SubType>Form</SubType>
@@ -151,6 +165,12 @@
     <Compile Include="Core\Other\Settings\Dialogs\DialogSettingsExport.Designer.cs">
       <DependentUpon>DialogSettingsExport.cs</DependentUpon>
     </Compile>
+    <Compile Include="Core\Other\Settings\Dialogs\DialogSettingsRestart.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Core\Other\Settings\Dialogs\DialogSettingsRestart.Designer.cs">
+      <DependentUpon>DialogSettingsRestart.cs</DependentUpon>
+    </Compile>
     <Compile Include="Core\Other\Settings\Export\CombinedFileStream.cs" />
     <Compile Include="Core\Other\Settings\Export\ExportFileFlags.cs" />
     <Compile Include="Core\Other\Settings\Export\ExportManager.cs" />
@@ -172,26 +192,27 @@
     <Compile Include="Core\Other\Settings\TabSettingsGeneral.Designer.cs">
       <DependentUpon>TabSettingsGeneral.cs</DependentUpon>
     </Compile>
+    <Compile Include="Core\Other\Settings\TabSettingsSounds.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Core\Other\Settings\TabSettingsSounds.Designer.cs">
+      <DependentUpon>TabSettingsSounds.cs</DependentUpon>
+    </Compile>
     <Compile Include="Core\Other\Settings\TabSettingsNotifications.cs">
       <SubType>UserControl</SubType>
     </Compile>
     <Compile Include="Core\Other\Settings\TabSettingsNotifications.Designer.cs">
       <DependentUpon>TabSettingsNotifications.cs</DependentUpon>
     </Compile>
-    <Compile Include="Core\Other\Settings\TabSettingsUpdates.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="Core\Other\Settings\TabSettingsUpdates.Designer.cs">
-      <DependentUpon>TabSettingsUpdates.cs</DependentUpon>
-    </Compile>
     <Compile Include="Core\Bridge\CallbackBridge.cs" />
     <Compile Include="Core\Utils\CommandLineArgs.cs" />
     <Compile Include="Core\Utils\CommandLineArgsParser.cs" />
     <Compile Include="Core\Notification\Screenshot\FormNotificationScreenshotable.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="Core\Notification\NotificationFlags.cs" />
     <Compile Include="Core\Notification\Screenshot\TweetScreenshotManager.cs" />
+    <Compile Include="Core\Utils\InjectedHTML.cs" />
+    <Compile Include="Core\Utils\NativeCoreAudio.cs" />
     <Compile Include="Core\Utils\TwoKeyDictionary.cs" />
     <Compile Include="Core\Utils\WindowState.cs" />
     <Compile Include="Core\Utils\WindowsUtils.cs" />
@@ -221,7 +242,7 @@
     <Compile Include="Plugins\PluginConfig.cs" />
     <Compile Include="Plugins\Enums\PluginEnvironment.cs" />
     <Compile Include="Plugins\Enums\PluginGroup.cs" />
-    <Compile Include="Plugins\Events\PluginLoadEventArgs.cs" />
+    <Compile Include="Plugins\Events\PluginErrorEventArgs.cs" />
     <Compile Include="Plugins\PluginManager.cs" />
     <Compile Include="Plugins\PluginScriptGenerator.cs" />
     <Compile Include="Reporter.cs" />
@@ -255,8 +276,6 @@
     </Compile>
     <Compile Include="Resources\ScriptLoader.cs" />
     <Compile Include="Updates\UpdaterSettings.cs" />
-    <None Include="Configuration\app.config" />
-    <None Include="Configuration\packages.config" />
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.0,Profile=Client">
@@ -308,6 +327,7 @@
     </ContentWithTargetPath>
   </ItemGroup>
   <ItemGroup>
+    <None Include="packages.config" />
     <None Include="Resources\icon-small.ico" />
     <None Include="Resources\icon-tray-new.ico" />
     <None Include="Resources\icon-tray.ico" />
@@ -317,25 +337,25 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Resources\Scripts\code.js" />
-    <Content Include="Resources\Scripts\debug.js" />
     <Content Include="Resources\Scripts\notification.js" />
+    <Content Include="Resources\Scripts\pages\error.html" />
     <Content Include="Resources\Scripts\plugins.browser.js" />
     <Content Include="Resources\Scripts\plugins.js" />
     <Content Include="Resources\Scripts\plugins.notification.js" />
     <Content Include="Resources\Scripts\update.js" />
   </ItemGroup>
+  <ItemGroup>
+    <COMReference Include="WMPLib">
+      <Guid>{6BF52A50-394A-11D3-B153-00C04F79FAA6}</Guid>
+      <VersionMajor>1</VersionMajor>
+      <VersionMinor>0</VersionMinor>
+      <Lcid>0</Lcid>
+      <WrapperTool>tlbimp</WrapperTool>
+      <Isolated>False</Isolated>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </COMReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('packages\cef.redist.x86.3.2785.1486\build\cef.redist.x86.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x86.3.2785.1486\build\cef.redist.x86.targets'))" />
-    <Error Condition="!Exists('packages\cef.redist.x64.3.2785.1486\build\cef.redist.x64.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x64.3.2785.1486\build\cef.redist.x64.targets'))" />
-    <Error Condition="!Exists('packages\CefSharp.Common.53.0.1\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.53.0.1\build\CefSharp.Common.props'))" />
-    <Error Condition="!Exists('packages\CefSharp.Common.53.0.1\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.53.0.1\build\CefSharp.Common.targets'))" />
-    <Error Condition="!Exists('packages\CefSharp.WinForms.53.0.1\build\CefSharp.WinForms.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.53.0.1\build\CefSharp.WinForms.props'))" />
-    <Error Condition="!Exists('packages\CefSharp.WinForms.53.0.1\build\CefSharp.WinForms.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.53.0.1\build\CefSharp.WinForms.targets'))" />
-  </Target>
   <PropertyGroup>
     <PostBuildEvent>del "$(TargetPath).config"
 xcopy "$(ProjectDir)LICENSE.md" "$(TargetDir)" /Y
@@ -344,10 +364,10 @@ ren "$(TargetDir)LICENSE.md" "LICENSE.txt"
 xcopy "$(ProjectDir)Libraries\CEFSHARP-LICENSE.txt" "$(TargetDir)" /Y
 xcopy "$(ProjectDir)packages\Microsoft.VC120.CRT.JetBrains.12.0.21005.2\DotFiles\msvcp120.dll" "$(TargetDir)" /Y
 xcopy "$(ProjectDir)packages\Microsoft.VC120.CRT.JetBrains.12.0.21005.2\DotFiles\msvcr120.dll" "$(TargetDir)" /Y
-rmdir "$(TargetDir)scripts"
+rmdir "$(TargetDir)scripts" /S /Q
 mkdir "$(TargetDir)scripts"
 xcopy "$(ProjectDir)Resources\Scripts\*" "$(TargetDir)scripts\" /E /Y
-rmdir "$(TargetDir)plugins"
+rmdir "$(TargetDir)plugins" /S /Q
 mkdir "$(TargetDir)plugins"
 mkdir "$(TargetDir)plugins\official"
 mkdir "$(TargetDir)plugins\user"
@@ -363,10 +383,21 @@ if $(ConfigurationName) == Debug (
   xcopy "$(ProjectDir)Resources\Plugins\.debug\*" "$(TargetDir)plugins\user\.debug\" /E /Y
 )</PostBuildEvent>
   </PropertyGroup>
-  <Import Project="packages\cef.redist.x86.3.2785.1486\build\cef.redist.x86.targets" Condition="Exists('packages\cef.redist.x86.3.2785.1486\build\cef.redist.x86.targets')" />
-  <Import Project="packages\cef.redist.x64.3.2785.1486\build\cef.redist.x64.targets" Condition="Exists('packages\cef.redist.x64.3.2785.1486\build\cef.redist.x64.targets')" />
-  <Import Project="packages\CefSharp.Common.53.0.1\build\CefSharp.Common.targets" Condition="Exists('packages\CefSharp.Common.53.0.1\build\CefSharp.Common.targets')" />
-  <Import Project="packages\CefSharp.WinForms.53.0.1\build\CefSharp.WinForms.targets" Condition="Exists('packages\CefSharp.WinForms.53.0.1\build\CefSharp.WinForms.targets')" />
+  <Import Project="packages\cef.redist.x86.3.2987.1597\build\cef.redist.x86.targets" Condition="Exists('packages\cef.redist.x86.3.2987.1597\build\cef.redist.x86.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('packages\cef.redist.x86.3.2987.1597\build\cef.redist.x86.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x86.3.2987.1597\build\cef.redist.x86.targets'))" />
+    <Error Condition="!Exists('packages\cef.redist.x64.3.2987.1597\build\cef.redist.x64.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x64.3.2987.1597\build\cef.redist.x64.targets'))" />
+    <Error Condition="!Exists('packages\CefSharp.Common.57.0.0-pre01\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.57.0.0-pre01\build\CefSharp.Common.props'))" />
+    <Error Condition="!Exists('packages\CefSharp.Common.57.0.0-pre01\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.57.0.0-pre01\build\CefSharp.Common.targets'))" />
+    <Error Condition="!Exists('packages\CefSharp.WinForms.57.0.0-pre01\build\CefSharp.WinForms.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.57.0.0-pre01\build\CefSharp.WinForms.props'))" />
+    <Error Condition="!Exists('packages\CefSharp.WinForms.57.0.0-pre01\build\CefSharp.WinForms.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.57.0.0-pre01\build\CefSharp.WinForms.targets'))" />
+  </Target>
+  <Import Project="packages\cef.redist.x64.3.2987.1597\build\cef.redist.x64.targets" Condition="Exists('packages\cef.redist.x64.3.2987.1597\build\cef.redist.x64.targets')" />
+  <Import Project="packages\CefSharp.Common.57.0.0-pre01\build\CefSharp.Common.targets" Condition="Exists('packages\CefSharp.Common.57.0.0-pre01\build\CefSharp.Common.targets')" />
+  <Import Project="packages\CefSharp.WinForms.57.0.0-pre01\build\CefSharp.WinForms.targets" Condition="Exists('packages\CefSharp.WinForms.57.0.0-pre01\build\CefSharp.WinForms.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

Updates/FormUpdateDownload.Designer.cs

@@ -82,6 +82,7 @@
             this.Controls.Add(this.labelDescription);
             this.Controls.Add(this.btnCancel);
             this.Controls.Add(this.progressDownload);
+            this.DoubleBuffered = true;
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.MaximizeBox = false;

Updates/FormUpdateDownload.cs

@@ -1,6 +1,5 @@
 using System;
 using System.ComponentModel;
-using System.Globalization;
 using System.IO;
 using System.Net;
 using System.Windows.Forms;
@@ -29,19 +28,18 @@ namespace TweetDck.Updates{
         public FormUpdateDownload(UpdateInfo info){
             InitializeComponent();
 
-            this.webClient = new WebClient{ Proxy = null };
-            this.webClient.Headers[HttpRequestHeader.UserAgent] = BrowserUtils.HeaderUserAgent;
+            Text = "Updating "+Program.BrandName;
+            labelDescription.Text = "Downloading version "+info.VersionTag+"...";
 
             this.updateInfo = info;
             this.UpdateStatus = Status.Waiting;
 
-            Disposed += (sender, args) => webClient.Dispose();
+            this.webClient = new WebClient{ Proxy = null };
+            this.webClient.Headers[HttpRequestHeader.UserAgent] = BrowserUtils.HeaderUserAgent;
+            this.webClient.DownloadProgressChanged += webClient_DownloadProgressChanged;
+            this.webClient.DownloadFileCompleted += webClient_DownloadFileCompleted;
             
-            webClient.DownloadProgressChanged += webClient_DownloadProgressChanged;
-            webClient.DownloadFileCompleted += webClient_DownloadFileCompleted;
-
-            Text = "Updating "+Program.BrandName;
-            labelDescription.Text = "Downloading version "+info.VersionTag+"...";
+            Disposed += (sender, args) => this.webClient.Dispose();
         }
 
         private void FormUpdateDownload_Shown(object sender, EventArgs e){
@@ -49,15 +47,24 @@ namespace TweetDck.Updates{
         }
 
         private void btnCancel_Click(object sender, EventArgs e){
+            if (webClient.IsBusy){
                 webClient.CancelAsync();
                 btnCancel.Enabled = false;
             }
+            else{
+                UpdateStatus = Status.Cancelled;
+                Close();
+            }
+        }
 
         private void FormUpdateDownload_FormClosing(object sender, FormClosingEventArgs e){
             if (UpdateStatus == Status.Waiting){
-                e.Cancel = true;
-                webClient.CancelAsync();
                 UpdateStatus = e.CloseReason == CloseReason.UserClosing ? Status.Cancelled : Status.Manual; // manual will exit the app
+
+                if (webClient.IsBusy){
+                    webClient.CancelAsync();
+                    e.Cancel = true;
+                }
             }
         }
 
@@ -69,7 +76,7 @@ namespace TweetDck.Updates{
                         progressDownload.SetValueInstant(1000);
                     }
 
-                    labelStatus.Text = (e.BytesReceived/BytesToKB).ToString("0.0", CultureInfo.CurrentCulture)+" kB";
+                    labelStatus.Text = (long)(e.BytesReceived/BytesToKB)+" kB";
                 }
                 else{
                     if (progressDownload.Style != ProgressBarStyle.Continuous){
@@ -77,7 +84,7 @@ namespace TweetDck.Updates{
                     }
 
                     progressDownload.SetValueInstant(e.ProgressPercentage*10);
-                    labelStatus.Text = (e.BytesReceived/BytesToKB).ToString("0.0", CultureInfo.CurrentCulture)+" / "+(e.TotalBytesToReceive/BytesToKB).ToString("0.0", CultureInfo.CurrentCulture)+" kB";
+                    labelStatus.Text = (long)(e.BytesReceived/BytesToKB)+" / "+(long)(e.TotalBytesToReceive/BytesToKB)+" kB";
                 }
             });
         }
@@ -93,7 +100,7 @@ namespace TweetDck.Updates{
                     Program.Reporter.Log(e.Error.ToString());
 
                     if (MessageBox.Show("Could not download the update: "+e.Error.Message+"\r\n\r\nDo you want to open the website and try downloading the update manually?", "Update Has Failed", MessageBoxButtons.YesNo, MessageBoxIcon.Error, MessageBoxDefaultButton.Button1) == DialogResult.Yes){
-                        BrowserUtils.OpenExternalBrowser(Program.Website);
+                        BrowserUtils.OpenExternalBrowserUnsafe(Program.Website);
                         UpdateStatus = Status.Manual;
                     }
                     else{

Updates/UpdateHandler.cs

@@ -8,19 +8,13 @@ using TweetDck.Resources;
 using TweetDck.Updates.Events;
 
 namespace TweetDck.Updates{
-    class UpdateHandler{
+    sealed class UpdateHandler{
         private static bool IsSystemSupported{
             get{
                 return true; // Environment.OSVersion.Version >= new Version("6.1"); // 6.1 NT version = Windows 7
             }
         }
 
-        public UpdaterSettings Settings{
-            get{
-                return settings;
-            }
-        }
-
         private readonly ChromiumWebBrowser browser;
         private readonly FormBrowser form;
         private readonly UpdaterSettings settings;
@@ -65,14 +59,22 @@ namespace TweetDck.Updates{
             return -1;
         }
 
+        public void DismissUpdate(string tag){
+            settings.DismissedUpdate = tag;
+
+            if (UpdateDismissed != null){
+                UpdateDismissed(this, new UpdateDismissedEventArgs(tag));
+            }
+        }
+
         private void TriggerUpdateAcceptedEvent(UpdateAcceptedEventArgs args){
             if (UpdateAccepted != null){
-                form.InvokeSafe(() => UpdateAccepted(this, args));
+                form.InvokeAsyncSafe(() => UpdateAccepted(this, args));
             }
         }
 
         private void TriggerUpdateDismissedEvent(UpdateDismissedEventArgs args){
-            form.InvokeSafe(() => {
+            form.InvokeAsyncSafe(() => {
                 settings.DismissedUpdate = args.VersionTag;
                 
                 if (UpdateDismissed != null){
@@ -83,7 +85,7 @@ namespace TweetDck.Updates{
 
         private void TriggerCheckFinishedEvent(UpdateCheckEventArgs args){
             if (CheckFinished != null){
-                form.InvokeSafe(() => CheckFinished(this, args));
+                form.InvokeAsyncSafe(() => CheckFinished(this, args));
             }
         }
 

_postbuild.bat

@@ -1,8 +1,10 @@
 del "bin\x86\Release\*.xml"
+del "bin\x86\Release\*.pdb"
 del "bin\x86\Release\devtools_resources.pak"
 del "bin\x86\Release\d3dcompiler_43.dll"
 del "bin\x86\Release\widevinecdmadapter.dll"
-del "bin\x86\Release\Scripts\debug.js"
 
-del "bin\x86\Release\TweetDuck.Browser.exe"
-ren "bin\x86\Release\CefSharp.BrowserSubprocess.exe" "TweetDuck.Browser.exe"
+if exist "bin\x86\Release\CefSharp.BrowserSubprocess.exe" (
+  del "bin\x86\Release\TweetDuck.Browser.exe"
+  ren "bin\x86\Release\CefSharp.BrowserSubprocess.exe" "TweetDuck.Browser.exe"
+)

bld/RUN BUILD.bat

@@ -0,0 +1,8 @@
+if exist "..\bin\x86\Release\CefSharp.BrowserSubprocess.exe" (
+  del "..\bin\x86\Release\TweetDuck.Browser.exe"
+  ren "..\bin\x86\Release\CefSharp.BrowserSubprocess.exe" "TweetDuck.Browser.exe"
+)
+
+start "" /B "ISCC.exe" /Q "gen_full.iss"
+start "" /B "ISCC.exe" /Q "gen_port.iss"
+start "" /B "ISCC.exe" /Q "gen_upd.iss"

bld/gen_full.iss

@@ -39,7 +39,7 @@ Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{
 
 [Files]
 Source: "..\bin\x86\Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\bin\x86\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; Excludes: "*.xml,devtools_resources.pak,d3dcompiler_43.dll,widevinecdmadapter.dll,debug.js"
+Source: "..\bin\x86\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; Excludes: "*.xml,*.pdb,devtools_resources.pak,d3dcompiler_43.dll,widevinecdmadapter.dll"
 
 [Icons]
 Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Check: TDIsUninstallable
@@ -50,6 +50,8 @@ Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChang
 
 [InstallDelete]
 Type: files; Name: "{app}\td-log.txt"
+Type: filesandordirs; Name: "{app}\plugins\official\design-revert"
+Type: filesandordirs; Name: "{localappdata}\TD_Plugins\official\design-revert"
 
 [UninstallDelete]
 Type: files; Name: "{app}\debug.log"

bld/gen_port.iss

@@ -36,17 +36,25 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 
 [Files]
 Source: "..\bin\x86\Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\bin\x86\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; Excludes: "*.xml,devtools_resources.pak,d3dcompiler_43.dll,widevinecdmadapter.dll,debug.js"
+Source: "..\bin\x86\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; Excludes: "*.xml,*.pdb,devtools_resources.pak,d3dcompiler_43.dll,widevinecdmadapter.dll"
 
 [Run]
-Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall shellexec
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall shellexec skipifsilent
+
+[InstallDelete]
+Type: filesandordirs; Name: "{app}\plugins\official\design-revert"
+Type: filesandordirs; Name: "{app}\portable\storage\TD_Plugins\official\design-revert"
 
 [Code]
+var UpdatePath: String;
+
 function TDGetNetFrameworkVersion: Cardinal; forward;
 
 { Check .NET Framework version on startup, ask user if they want to proceed if older than 4.5.2. }
 function InitializeSetup: Boolean;
 begin
+  UpdatePath := ExpandConstant('{param:UPDATEPATH}')
+  
   if TDGetNetFrameworkVersion() >= 379893 then
   begin
     Result := True;
@@ -62,6 +70,21 @@ begin
   Result := True;
 end;
 
+{ Set the installation path if updating. }
+procedure InitializeWizard();
+begin
+  if (UpdatePath <> '') then
+  begin
+    WizardForm.DirEdit.Text := UpdatePath;
+  end;
+end;
+
+{ Skip the install path selection page if running from an update installer. }
+function ShouldSkipPage(PageID: Integer): Boolean;
+begin
+  Result := (PageID = wpSelectDir) and (UpdatePath <> '')
+end;
+
 { Return DWORD value containing the build version of .NET Framework. }
 function TDGetNetFrameworkVersion: Cardinal;
 var FrameworkVersion: Cardinal;

bld/gen_upd.iss

@@ -8,7 +8,7 @@
 
 #define MyAppID "8C25A716-7E11-4AAD-9992-8B5D0C78AE06"
 #define MyAppVersion GetFileVersion("..\bin\x86\Release\TweetDuck.exe")
-#define CefVersion "3.2785.1486.0"
+#define CefVersion GetFileVersion("..\bin\x86\Release\libcef.dll")
 
 [Setup]
 AppId={{{#MyAppID}}
@@ -41,7 +41,7 @@ Name: "english"; MessagesFile: "compiler:Default.isl"
 
 [Files]
 Source: "..\bin\x86\Release\{#MyAppExeName}"; DestDir: "{app}"; Flags: ignoreversion
-Source: "..\bin\x86\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; Excludes: "*.xml,*.dll,*.pak,*.bin,*.dat,debug.js"
+Source: "..\bin\x86\Release\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs; Excludes: "*.xml,*.pdb,*.dll,*.pak,*.bin,*.dat"
 
 [Icons]
 Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Check: TDIsUninstallable
@@ -72,6 +72,7 @@ function TDIsUninstallable: Boolean; forward;
 function TDFindUpdatePath: String; forward;
 function TDGetNetFrameworkVersion: Cardinal; forward;
 function TDGetAppVersionClean: String; forward;
+function TDGetFullDownloadFileName: String; forward;
 function TDIsMatchingCEFVersion: Boolean; forward;
 procedure TDExecuteFullDownload; forward;
 
@@ -93,7 +94,7 @@ begin
   
   if not TDIsMatchingCEFVersion() then
   begin
-    idpAddFile('https://github.com/{#MyAppPublisher}/{#MyAppName}/releases/download/'+TDGetAppVersionClean()+'/{#MyAppName}.exe', ExpandConstant('{tmp}\{#MyAppName}.Full.exe'));
+    idpAddFile('https://github.com/{#MyAppPublisher}/{#MyAppName}/releases/download/'+TDGetAppVersionClean()+'/'+TDGetFullDownloadFileName(), ExpandConstant('{tmp}\{#MyAppName}.Full.exe'));
   end;
   
   if TDGetNetFrameworkVersion() >= 379893 then
@@ -166,15 +167,21 @@ end;
 { Returns a validated installation path (including trailing backslash) using the /UPDATEPATH parameter or installation info in registry. Returns empty string on failure. }
 function TDFindUpdatePath: String;
 var Path: String;
+var RegistryKey: String;
 
 begin
   Path := ExpandConstant('{param:UPDATEPATH}')
   
-  if (Path = '') and not IsPortable and not RegQueryStringValue(HKEY_LOCAL_MACHINE, 'Software\Microsoft\Windows\CurrentVersion\Uninstall\{{#MyAppID}}_is1', 'InstallLocation', Path) then
+  if (Path = '') and not IsPortable then
+  begin
+    RegistryKey := 'Software\Microsoft\Windows\CurrentVersion\Uninstall\{{#MyAppID}}_is1'
+    
+    if not (RegQueryStringValue(HKEY_CURRENT_USER, RegistryKey, 'InstallLocation', Path) or RegQueryStringValue(HKEY_LOCAL_MACHINE, RegistryKey, 'InstallLocation', Path)) then
     begin
       Result := ''
       Exit
     end;
+  end;
   
   if not FileExists(Path+'{#MyAppExeName}') then
   begin
@@ -199,6 +206,12 @@ begin
   Result := 0;
 end;
 
+{ Return the name of the full installer file to download from GitHub. }
+function TDGetFullDownloadFileName: String;
+begin
+  if IsPortable then Result := '{#MyAppName}.Portable.exe' else Result := '{#MyAppName}.exe';
+end;
+
 { Return whether the version of the installed libcef.dll library matches internal one. }
 function TDIsMatchingCEFVersion: Boolean;
 var CEFVersion: String;

packages.config

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+  <package id="cef.redist.x64" version="3.2987.1597" targetFramework="net452" xmlns="" />
+  <package id="cef.redist.x86" version="3.2987.1597" targetFramework="net452" xmlns="" />
+  <package id="CefSharp.Common" version="57.0.0-pre01" targetFramework="net452" xmlns="" />
+  <package id="CefSharp.WinForms" version="57.0.0-pre01" targetFramework="net452" xmlns="" />
+  <package id="Microsoft.VC120.CRT.JetBrains" version="12.0.21005.2" targetFramework="net452" xmlns="" />
+</packages>