Release 1.5.1

Closes #80

.gitignore

@@ -17,9 +17,13 @@
 [Rr]eleases/
 x64/
 x86/
-bld/
 [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/

Configuration/LockManager.cs

@@ -5,6 +5,10 @@ using System.Threading;
 
 namespace TweetDck.Configuration{
     sealed class LockManager{
+        public enum Result{
+            Success, HasProcess, Fail
+        }
+
         public Process LockingProcess { get; private set; }
 
         private readonly string file;
@@ -14,87 +18,97 @@ namespace TweetDck.Configuration{
             this.file = file;
         }
 
-        private bool CreateLockFile(){
+        private void CreateLockFileStream(){
+            lockStream = new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.Read);
+            WriteIntToStream(lockStream, GetCurrentProcessId());
+            lockStream.Flush(true);
+        }
+
+        private bool ReleaseLockFileStream(){
+            if (lockStream != null){
+                lockStream.Dispose();
+                lockStream = null;
+                return true;
+            }
+            else{
+                return false;
+            }
+        }
+
+        private Result TryCreateLockFile(){
             if (lockStream != null){
                 throw new InvalidOperationException("Lock file already exists.");
             }
 
             try{
-                lockStream = new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.Read);
-
-                byte[] id = BitConverter.GetBytes(Process.GetCurrentProcess().Id);
-                lockStream.Write(id, 0, id.Length);
-                lockStream.Flush();
-
-                if (LockingProcess != null){
-                    LockingProcess.Close();
-                    LockingProcess = null;
-                }
-
-                return true;
-            }catch(Exception){
-                if (lockStream != null){
-                    lockStream.Close();
-                    lockStream.Dispose();
-                }
-
-                return false;
-            }
-        }
-
-        public bool Lock(){
-            if (lockStream != null)return true;
-
+                CreateLockFileStream();
+                return Result.Success;
+            }catch(DirectoryNotFoundException){
                 try{
-                byte[] bytes = new byte[4];
+                    CreateLockFileStream();
+                    return Result.Success;
+                }catch{
+                    ReleaseLockFileStream();
+                    return Result.Fail;
+                }
+            }catch(IOException){
+                return Result.HasProcess;
+            }catch{
+                ReleaseLockFileStream();
+                return Result.Fail;
+            }
+        }
+
+        public Result Lock(){
+            if (lockStream != null){
+                return Result.Success;
+            }
+
+            Result initialResult = TryCreateLockFile();
+
+            if (initialResult == Result.HasProcess){
+                try{
+                    int pid;
 
                     using(FileStream fileStream = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)){
-                    fileStream.Read(bytes, 0, 4);
+                        pid = ReadIntFromStream(fileStream);
                     }
 
-                int pid = BitConverter.ToInt32(bytes, 0);
-
                     try{
                         Process foundProcess = Process.GetProcessById(pid);
 
                         using(Process currentProcess = Process.GetCurrentProcess()){
-                        if (foundProcess.ProcessName == currentProcess.ProcessName){
+                            if (foundProcess.MainModule.FileVersionInfo.InternalName == currentProcess.MainModule.FileVersionInfo.InternalName){
                                 LockingProcess = foundProcess;
                             }
+                            else{
+                                foundProcess.Close();
                             }
-                }catch(ArgumentException){}
-
-                return LockingProcess == null && CreateLockFile();
-            }catch(DirectoryNotFoundException){
-                string dir = Path.GetDirectoryName(file);
-
-                if (dir != null){
-                    Directory.CreateDirectory(dir);
-                    return CreateLockFile();
                         }
-            }catch(FileNotFoundException){
-                return CreateLockFile();
-            }catch(Exception){
-                return false;
+                    }catch{
+                        // GetProcessById throws ArgumentException if the process is missing
+                        // Process.MainModule can throw exceptions in some cases
                     }
 
-            return false;
+                    return LockingProcess == null ? Result.Fail : Result.HasProcess;
+                }catch{
+                    return Result.Fail;
+                }
+            }
+
+            return initialResult;
         }
 
         public bool Unlock(){
             bool result = true;
 
-            if (lockStream != null){
-                lockStream.Dispose();
-
+            if (ReleaseLockFileStream()){
                 try{
                     File.Delete(file);
                 }catch(Exception e){
-                    Program.Log(e.ToString());
+                    Program.Reporter.Log(e.ToString());
                     result = false;
                 }
-
-                lockStream = null;
             }
 
             return result;
@@ -104,11 +118,9 @@ namespace TweetDck.Configuration{
             if (LockingProcess != null){
                 LockingProcess.CloseMainWindow();
 
-                for(int waited = 0; waited < timeout && !LockingProcess.HasExited;){
+                for(int waited = 0; waited < timeout && !LockingProcess.HasExited; waited += 250){
                     LockingProcess.Refresh();
-
-                    Thread.Sleep(100);
-                    waited += 100;
+                    Thread.Sleep(250);
                 }
 
                 if (LockingProcess.HasExited){
@@ -120,5 +132,24 @@ namespace TweetDck.Configuration{
 
             return false;
         }
+
+        // Utility functions
+
+        private static void WriteIntToStream(Stream stream, int value){
+            byte[] id = BitConverter.GetBytes(value);
+            stream.Write(id, 0, id.Length);
+        }
+
+        private static int ReadIntFromStream(Stream stream){
+            byte[] bytes = new byte[4];
+            stream.Read(bytes, 0, 4);
+            return BitConverter.ToInt32(bytes, 0);
+        }
+
+        private static int GetCurrentProcessId(){
+            using(Process process = Process.GetCurrentProcess()){
+                return process.Id;
+            }
+        }
     }
 }

Configuration/UserConfig.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Drawing;
-using System.Globalization;
 using System.IO;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Formatters.Binary;
@@ -12,17 +11,12 @@ using TweetDck.Plugins;
 namespace TweetDck.Configuration{
     [Serializable]
     sealed class UserConfig{
-        private static readonly IFormatter Formatter = new BinaryFormatter{
-            Binder = new SerializationCompatibilityHandler()
-        };
+        private static readonly IFormatter Formatter = new BinaryFormatter();
 
         private const int CurrentFileVersion = 5;
 
         // START OF CONFIGURATION
 
-        public bool IgnoreMigration { get; set; }
-        public bool IgnoreUninstallCheck { get; set; }
-
         public WindowState BrowserWindow { get; set; }
         public bool DisplayNotificationTimer { get; set; }
         public bool NotificationTimerCountDown { get; set; }
@@ -35,6 +29,7 @@ namespace TweetDck.Configuration{
         public int NotificationDurationValue { get; set; }
         public bool NotificationLegacyLoad { get; set; }
 
+        public bool EnableSpellCheck { get; set; }
         public bool ExpandLinksOnHover { get; set; }
         public bool EnableTrayHighlight { get; set; }
 
@@ -188,13 +183,14 @@ namespace TweetDck.Configuration{
 
                 return true;
             }catch(Exception e){
-                Program.HandleException("Could not save the configuration file.", e);
+                Program.Reporter.HandleException("Configuration Error", "Could not save the configuration file.", true, e);
                 return false;
             }
         }
         
         public static UserConfig Load(string file){
             UserConfig config = null;
+            Exception firstException = null;
 
             for(int attempt = 0; attempt < 2; attempt++){
                 try{
@@ -210,9 +206,21 @@ namespace TweetDck.Configuration{
 
                     break;
                 }catch(FileNotFoundException){
+                }catch(DirectoryNotFoundException){
+                    break;
                 }catch(Exception e){
-                    Program.HandleException("Could not open the configuration file.", e);
+                    if (attempt == 0){
+                        firstException = e;
+                        Program.Reporter.Log(e.ToString());
                     }
+                    else if (firstException != null){
+                        Program.Reporter.HandleException("Configuration Error", "Could not open the backup configuration file. If you continue, you may lose your settings and list of enabled plugins.", true, e);
+                    }
+                }
+            }
+
+            if (firstException != null && config == null){
+                Program.Reporter.HandleException("Configuration Error", "Could not open the configuration file.", true, firstException);
             }
 
             return config ?? new UserConfig(file);
@@ -221,18 +229,5 @@ namespace TweetDck.Configuration{
         public static string GetBackupFile(string file){
             return file+".bak";
         }
-
-        private class SerializationCompatibilityHandler : SerializationBinder{
-            public override Type BindToType(string assemblyName, string typeName){
-                #if DUCK
-                assemblyName = assemblyName.Replace("TweetDick", "TweetDuck");
-                #else
-                assemblyName = assemblyName.Replace("TweetDuck", "TweetDick");
-                #endif
-
-                typeName = typeName.Replace("TweetDick", "TweetDck");
-                return Type.GetType(string.Format(CultureInfo.CurrentCulture, "{0},  {1}", typeName, assemblyName));
-            }
-        }
     }
 }

Configuration/app.config

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

Configuration/packages.config

@@ -1,8 +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.2623.1396" targetFramework="net40-Client" />
-  <package id="cef.redist.x86" version="3.2623.1396" targetFramework="net40-Client" />
-  <package id="CefSharp.Common" version="49.0.0-pre02" targetFramework="net40-Client" />
-  <package id="CefSharp.WinForms" version="49.0.0-pre02" targetFramework="net40-Client" />
-  <package id="Microsoft.VC120.CRT.JetBrains" version="12.0.21005.2" targetFramework="net40-Client" />
+  <package id="cef.redist.x64" version="3.2785.1478" targetFramework="net452" />
+  <package id="cef.redist.x86" version="3.2785.1478" targetFramework="net452" />
+  <package id="CefSharp.Common" version="53.0.0-pre01" targetFramework="net452" />
+  <package id="CefSharp.WinForms" version="53.0.0-pre01" targetFramework="net452" />
+  <package id="Microsoft.VC120.CRT.JetBrains" version="12.0.21005.2" targetFramework="net452" />
 </packages>

Core/Controls/ControlExtensions.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Drawing;
 using System.Windows.Forms;
+using TweetDck.Core.Utils;
 
 namespace TweetDck.Core.Controls{
     static class ControlExtensions{
@@ -34,5 +35,21 @@ namespace TweetDck.Core.Controls{
                 trackBar.Value = value;
             }
         }
+
+        public static void SetElevated(this Button button){
+            button.Text = " "+button.Text;
+            button.FlatStyle = FlatStyle.System;
+            NativeMethods.SendMessage(button.Handle, NativeMethods.BCM_SETSHIELD, 0, new IntPtr(1));
+        }
+
+        public static void EnableMultilineShortcuts(this TextBox textBox){
+            textBox.KeyDown += (sender, args) => {
+                if (args.Control && args.KeyCode == Keys.A){
+                    ((TextBox)sender).SelectAll();
+                    args.SuppressKeyPress = true;
+                    args.Handled = true;
+                }
+            };
+        }
     }
 }

Core/FormBrowser.cs

@@ -8,8 +8,10 @@ using TweetDck.Core.Other;
 using TweetDck.Resources;
 using TweetDck.Core.Controls;
 using System.Drawing;
+using TweetDck.Core.Utils;
 using TweetDck.Updates;
 using TweetDck.Plugins;
+using TweetDck.Plugins.Enums;
 using TweetDck.Plugins.Events;
 
 namespace TweetDck.Core{
@@ -33,14 +35,14 @@ namespace TweetDck.Core{
 
         private FormWindowState prevState;
 
-        public FormBrowser(PluginManager pluginManager){
+        public FormBrowser(PluginManager pluginManager, UpdaterSettings updaterSettings){
             InitializeComponent();
 
             Text = Program.BrandName;
 
             this.plugins = pluginManager;
             this.plugins.Reloaded += plugins_Reloaded;
-            this.plugins.Config.PluginChangedState += plugins_PluginChangedState;
+            this.plugins.PluginChangedState += plugins_PluginChangedState;
 
             FormNotification notification = CreateNotificationForm(true);
             notification.CanMoveWindow = () => false;
@@ -52,6 +54,10 @@ namespace TweetDck.Core{
                 LifeSpanHandler = new LifeSpanHandler()
             };
 
+            #if DEBUG
+            this.browser.ConsoleMessage += BrowserUtils.HandleConsoleMessage;
+            #endif
+
             this.browser.LoadingStateChanged += Browser_LoadingStateChanged;
             this.browser.FrameLoadEnd += Browser_FrameLoadEnd;
             this.browser.RegisterJsObject("$TD", new TweetDeckBridge(this, notification));
@@ -67,7 +73,7 @@ namespace TweetDck.Core{
 
             UpdateTrayIcon();
 
-            this.updates = new UpdateHandler(browser, this);
+            this.updates = new UpdateHandler(browser, this, updaterSettings);
             this.updates.UpdateAccepted += updates_UpdateAccepted;
         }
 
@@ -76,7 +82,7 @@ namespace TweetDck.Core{
             form.Shown += (sender, args) => form.MoveToCenter(this);
         }
 
-        private void ForceClose(){
+        public void ForceClose(){
             trayIcon.Visible = false; // checked in FormClosing event
             Close();
         }
@@ -101,13 +107,19 @@ namespace TweetDck.Core{
 
         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");
+
                 Invoke(new Action(SetupWindow));
                 browser.LoadingStateChanged -= Browser_LoadingStateChanged;
             }
         }
 
         private void Browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
-            if (e.Frame.IsMain){
+            if (e.Frame.IsMain && BrowserUtils.IsTweetDeckWebsite(e.Frame)){
                 ScriptLoader.ExecuteFile(e.Frame, "code.js");
 
                 if (plugins.HasAnyPlugin(PluginEnvironment.Browser)){
@@ -291,11 +303,11 @@ namespace TweetDck.Core{
         }
 
         public void OnImagePasted(){
-            browser.ExecuteScriptAsync("TDGF_tryPasteImage", new object[0]);
+            browser.ExecuteScriptAsync("TDGF_tryPasteImage()");
         }
 
         public void OnImagePastedFinish(){
-            browser.ExecuteScriptAsync("TDGF_tryPasteImageFinish", new object[0]);
+            browser.ExecuteScriptAsync("TDGF_tryPasteImageFinish()");
         }
 
         public void ReloadBrowser(){

Core/FormNotification.cs

@@ -9,6 +9,7 @@ using TweetDck.Core.Handling;
 using TweetDck.Resources;
 using TweetDck.Core.Utils;
 using TweetDck.Plugins;
+using TweetDck.Plugins.Enums;
 
 namespace TweetDck.Core{
     sealed partial class FormNotification : Form{
@@ -62,6 +63,7 @@ namespace TweetDck.Core{
         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 bool isInitialized;
@@ -99,6 +101,10 @@ namespace TweetDck.Core{
                 LifeSpanHandler = new LifeSpanHandler()
             };
 
+            #if DEBUG
+            browser.ConsoleMessage += BrowserUtils.HandleConsoleMessage;
+            #endif
+
             browser.IsBrowserInitializedChanged += Browser_IsBrowserInitializedChanged;
             browser.FrameLoadEnd += Browser_FrameLoadEnd;
             browser.RegisterJsObject("$TD", new TweetDeckBridge(owner, this));
@@ -225,7 +231,7 @@ namespace TweetDck.Core{
                 tweetQueue.Enqueue(notification);
                 UpdateTitle();
 
-                if (!timerProgress.Enabled){
+                if (totalTime == 0){
                     LoadNextNotification();
                 }
             }
@@ -248,6 +254,7 @@ namespace TweetDck.Core{
             Location = new Point(-32000, -32000);
             progressBarTimer.Value = Program.UserConfig.NotificationTimerCountDown ? 1000 : 0;
             timerProgress.Stop();
+            totalTime = 0;
 
             StopMouseHook();
         }
@@ -276,6 +283,7 @@ namespace TweetDck.Core{
 
         private void LoadTweet(TweetNotification tweet){
             CurrentUrl = tweet.Url;
+            CurrentQuotedTweetUrl = string.Empty; // load from JS
             
             timerProgress.Stop();
             totalTime = timeLeft = tweet.GetDisplayDuration(Program.UserConfig.NotificationDurationValue);

Core/Handling/BrowserProcessHandler.cs

@@ -0,0 +1,16 @@
+using CefSharp;
+using System;
+
+namespace TweetDck.Core.Handling{
+    class BrowserProcessHandler : IBrowserProcessHandler{
+        void IBrowserProcessHandler.OnContextInitialized(){
+            using(IRequestContext ctx = Cef.GetGlobalRequestContext()){
+                string err;
+                ctx.SetPreference("browser.enable_spellchecking", Program.UserConfig.EnableSpellCheck, out err);
+            }
+        }
+
+        void IBrowserProcessHandler.OnScheduleMessagePumpWork(long delay){}
+        void IDisposable.Dispose(){}
+    }
+}

Core/Handling/ContextMenuBrowser.cs

@@ -18,6 +18,9 @@ namespace TweetDck.Core.Handling{
 
         private readonly FormBrowser form;
 
+        private string lastHighlightedTweet;
+        private string lastHighlightedQuotedTweet;
+
         public ContextMenuBrowser(FormBrowser form){
             this.form = form;
         }
@@ -31,11 +34,19 @@ namespace TweetDck.Core.Handling{
 
             base.OnBeforeContextMenu(browserControl, browser, frame, parameters, model);
 
-            if (!string.IsNullOrEmpty(TweetDeckBridge.LastHighlightedTweet) && (parameters.TypeFlags & (ContextMenuType.Editable | ContextMenuType.Selection)) == 0){
+            lastHighlightedTweet = TweetDeckBridge.LastHighlightedTweet;
+            lastHighlightedQuotedTweet = TweetDeckBridge.LastHighlightedQuotedTweet;
+
+            if (!BrowserUtils.IsTweetDeckWebsite(frame)){
+                lastHighlightedTweet = string.Empty;
+                lastHighlightedQuotedTweet = string.Empty;
+            }
+
+            if (!string.IsNullOrEmpty(lastHighlightedTweet) && (parameters.TypeFlags & (ContextMenuType.Editable | ContextMenuType.Selection)) == 0){
                 model.AddItem((CefMenuCommand)MenuOpenTweetUrl, "Open tweet in browser");
                 model.AddItem((CefMenuCommand)MenuCopyTweetUrl, "Copy tweet address");
 
-                if (!string.IsNullOrEmpty(TweetDeckBridge.LastHighlightedQuotedTweet)){
+                if (!string.IsNullOrEmpty(lastHighlightedQuotedTweet)){
                     model.AddSeparator();
                     model.AddItem((CefMenuCommand)MenuOpenQuotedTweetUrl, "Open quoted tweet in browser");
                     model.AddItem((CefMenuCommand)MenuCopyQuotedTweetUrl, "Copy quoted tweet address");
@@ -91,19 +102,19 @@ namespace TweetDck.Core.Handling{
                     return true;
 
                 case MenuOpenTweetUrl:
-                    BrowserUtils.OpenExternalBrowser(TweetDeckBridge.LastHighlightedTweet);
+                    BrowserUtils.OpenExternalBrowser(lastHighlightedTweet);
                     return true;
 
                 case MenuCopyTweetUrl:
-                    Clipboard.SetText(TweetDeckBridge.LastHighlightedTweet, TextDataFormat.UnicodeText);
+                    Clipboard.SetText(lastHighlightedTweet, TextDataFormat.UnicodeText);
                     return true;
 
                 case MenuOpenQuotedTweetUrl:
-                    BrowserUtils.OpenExternalBrowser(TweetDeckBridge.LastHighlightedQuotedTweet);
+                    BrowserUtils.OpenExternalBrowser(lastHighlightedQuotedTweet);
                     return true;
 
                 case MenuCopyQuotedTweetUrl:
-                    Clipboard.SetText(TweetDeckBridge.LastHighlightedQuotedTweet, TextDataFormat.UnicodeText);
+                    Clipboard.SetText(lastHighlightedQuotedTweet, TextDataFormat.UnicodeText);
                     return true;
             }
 

Core/Handling/ContextMenuNotification.cs

@@ -7,7 +7,7 @@ namespace TweetDck.Core.Handling{
         private const int MenuSkipTweet = 26600;
         private const int MenuFreeze = 26601;
         private const int MenuCopyTweetUrl = 26602;
-        private const int MenuCopyTweetEmbeddedUrl = 26603;
+        private const int MenuCopyQuotedTweetUrl = 26603;
 
         private readonly FormNotification form;
         private readonly bool enableCustomMenu;
@@ -29,8 +29,8 @@ namespace TweetDck.Core.Handling{
                 if (!string.IsNullOrEmpty(form.CurrentUrl)){
                     model.AddItem((CefMenuCommand)MenuCopyTweetUrl, "Copy tweet address");
 
-                    if (!string.IsNullOrEmpty(TweetDeckBridge.NotificationTweetEmbedded)){
-                        model.AddItem((CefMenuCommand)MenuCopyTweetEmbeddedUrl, "Copy quoted tweet address");
+                    if (!string.IsNullOrEmpty(form.CurrentQuotedTweetUrl)){
+                        model.AddItem((CefMenuCommand)MenuCopyQuotedTweetUrl, "Copy quoted tweet address");
                     }
 
                     model.AddSeparator();
@@ -61,8 +61,8 @@ namespace TweetDck.Core.Handling{
                     Clipboard.SetText(form.CurrentUrl, TextDataFormat.UnicodeText);
                     return true;
 
-                case MenuCopyTweetEmbeddedUrl:
-                    Clipboard.SetText(TweetDeckBridge.NotificationTweetEmbedded, TextDataFormat.UnicodeText);
+                case MenuCopyQuotedTweetUrl:
+                    Clipboard.SetText(form.CurrentQuotedTweetUrl, TextDataFormat.UnicodeText);
                     return true;
             }
 

Core/Handling/TweetDeckBridge.cs

@@ -11,7 +11,6 @@ namespace TweetDck.Core.Handling{
         public static string LastRightClickedLink = string.Empty;
         public static string LastHighlightedTweet = string.Empty;
         public static string LastHighlightedQuotedTweet = string.Empty;
-        public static string NotificationTweetEmbedded = string.Empty;
         public static string ClipboardImagePath = string.Empty;
 
         private readonly FormBrowser form;
@@ -81,8 +80,8 @@ namespace TweetDck.Core.Handling{
             });
         }
 
-        public void SetNotificationTweetEmbedded(string link){
-            form.InvokeSafe(() => NotificationTweetEmbedded = link);
+        public void SetNotificationQuotedTweet(string link){
+            notification.InvokeSafe(() => notification.CurrentQuotedTweetUrl = link);
         }
 
         public void OpenSettingsMenu(){
@@ -119,6 +118,10 @@ namespace TweetDck.Core.Handling{
             }
         }
 
+        public void LoadNextNotification(){
+            notification.InvokeSafe(notification.FinishCurrentTweet);
+        }
+
         public void TryPasteImage(){
             form.InvokeSafe(() => {
                 if (Clipboard.ContainsImage()){
@@ -133,7 +136,7 @@ namespace TweetDck.Core.Handling{
 
                         form.OnImagePasted();
                     }catch(Exception e){
-                        Program.HandleException("Could not paste image from clipboard.", e);
+                        Program.Reporter.HandleException("Clipboard Image Error", "Could not paste image from clipboard.", true, e);
                     }
                 }
             });

Core/Handling/TweetNotification.cs

@@ -20,7 +20,7 @@ namespace TweetDck.Core.Handling{
 
         private static string CustomCSS{
             get{
-                return @".scroll-styled-v::-webkit-scrollbar{width:8px}.scroll-styled-v::-webkit-scrollbar-thumb{border-radius:0}a[data-full-url]{word-break:break-all}";
+                return @".scroll-styled-v::-webkit-scrollbar{width:8px}.scroll-styled-v::-webkit-scrollbar-thumb{border-radius:0}a[data-full-url]{word-break:break-all}#td-skip{opacity:0;cursor:pointer;transition:opacity 0.15s ease}.td-hover #td-skip{opacity:0.75}#td-skip:hover{opacity:1}";
             }
         }
 
@@ -55,7 +55,7 @@ namespace TweetDck.Core.Handling{
 
                 build.Append(@"</div></div></article>");
 
-                return new TweetNotification(build.ToString(), "", 95);
+                return new TweetNotification(build.ToString(), "", 95, true);
             }
         }
 
@@ -84,11 +84,15 @@ namespace TweetDck.Core.Handling{
         private readonly string html;
         private readonly string url;
         private readonly int characters;
+        private readonly bool isExample;
 
-        public TweetNotification(string html, string url, int characters){
+        public TweetNotification(string html, string url, int characters) : this(html, url, characters, false){}
+
+        private TweetNotification(string html, string url, int characters, bool isExample){
             this.html = html;
             this.url = url;
             this.characters = characters;
+            this.isExample = isExample;
         }
 
         public int GetDisplayDuration(int value){
@@ -106,7 +110,7 @@ namespace TweetDck.Core.Handling{
             }
 
             build.Append("</head>");
-            build.Append("<body class='hearty'><div class='app-columns-container'><div class='column scroll-styled-v' style='width:100%;overflow-y:auto'>");
+            build.Append("<body class='hearty'").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(html);
             build.Append("</div></div></body>");
             build.Append("</html>");

Core/Other/FormAbout.Designer.cs

@@ -28,7 +28,7 @@ namespace TweetDck.Core.Other {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormAbout));
             this.pictureLogo = new System.Windows.Forms.PictureBox();
             this.labelDescription = new System.Windows.Forms.Label();
-            this.labelSourceCode = new System.Windows.Forms.LinkLabel();
+            this.labelTips = new System.Windows.Forms.LinkLabel();
             this.labelWebsite = new System.Windows.Forms.LinkLabel();
             this.tablePanelLinks = new System.Windows.Forms.TableLayoutPanel();
             this.labelIssues = new System.Windows.Forms.LinkLabel();
@@ -59,19 +59,19 @@ namespace TweetDck.Core.Other {
             this.labelDescription.Size = new System.Drawing.Size(232, 109);
             this.labelDescription.TabIndex = 1;
             // 
-            // labelSourceCode
+            // labelTips
             // 
-            this.labelSourceCode.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.labelSourceCode.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelSourceCode.LinkArea = new System.Windows.Forms.LinkArea(0, 0);
-            this.labelSourceCode.Location = new System.Drawing.Point(117, 0);
-            this.labelSourceCode.Margin = new System.Windows.Forms.Padding(0);
-            this.labelSourceCode.Name = "labelSourceCode";
-            this.labelSourceCode.Size = new System.Drawing.Size(99, 16);
-            this.labelSourceCode.TabIndex = 3;
-            this.labelSourceCode.Text = "Source Code";
-            this.labelSourceCode.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
-            this.labelSourceCode.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.OnLinkClicked);
+            this.labelTips.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.labelTips.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
+            this.labelTips.LinkArea = new System.Windows.Forms.LinkArea(0, 0);
+            this.labelTips.Location = new System.Drawing.Point(117, 0);
+            this.labelTips.Margin = new System.Windows.Forms.Padding(0);
+            this.labelTips.Name = "labelTips";
+            this.labelTips.Size = new System.Drawing.Size(99, 16);
+            this.labelTips.TabIndex = 3;
+            this.labelTips.Text = "Tips && Tricks";
+            this.labelTips.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
+            this.labelTips.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.OnLinkClicked);
             // 
             // labelWebsite
             // 
@@ -98,7 +98,7 @@ namespace TweetDck.Core.Other {
             this.tablePanelLinks.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 35.14F));
             this.tablePanelLinks.Controls.Add(this.labelIssues, 2, 0);
             this.tablePanelLinks.Controls.Add(this.labelWebsite, 0, 0);
-            this.tablePanelLinks.Controls.Add(this.labelSourceCode, 1, 0);
+            this.tablePanelLinks.Controls.Add(this.labelTips, 1, 0);
             this.tablePanelLinks.Location = new System.Drawing.Point(12, 124);
             this.tablePanelLinks.Name = "tablePanelLinks";
             this.tablePanelLinks.RowCount = 1;
@@ -146,7 +146,7 @@ namespace TweetDck.Core.Other {
 
         private System.Windows.Forms.PictureBox pictureLogo;
         private System.Windows.Forms.Label labelDescription;
-        private System.Windows.Forms.LinkLabel labelSourceCode;
+        private System.Windows.Forms.LinkLabel labelTips;
         private System.Windows.Forms.LinkLabel labelWebsite;
         private System.Windows.Forms.TableLayoutPanel tablePanelLinks;
         private System.Windows.Forms.LinkLabel labelIssues;

Core/Other/FormAbout.cs

@@ -3,7 +3,7 @@ using TweetDck.Core.Utils;
 
 namespace TweetDck.Core.Other{
     sealed partial class FormAbout : Form{
-        private const string GitHubLink = "https://github.com/chylex/TweetDuck";
+        private const string TipsLink = "https://github.com/chylex/TweetDuck/wiki";
         private const string IssuesLink = "https://github.com/chylex/TweetDuck/issues";
 
         public FormAbout(){
@@ -14,7 +14,7 @@ namespace TweetDck.Core.Other{
             labelDescription.Text = Program.BrandName+" was created by chylex as a replacement to the discontinued official TweetDeck client for Windows.\n\nThe program is available for free under the open source MIT license.";
             
             labelWebsite.Links.Add(new LinkLabel.Link(0, labelWebsite.Text.Length, Program.Website));
-            labelSourceCode.Links.Add(new LinkLabel.Link(0, labelSourceCode.Text.Length, GitHubLink));
+            labelTips.Links.Add(new LinkLabel.Link(0, labelTips.Text.Length, TipsLink));
             labelIssues.Links.Add(new LinkLabel.Link(0, labelIssues.Text.Length, IssuesLink));
         }
 

Core/Other/FormMessage.Designer.cs

@@ -0,0 +1,79 @@
+namespace TweetDck.Core.Other {
+    partial class FormMessage {
+        /// <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.panelActions = new System.Windows.Forms.Panel();
+            this.labelMessage = new System.Windows.Forms.Label();
+            this.SuspendLayout();
+            // 
+            // panelActions
+            // 
+            this.panelActions.BackColor = System.Drawing.SystemColors.Control;
+            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.TabIndex = 0;
+            // 
+            // labelMessage
+            // 
+            this.labelMessage.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
+            | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.labelMessage.AutoSize = true;
+            this.labelMessage.Font = System.Drawing.SystemFonts.MessageBoxFont;
+            this.labelMessage.Location = new System.Drawing.Point(62, 34);
+            this.labelMessage.Margin = new System.Windows.Forms.Padding(53, 24, 27, 24);
+            this.labelMessage.MaximumSize = new System.Drawing.Size(600, 0);
+            this.labelMessage.MinimumSize = new System.Drawing.Size(0, 24);
+            this.labelMessage.Name = "labelMessage";
+            this.labelMessage.Size = new System.Drawing.Size(0, 24);
+            this.labelMessage.TabIndex = 1;
+            this.labelMessage.SizeChanged += new System.EventHandler(this.labelMessage_SizeChanged);
+            // 
+            // FormMessage
+            // 
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.BackColor = System.Drawing.Color.White;
+            this.ClientSize = new System.Drawing.Size(98, 133);
+            this.Controls.Add(this.labelMessage);
+            this.Controls.Add(this.panelActions);
+            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
+            this.MaximizeBox = false;
+            this.MinimizeBox = false;
+            this.Name = "FormMessage";
+            this.ShowIcon = false;
+            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
+            this.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Panel panelActions;
+        private System.Windows.Forms.Label labelMessage;
+    }
+}

Core/Other/FormMessage.cs

@@ -0,0 +1,119 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace TweetDck.Core.Other{
+    sealed partial class FormMessage : Form{
+        public Button ClickedButton { get; private set; }
+
+        private readonly Icon icon;
+        private readonly bool isReady;
+
+        private int realFormWidth, minFormWidth;
+        private int buttonCount;
+        private int prevLabelWidth, prevLabelHeight;
+        private bool wasLabelMultiline;
+
+        public FormMessage(string caption, string text, MessageBoxIcon messageIcon){
+            InitializeComponent();
+
+            this.prevLabelWidth = labelMessage.Width;
+            this.prevLabelHeight = labelMessage.Height;
+            this.minFormWidth = 18;
+
+            switch(messageIcon){
+                case MessageBoxIcon.Information:
+                    icon = SystemIcons.Information;
+                    break;
+
+                case MessageBoxIcon.Warning:
+                    icon = SystemIcons.Warning;
+                    break;
+                    
+                case MessageBoxIcon.Error:
+                    icon = SystemIcons.Error;
+                    break;
+
+                case MessageBoxIcon.Question:
+                    icon = SystemIcons.Question;
+                    break;
+
+                default:
+                    icon = null;
+                    labelMessage.Location = new Point(labelMessage.Location.X-32, labelMessage.Location.Y);
+                    break;
+            }
+
+            this.isReady = true;
+
+            this.Text = caption;
+            this.labelMessage.Text = text;
+        }
+
+        public Button AddButton(string title){
+            Button button = new Button{
+                Anchor = AnchorStyles.Bottom | AnchorStyles.Right,
+                Font = SystemFonts.MessageBoxFont,
+                Location = new Point(Width-112-buttonCount*96, 12),
+                Size = new Size(88, 26),
+                TabIndex = buttonCount,
+                Text = title,
+                UseVisualStyleBackColor = true
+            };
+
+            button.Click += (sender, args) => {
+                ClickedButton = (Button)sender;
+                DialogResult = DialogResult.OK;
+                Close();
+            };
+
+            panelActions.Controls.Add(button);
+
+            minFormWidth += 96;
+            Width = Math.Max(realFormWidth, minFormWidth);
+
+            ++buttonCount;
+            return button;
+        }
+
+        public void AddActionControl(Control control){
+            panelActions.Controls.Add(control);
+
+            minFormWidth += control.Width+control.Margin.Horizontal;
+            Width = Math.Max(realFormWidth, minFormWidth);
+        }
+
+        private void labelMessage_SizeChanged(object sender, EventArgs e){
+            if (!isReady){
+                return;
+            }
+
+            bool isMultiline = labelMessage.Height > labelMessage.MinimumSize.Height;
+
+            if (isMultiline && !wasLabelMultiline){
+                labelMessage.Location = new Point(labelMessage.Location.X, labelMessage.Location.Y-8);
+                prevLabelHeight += 8;
+            }
+            else if (!isMultiline && wasLabelMultiline){
+                labelMessage.Location = new Point(labelMessage.Location.X, labelMessage.Location.Y+8);
+                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);
+            Height += labelMessage.Height-prevLabelHeight;
+
+            prevLabelWidth = labelMessage.Width;
+            prevLabelHeight = labelMessage.Height;
+            wasLabelMultiline = isMultiline;
+        }
+
+        protected override void OnPaint(PaintEventArgs e){
+            if (icon != null){
+                e.Graphics.DrawIcon(icon, 25, 26);
+            }
+
+            base.OnPaint(e);
+        }
+    }
+}

Core/Other/FormPlugins.cs

@@ -6,6 +6,7 @@ using System.Windows.Forms;
 using TweetDck.Core.Controls;
 using TweetDck.Plugins;
 using TweetDck.Plugins.Controls;
+using TweetDck.Plugins.Enums;
 using TweetDck.Plugins.Events;
 
 namespace TweetDck.Core.Other{

Core/Other/Settings/BaseTabSettings.cs

@@ -14,5 +14,11 @@ namespace TweetDck.Core.Other.Settings{
         public BaseTabSettings(){
             Padding = new Padding(6);
         }
+
+        protected static void PromptRestart(){
+            if (MessageBox.Show("The application must restart for the setting to take place. Do you want to restart now?", Program.BrandName+" Settings", MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.Yes){
+                Program.Restart();
+            }
+        }
     }
 }

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

@@ -48,14 +48,14 @@
             this.textBoxBrowserCSS.Multiline = true;
             this.textBoxBrowserCSS.Name = "textBoxBrowserCSS";
             this.textBoxBrowserCSS.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.textBoxBrowserCSS.Size = new System.Drawing.Size(226, 193);
+            this.textBoxBrowserCSS.Size = new System.Drawing.Size(373, 253);
             this.textBoxBrowserCSS.TabIndex = 0;
             this.textBoxBrowserCSS.WordWrap = false;
             // 
             // btnCancel
             // 
             this.btnCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnCancel.Location = new System.Drawing.Point(354, 227);
+            this.btnCancel.Location = new System.Drawing.Point(654, 287);
             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);
@@ -67,7 +67,7 @@
             // btnApply
             // 
             this.btnApply.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right)));
-            this.btnApply.Location = new System.Drawing.Point(416, 227);
+            this.btnApply.Location = new System.Drawing.Point(716, 287);
             this.btnApply.Name = "btnApply";
             this.btnApply.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
             this.btnApply.Size = new System.Drawing.Size(56, 23);
@@ -95,8 +95,8 @@
             this.splitContainer.Panel2.Controls.Add(this.labelNotification);
             this.splitContainer.Panel2.Controls.Add(this.textBoxNotificationCSS);
             this.splitContainer.Panel2MinSize = 64;
-            this.splitContainer.Size = new System.Drawing.Size(460, 209);
-            this.splitContainer.SplitterDistance = 226;
+            this.splitContainer.Size = new System.Drawing.Size(760, 269);
+            this.splitContainer.SplitterDistance = 373;
             this.splitContainer.SplitterWidth = 5;
             this.splitContainer.TabIndex = 5;
             // 
@@ -131,7 +131,7 @@
             this.textBoxNotificationCSS.Multiline = true;
             this.textBoxNotificationCSS.Name = "textBoxNotificationCSS";
             this.textBoxNotificationCSS.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.textBoxNotificationCSS.Size = new System.Drawing.Size(226, 193);
+            this.textBoxNotificationCSS.Size = new System.Drawing.Size(378, 253);
             this.textBoxNotificationCSS.TabIndex = 1;
             this.textBoxNotificationCSS.WordWrap = false;
             // 
@@ -139,7 +139,7 @@
             // 
             this.labelWarning.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
             this.labelWarning.AutoSize = true;
-            this.labelWarning.Location = new System.Drawing.Point(9, 232);
+            this.labelWarning.Location = new System.Drawing.Point(9, 292);
             this.labelWarning.Name = "labelWarning";
             this.labelWarning.Size = new System.Drawing.Size(341, 13);
             this.labelWarning.TabIndex = 6;
@@ -149,7 +149,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(484, 262);
+            this.ClientSize = new System.Drawing.Size(784, 322);
             this.Controls.Add(this.labelWarning);
             this.Controls.Add(this.splitContainer);
             this.Controls.Add(this.btnApply);

Core/Other/Settings/Dialogs/DialogSettingsCSS.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Windows.Forms;
+using TweetDck.Core.Controls;
 
 namespace TweetDck.Core.Other.Settings.Dialogs{
     sealed partial class DialogSettingsCSS : Form{
@@ -20,7 +21,10 @@ namespace TweetDck.Core.Other.Settings.Dialogs{
             
             Text = Program.BrandName+" Settings - CSS";
             
+            textBoxBrowserCSS.EnableMultilineShortcuts();
             textBoxBrowserCSS.Text = Program.UserConfig.CustomBrowserCSS ?? "";
+
+            textBoxNotificationCSS.EnableMultilineShortcuts();
             textBoxNotificationCSS.Text = Program.UserConfig.CustomNotificationCSS ?? "";
         }
 

Core/Other/Settings/Dialogs/DialogSettingsCefArgs.cs

@@ -1,6 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.Windows.Forms;
+using TweetDck.Core.Controls;
 using TweetDck.Core.Utils;
 
 namespace TweetDck.Core.Other.Settings.Dialogs{
@@ -16,6 +16,7 @@ namespace TweetDck.Core.Other.Settings.Dialogs{
             
             Text = Program.BrandName+" Settings - CEF Arguments";
             
+            textBoxArgs.EnableMultilineShortcuts();
             textBoxArgs.Text = Program.UserConfig.CustomCefArgs ?? "";
             textBoxArgs.Select(textBoxArgs.Text.Length, 0);
         }
@@ -33,7 +34,7 @@ namespace TweetDck.Core.Other.Settings.Dialogs{
                 return;
             }
 
-            int count = CommandLineArgsParser.AddToDictionary(CefArgs, new Dictionary<string, string>());
+            int count = CommandLineArgsParser.ReadCefArguments(CefArgs).Count;
             string prompt = count == 0 && !string.IsNullOrWhiteSpace(prevArgs) ? "All arguments will be removed from the settings. Continue?" : count+(count == 1 ? " argument" : " arguments")+" will be added to the settings. Continue?";
 
             if (MessageBox.Show(prompt, "Confirm CEF Arguments", MessageBoxButtons.OKCancel, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) == DialogResult.OK){

Core/Other/Settings/Export/CombinedFileStream.cs

@@ -4,7 +4,7 @@ using System.Text;
 
 namespace TweetDck.Core.Other.Settings.Export{
     class CombinedFileStream : IDisposable{
-        public const char KeySeparator = '/';
+        public const char KeySeparator = '|';
 
         private readonly Stream stream;
 
@@ -12,6 +12,10 @@ namespace TweetDck.Core.Other.Settings.Export{
             this.stream = stream;
         }
 
+        public void WriteFile(string[] identifier, string path){
+            WriteFile(string.Join(KeySeparator.ToString(), identifier), path);
+        }
+
         public void WriteFile(string identifier, string path){
             byte[] name = Encoding.UTF8.GetBytes(identifier);
 
@@ -77,6 +81,13 @@ namespace TweetDck.Core.Other.Settings.Export{
                 }
             }
 
+            public string[] KeyValue{
+                get{
+                    int index = Identifier.IndexOf(KeySeparator);
+                    return index == -1 ? new string[0] : Identifier.Substring(index+1).Split(KeySeparator);
+                }
+            }
+
             private readonly byte[] contents;
 
             public Entry(string identifier, byte[] contents){

Core/Other/Settings/Export/ExportManager.cs

@@ -1,15 +1,15 @@
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
 using TweetDck.Plugins;
+using TweetDck.Plugins.Enums;
 
 namespace TweetDck.Core.Other.Settings.Export{
     sealed class ExportManager{
-        public static readonly string CookiesPath = Path.Combine(Program.StoragePath, "Cookies");
-        public static readonly string TempCookiesPath = Path.Combine(Program.StoragePath, "CookiesTmp");
+        private static readonly string CookiesPath = Path.Combine(Program.StoragePath, "Cookies");
+        private static readonly string TempCookiesPath = Path.Combine(Program.StoragePath, "CookiesTmp");
 
         public bool IsRestarting { get; private set; }
         public Exception LastException { get; private set; }
@@ -27,33 +27,14 @@ namespace TweetDck.Core.Other.Settings.Export{
                 using(CombinedFileStream stream = new CombinedFileStream(new FileStream(file, FileMode.Create, FileAccess.Write, FileShare.None))){
                     stream.WriteFile("config", Program.ConfigFilePath);
 
-                    foreach(PathInfo path in EnumerateFilesRelative(plugins.PathOfficialPlugins)){
-                        string[] split = path.Relative.Split(CombinedFileStream.KeySeparator);
-
-                        if (split.Length < 3){
-                            continue;
-                        }
-                        else if (split.Length == 3){
-                            if (split[2].Equals(".meta", StringComparison.OrdinalIgnoreCase) ||
-                                split[2].Equals("browser.js", StringComparison.OrdinalIgnoreCase) ||
-                                split[2].Equals("notification.js", StringComparison.OrdinalIgnoreCase)){
-                                continue;
-                            }
-                        }
-
+                    foreach(Plugin plugin in plugins.Plugins){
+                        foreach(PathInfo path in EnumerateFilesRelative(plugin.GetPluginFolder(PluginFolder.Data))){
                             try{
-                            stream.WriteFile("plugin.off"+path.Relative, path.Full);
+                                stream.WriteFile(new string[]{ "plugin.data", plugin.Identifier, path.Relative }, path.Full);
                             }catch(ArgumentOutOfRangeException e){
-                            MessageBox.Show("Could not include a file in the export. "+e.Message, "Export Profile", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+                                MessageBox.Show("Could not include a plugin file in the export. "+e.Message, "Export Profile", MessageBoxButtons.OK, MessageBoxIcon.Warning);
                             }
                         }
-
-                    foreach(PathInfo path in EnumerateFilesRelative(plugins.PathCustomPlugins)){
-                        try{
-                            stream.WriteFile("plugin.usr"+path.Relative, path.Full);
-                        }catch(ArgumentOutOfRangeException e){
-                            MessageBox.Show("Could not include a file in the export. "+e.Message, "Export Profile", MessageBoxButtons.OK, MessageBoxIcon.Warning);
-                        }
                     }
 
                     if (includeSession){
@@ -72,7 +53,7 @@ namespace TweetDck.Core.Other.Settings.Export{
 
         public bool Import(){
             try{
-                bool updatedPlugins = false;
+                HashSet<string> missingPlugins = new HashSet<string>();
 
                 using(CombinedFileStream stream = new CombinedFileStream(new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.None))){
                     CombinedFileStream.Entry entry;
@@ -84,29 +65,21 @@ namespace TweetDck.Core.Other.Settings.Export{
                                 Program.ReloadConfig();
                                 break;
 
-                            case "plugin.off":
-                                string root = Path.Combine(plugins.PathOfficialPlugins, entry.Identifier.Split(CombinedFileStream.KeySeparator)[1]);
+                            case "plugin.data":
+                                string[] value = entry.KeyValue;
 
-                                if (Directory.Exists(root)){
-                                    entry.WriteToFile(Path.Combine(plugins.PathOfficialPlugins, entry.Identifier.Substring(entry.KeyName.Length+1)), true);
-                                    updatedPlugins = true;
+                                entry.WriteToFile(Path.Combine(Program.PluginDataPath, value[0], value[1]), true);
+
+                                if (!plugins.IsPluginInstalled(value[0])){
+                                    missingPlugins.Add(value[0]);
                                 }
 
                                 break;
 
-                            case "plugin.usr":
-                                entry.WriteToFile(Path.Combine(plugins.PathCustomPlugins, entry.Identifier.Substring(entry.KeyName.Length+1)), true);
-                                updatedPlugins = true;
-                                break;
-
                             case "cookies":
-                                if (MessageBox.Show("Do you want to import the login session? This will restart "+Program.BrandName+".", "Importing "+Program.BrandName+" Settings", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) == DialogResult.Yes){
+                                if (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){
                                     entry.WriteToFile(Path.Combine(Program.StoragePath, TempCookiesPath));
-
-                                    // okay to and restart, 'cookies' is always the last entry
                                     IsRestarting = true;
-                                    Process.Start(Application.ExecutablePath, "-restart -importcookies");
-                                    Application.Exit();
                                 }
 
                                 break;
@@ -114,7 +87,14 @@ namespace TweetDck.Core.Other.Settings.Export{
                     }
                 }
 
-                if (updatedPlugins){
+                if (missingPlugins.Count > 0){
+                    MessageBox.Show("Detected missing plugins when importing plugin data:"+Environment.NewLine+string.Join(Environment.NewLine, missingPlugins), "Importing "+Program.BrandName+" Profile", MessageBoxButtons.OK, MessageBoxIcon.Information);
+                }
+
+                if (IsRestarting){
+                    Program.Restart(new string[]{ "-importcookies" });
+                }
+                else{
                     plugins.Reload();
                 }
 
@@ -125,11 +105,25 @@ namespace TweetDck.Core.Other.Settings.Export{
             }
         }
 
+        public static void ImportCookies(){
+            if (File.Exists(TempCookiesPath)){
+                try{
+                    if (File.Exists(CookiesPath)){
+                        File.Delete(CookiesPath);
+                    }
+
+                    File.Move(TempCookiesPath, CookiesPath);
+                }catch(Exception e){
+                    Program.Reporter.HandleException("Profile Import Error", "Could not import the cookie file to restore login session.", true, e);
+                }
+            }
+        }
+
         private static IEnumerable<PathInfo> EnumerateFilesRelative(string root){
-            return Directory.EnumerateFiles(root, "*.*", SearchOption.AllDirectories).Select(fullPath => new PathInfo{
+            return Directory.Exists(root) ? Directory.EnumerateFiles(root, "*.*", SearchOption.AllDirectories).Select(fullPath => new PathInfo{
                 Full = fullPath,
-                Relative = fullPath.Substring(root.Length).Replace(Path.DirectorySeparatorChar, CombinedFileStream.KeySeparator) // includes leading separator character
-            });
+                Relative = fullPath.Substring(root.Length).TrimStart(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar) // strip leading separator character
+            }) : Enumerable.Empty<PathInfo>();
         }
 
         private class PathInfo{

Core/Other/Settings/TabSettingsAdvanced.Designer.cs

@@ -29,13 +29,18 @@
             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.btnRestart = new System.Windows.Forms.Button();
             this.btnReset = new System.Windows.Forms.Button();
             this.btnImport = new System.Windows.Forms.Button();
             this.btnExport = new System.Windows.Forms.Button();
             this.groupPerformance = new System.Windows.Forms.GroupBox();
             this.groupConfiguration = new System.Windows.Forms.GroupBox();
+            this.groupApp = new System.Windows.Forms.GroupBox();
+            this.btnOpenAppFolder = new System.Windows.Forms.Button();
             this.groupPerformance.SuspendLayout();
             this.groupConfiguration.SuspendLayout();
+            this.groupApp.SuspendLayout();
             this.SuspendLayout();
             // 
             // btnClearCache
@@ -86,6 +91,30 @@
             this.btnEditCSS.UseVisualStyleBackColor = true;
             this.btnEditCSS.Click += new System.EventHandler(this.btnEditCSS_Click);
             // 
+            // btnRestartLog
+            // 
+            this.btnRestartLog.Location = new System.Drawing.Point(6, 77);
+            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 installati" +
+        "on folder.");
+            this.btnRestartLog.UseVisualStyleBackColor = true;
+            this.btnRestartLog.Click += new System.EventHandler(this.btnRestartLog_Click);
+            // 
+            // btnRestart
+            // 
+            this.btnRestart.Location = new System.Drawing.Point(6, 48);
+            this.btnRestart.Name = "btnRestart";
+            this.btnRestart.Size = new System.Drawing.Size(171, 23);
+            this.btnRestart.TabIndex = 17;
+            this.btnRestart.Text = "Restart the Program";
+            this.toolTip.SetToolTip(this.btnRestart, "Restarts the program using the same command\r\nline arguments that were used at lau" +
+        "nch.");
+            this.btnRestart.UseVisualStyleBackColor = true;
+            this.btnRestart.Click += new System.EventHandler(this.btnRestart_Click);
+            // 
             // btnReset
             // 
             this.btnReset.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
@@ -148,10 +177,34 @@
             this.groupConfiguration.TabStop = false;
             this.groupConfiguration.Text = "Configuration";
             // 
+            // groupApp
+            // 
+            this.groupApp.Controls.Add(this.btnOpenAppFolder);
+            this.groupApp.Controls.Add(this.btnRestartLog);
+            this.groupApp.Controls.Add(this.btnRestart);
+            this.groupApp.Location = new System.Drawing.Point(198, 9);
+            this.groupApp.Name = "groupApp";
+            this.groupApp.Size = new System.Drawing.Size(183, 106);
+            this.groupApp.TabIndex = 20;
+            this.groupApp.TabStop = false;
+            this.groupApp.Text = "App";
+            // 
+            // btnOpenAppFolder
+            // 
+            this.btnOpenAppFolder.Location = new System.Drawing.Point(6, 19);
+            this.btnOpenAppFolder.Name = "btnOpenAppFolder";
+            this.btnOpenAppFolder.Size = new System.Drawing.Size(171, 23);
+            this.btnOpenAppFolder.TabIndex = 16;
+            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);
+            // 
             // TabSettingsAdvanced
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.groupApp);
             this.Controls.Add(this.groupConfiguration);
             this.Controls.Add(this.groupPerformance);
             this.Controls.Add(this.btnReset);
@@ -162,6 +215,7 @@
             this.groupPerformance.ResumeLayout(false);
             this.groupPerformance.PerformLayout();
             this.groupConfiguration.ResumeLayout(false);
+            this.groupApp.ResumeLayout(false);
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -179,5 +233,9 @@
         private System.Windows.Forms.GroupBox groupConfiguration;
         private System.Windows.Forms.Button btnEditCefArgs;
         private System.Windows.Forms.Button btnEditCSS;
+        private System.Windows.Forms.GroupBox groupApp;
+        private System.Windows.Forms.Button btnRestartLog;
+        private System.Windows.Forms.Button btnRestart;
+        private System.Windows.Forms.Button btnOpenAppFolder;
     }
 }

Core/Other/Settings/TabSettingsAdvanced.cs

@@ -71,13 +71,16 @@ namespace TweetDck.Core.Other.Settings{
 
             if (form.ShowDialog(ParentForm) == DialogResult.OK){
                 Config.CustomCefArgs = form.CefArgs;
+                form.Dispose();
                 PromptRestart();
             }
+            else{
+                form.Dispose();
+            }
         }
 
         private void btnEditCSS_Click(object sender, EventArgs e){
-            DialogSettingsCSS form = new DialogSettingsCSS();
-
+            using(DialogSettingsCSS form = new DialogSettingsCSS()){
                 if (form.ShowDialog(ParentForm) == DialogResult.OK){
                     bool hasChangedBrowser = form.BrowserCSS != Config.CustomBrowserCSS;
 
@@ -89,6 +92,7 @@ namespace TweetDck.Core.Other.Settings{
                     }
                 }
             }
+        }
 
         private void btnExport_Click(object sender, EventArgs e){
             DialogResult resultSaveCredentials = MessageBox.Show("Do you want to include your login session? This will not save your password into the file, but it will allow anyone with the file to login into TweetDeck as you.", "Export "+Program.BrandName+" Settings", MessageBoxButtons.YesNoCancel, MessageBoxIcon.Question, MessageBoxDefaultButton.Button3);
@@ -115,7 +119,7 @@ namespace TweetDck.Core.Other.Settings{
                 ExportManager manager = new ExportManager(file, plugins);
 
                 if (!manager.Export(saveCredentials)){
-                    Program.HandleException("An exception happened while exporting "+Program.BrandName+" settings.", manager.LastException);
+                    Program.Reporter.HandleException("Profile Export Error", "An exception happened while exporting "+Program.BrandName+" settings.", true, manager.LastException);
                 }
             }
         }
@@ -141,7 +145,7 @@ namespace TweetDck.Core.Other.Settings{
                     }
                 }
                 else{
-                    Program.HandleException("An exception happened while importing "+Program.BrandName+" settings.", manager.LastException);
+                    Program.Reporter.HandleException("Profile Import Error", "An exception happened while importing "+Program.BrandName+" settings.", true, manager.LastException);
                 }
             }
         }
@@ -153,11 +157,16 @@ namespace TweetDck.Core.Other.Settings{
             }
         }
 
-        private static void PromptRestart(){
-            if (MessageBox.Show("The application must restart for the setting to take place. Do you want to restart now?", Program.BrandName+" Settings", MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.Yes){
-                Process.Start(Application.ExecutablePath, "-restart");
-                Application.Exit();
+        private void btnOpenAppFolder_Click(object sender, EventArgs e){
+            using(Process.Start("explorer.exe", "\""+Program.ProgramPath+"\"")){}
         }
+
+        private void btnRestart_Click(object sender, EventArgs e){
+            Program.Restart();
+        }
+
+        private void btnRestartLog_Click(object sender, EventArgs e){
+            Program.Restart(new string[]{ "-log" });
         }
     }
 }

Core/Other/Settings/TabSettingsGeneral.Designer.cs

@@ -28,6 +28,7 @@
             this.comboBoxTrayType = new System.Windows.Forms.ComboBox();
             this.toolTip = new System.Windows.Forms.ToolTip(this.components);
             this.checkTrayHighlight = new System.Windows.Forms.CheckBox();
+            this.checkSpellCheck = new System.Windows.Forms.CheckBox();
             this.groupTray = new System.Windows.Forms.GroupBox();
             this.labelTrayIcon = new System.Windows.Forms.Label();
             this.groupInterface = new System.Windows.Forms.GroupBox();
@@ -74,12 +75,24 @@
             this.checkTrayHighlight.UseVisualStyleBackColor = true;
             this.checkTrayHighlight.CheckedChanged += new System.EventHandler(this.checkTrayHighlight_CheckedChanged);
             // 
+            // checkSpellCheck
+            // 
+            this.checkSpellCheck.AutoSize = true;
+            this.checkSpellCheck.Location = new System.Drawing.Point(9, 44);
+            this.checkSpellCheck.Name = "checkSpellCheck";
+            this.checkSpellCheck.Size = new System.Drawing.Size(119, 17);
+            this.checkSpellCheck.TabIndex = 15;
+            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);
+            // 
             // groupTray
             // 
             this.groupTray.Controls.Add(this.checkTrayHighlight);
             this.groupTray.Controls.Add(this.labelTrayIcon);
             this.groupTray.Controls.Add(this.comboBoxTrayType);
-            this.groupTray.Location = new System.Drawing.Point(9, 63);
+            this.groupTray.Location = new System.Drawing.Point(9, 86);
             this.groupTray.Name = "groupTray";
             this.groupTray.Size = new System.Drawing.Size(183, 93);
             this.groupTray.TabIndex = 15;
@@ -98,10 +111,11 @@
             // 
             // groupInterface
             // 
+            this.groupInterface.Controls.Add(this.checkSpellCheck);
             this.groupInterface.Controls.Add(this.checkExpandLinks);
             this.groupInterface.Location = new System.Drawing.Point(9, 9);
             this.groupInterface.Name = "groupInterface";
-            this.groupInterface.Size = new System.Drawing.Size(183, 48);
+            this.groupInterface.Size = new System.Drawing.Size(183, 71);
             this.groupInterface.TabIndex = 16;
             this.groupInterface.TabStop = false;
             this.groupInterface.Text = "User Interface";
@@ -131,5 +145,6 @@
         private System.Windows.Forms.GroupBox groupInterface;
         private System.Windows.Forms.Label labelTrayIcon;
         private System.Windows.Forms.CheckBox checkTrayHighlight;
+        private System.Windows.Forms.CheckBox checkSpellCheck;
     }
 }

Core/Other/Settings/TabSettingsGeneral.cs

@@ -12,8 +12,9 @@ namespace TweetDck.Core.Other.Settings{
             comboBoxTrayType.Items.Add("Combined");
             comboBoxTrayType.SelectedIndex = Math.Min(Math.Max((int)Config.TrayBehavior, 0), comboBoxTrayType.Items.Count-1);
 
-            checkExpandLinks.Checked = Program.UserConfig.ExpandLinksOnHover;
-            checkTrayHighlight.Checked = Program.UserConfig.EnableTrayHighlight;
+            checkExpandLinks.Checked = Config.ExpandLinksOnHover;
+            checkSpellCheck.Checked = Config.EnableSpellCheck;
+            checkTrayHighlight.Checked = Config.EnableTrayHighlight;
         }
 
         private void checkExpandLinks_CheckedChanged(object sender, EventArgs e){
@@ -22,6 +23,13 @@ namespace TweetDck.Core.Other.Settings{
             Config.ExpandLinksOnHover = checkExpandLinks.Checked;
         }
 
+        private void checkSpellCheck_CheckedChanged(object sender, EventArgs e){
+            if (!Ready)return;
+
+            Config.EnableSpellCheck = checkSpellCheck.Checked;
+            PromptRestart();
+        }
+
         private void comboBoxTrayType_SelectedIndexChanged(object sender, EventArgs e){
             if (!Ready)return;
 

Core/Utils/BrowserCache.cs

@@ -8,14 +8,11 @@ namespace TweetDck.Core.Utils{
     static class BrowserCache{
         private static bool ClearOnExit { get; set; }
 
-        private static readonly string IndexFile = Path.Combine(Program.StoragePath, "index");
+        private static readonly string CacheFolder = Path.Combine(Program.StoragePath, "Cache");
 
         private static IEnumerable<string> CacheFiles{
             get{
-                return 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[]{ IndexFile });
+                return Directory.EnumerateFiles(CacheFolder);
             }
         }
 
@@ -34,6 +31,21 @@ 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

@@ -4,6 +4,7 @@ using System.Globalization;
 using System.IO;
 using System.Net;
 using System.Windows.Forms;
+using CefSharp;
 
 namespace TweetDck.Core.Utils{
     static class BrowserUtils{
@@ -27,7 +28,7 @@ namespace TweetDck.Core.Utils{
         }
 
         public static void OpenExternalBrowser(string url){ // TODO implement mailto
-            Process.Start(url);
+            using(Process.Start(url)){}
         }
 
         public static string GetFileNameFromUrl(string url){
@@ -47,5 +48,15 @@ namespace TweetDck.Core.Utils{
 
             client.DownloadFileAsync(new Uri(url), target);
         }
+
+        public static bool IsTweetDeckWebsite(IFrame frame){
+            return frame.Url.Contains("//tweetdeck.twitter.com/");
+        }
+
+        #if DEBUG
+        public static void HandleConsoleMessage(object sender, ConsoleMessageEventArgs e){
+            Debug.WriteLine("[Console] {0} ({1}:{2})", e.Message, e.Source, e.Line);
+        }
+        #endif
     }
 }

Core/Utils/CommandLineArgs.cs

@@ -0,0 +1,111 @@
+using System.Collections.Generic;
+using System.Text;
+
+namespace TweetDck.Core.Utils{
+    class CommandLineArgs{
+        public static CommandLineArgs FromStringArray(char entryChar, string[] array){
+            CommandLineArgs args = new CommandLineArgs();
+            ReadStringArray(entryChar, array, args);
+            return args;
+        }
+
+        public static void ReadStringArray(char entryChar, string[] array, CommandLineArgs targetArgs){
+            for(int index = 0; index < array.Length; index++){
+                string entry = array[index];
+
+                if (entry.Length > 0 && entry[0] == entryChar){
+                    if (index < array.Length-1){
+                        string potentialValue = array[index+1];
+
+                        if (potentialValue.Length > 0 && potentialValue[0] == entryChar){
+                            targetArgs.AddFlag(entry);
+                        }
+                        else{
+                            targetArgs.SetValue(entry, potentialValue);
+                            ++index;
+                        }
+                    }
+                    else{
+                        targetArgs.AddFlag(entry);
+                    }
+                }
+            }
+        }
+
+        private readonly HashSet<string> flags = new HashSet<string>();
+        private readonly Dictionary<string, string> values = new Dictionary<string, string>();
+
+        public int Count{
+            get{
+                return flags.Count+values.Count;
+            }
+        }
+
+        public void AddFlag(string flag){
+            flags.Add(flag.ToLowerInvariant());
+        }
+
+        public bool HasFlag(string flag){
+            return flags.Contains(flag.ToLowerInvariant());
+        }
+
+        public void RemoveFlag(string flag){
+            flags.Remove(flag.ToLowerInvariant());
+        }
+
+        public void SetValue(string key, string value){
+            values[key.ToLowerInvariant()] = value;
+        }
+
+        public bool HasValue(string key){
+            return values.ContainsKey(key.ToLowerInvariant());
+        }
+
+        public string GetValue(string key, string defaultValue){
+            string val;
+            return values.TryGetValue(key.ToLowerInvariant(), out val) ? val : defaultValue;
+        }
+
+        public void RemoveValue(string key){
+            values.Remove(key.ToLowerInvariant());
+        }
+
+        public CommandLineArgs Clone(){
+            CommandLineArgs copy = new CommandLineArgs();
+
+            foreach(string flag in flags){
+                copy.AddFlag(flag);
+            }
+
+            foreach(KeyValuePair<string, string> kvp in values){
+                copy.SetValue(kvp.Key, kvp.Value);
+            }
+
+            return copy;
+        }
+
+        public void ToDictionary(IDictionary<string, string> target){
+            foreach(string flag in flags){
+                target[flag] = "1";
+            }
+
+            foreach(KeyValuePair<string, string> kvp in values){
+                target[kvp.Key] = kvp.Value;
+            }
+        }
+
+        public override string ToString(){
+            StringBuilder build = new StringBuilder();
+
+            foreach(string flag in flags){
+                build.Append(flag).Append(' ');
+            }
+
+            foreach(KeyValuePair<string, string> kvp in values){
+                build.Append(kvp.Key).Append(" \"").Append(kvp.Value).Append("\" ");
+            }
+
+            return build.Remove(build.Length-1, 1).ToString();
+        }
+    }
+}

Core/Utils/CommandLineArgsParser.cs

@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-using System.Text.RegularExpressions;
+using System.Text.RegularExpressions;
 
 namespace TweetDck.Core.Utils{
     static class CommandLineArgsParser{
@@ -7,18 +6,18 @@ namespace TweetDck.Core.Utils{
 
         private static Regex SplitRegex{
             get{
-                return splitRegex ?? (splitRegex = new Regex(@"([^=\s]+(?:=(?:""[^""]*?""|[^ ]*))?)", RegexOptions.Compiled));
+                return splitRegex ?? (splitRegex = new Regex(@"([^=\s]+(?:=(?:[^ ]*""[^""]*?""[^ ]*|[^ ]*))?)", RegexOptions.Compiled));
             }
         }
 
-        public static int AddToDictionary(string args, IDictionary<string, string> dictionary){
-            if (string.IsNullOrWhiteSpace(args)){
-                return 0;
+        public static CommandLineArgs ReadCefArguments(string argumentString){
+            CommandLineArgs args = new CommandLineArgs();
+
+            if (string.IsNullOrWhiteSpace(argumentString)){
+                return args;
             }
 
-            int count = 0;
-
-            foreach(Match match in SplitRegex.Matches(args)){
+            foreach(Match match in SplitRegex.Matches(argumentString)){
                 string matchValue = match.Value;
 
                 int indexEquals = matchValue.IndexOf('=');
@@ -34,12 +33,11 @@ namespace TweetDck.Core.Utils{
                 }
 
                 if (key.Length != 0){
-                    dictionary[key] = value;
-                    ++count;
+                    args.SetValue(key, value);
                 }
             }
 
-            return count;
+            return args;
         }
     }
 }

Core/Utils/NativeMethods.cs

@@ -15,6 +15,7 @@ namespace TweetDck.Core.Utils{
         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;

Core/Utils/WindowsUtils.cs

@@ -0,0 +1,33 @@
+using System.Diagnostics;
+using System.IO;
+
+namespace TweetDck.Core.Utils{
+    static class WindowsUtils{
+        public static bool CheckFolderWritePermission(string path){
+            string testFile = Path.Combine(path, ".test");
+
+            try{
+                Directory.CreateDirectory(path);
+
+                using(File.Create(testFile)){}
+                File.Delete(testFile);
+                return true;
+            }catch{
+                return false;
+            }
+        }
+
+        public static Process StartProcess(string file, string arguments, bool runElevated){
+            ProcessStartInfo processInfo = new ProcessStartInfo{
+                FileName = file,
+                Arguments = arguments
+            };
+
+            if (runElevated){
+                processInfo.Verb = "runas";
+            }
+
+            return Process.Start(processInfo);
+        }
+    }
+}

Migration/FormBackgroundWork.Designer.cs

@@ -1,77 +0,0 @@
-using TweetDck.Core.Controls;
-
-namespace TweetDck.Migration {
-    partial class FormBackgroundWork {
-        /// <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.progressBarUseless = new System.Windows.Forms.ProgressBar();
-            this.labelDescription = new System.Windows.Forms.Label();
-            this.SuspendLayout();
-            // 
-            // progressBarUseless
-            // 
-            this.progressBarUseless.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.progressBarUseless.Location = new System.Drawing.Point(15, 52);
-            this.progressBarUseless.MarqueeAnimationSpeed = 10;
-            this.progressBarUseless.Name = "progressBarUseless";
-            this.progressBarUseless.Size = new System.Drawing.Size(477, 23);
-            this.progressBarUseless.Style = System.Windows.Forms.ProgressBarStyle.Marquee;
-            this.progressBarUseless.TabIndex = 0;
-            // 
-            // labelDescription
-            // 
-            this.labelDescription.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.labelDescription.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelDescription.Location = new System.Drawing.Point(12, 12);
-            this.labelDescription.Name = "labelDescription";
-            this.labelDescription.Size = new System.Drawing.Size(480, 37);
-            this.labelDescription.TabIndex = 1;
-            this.labelDescription.Text = "Please, watch this informationless progress bar showcase while some magic happens" +
-    " in the background...";
-            // 
-            // FormBackgroundWork
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(504, 87);
-            this.Controls.Add(this.labelDescription);
-            this.Controls.Add(this.progressBarUseless);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-            this.Name = "FormBackgroundWork";
-            this.ShowIcon = false;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "TweetDeck Migration";
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.ProgressBar progressBarUseless;
-        private System.Windows.Forms.Label labelDescription;
-    }
-}

Migration/FormBackgroundWork.cs

@@ -1,15 +0,0 @@
-using System;
-using System.Windows.Forms;
-
-namespace TweetDck.Migration{
-    partial class FormBackgroundWork : Form{
-        public FormBackgroundWork(){
-            InitializeComponent();
-        }
-
-        public void ShowWorkDialog(Action onBegin){
-            Shown += (sender, args) => onBegin();
-            ShowDialog();
-        }
-    }
-}

Migration/FormMigrationQuestion.Designer.cs

@@ -1,148 +0,0 @@
-using TweetDck.Core.Controls;
-
-namespace TweetDck.Migration {
-    partial class FormMigrationQuestion {
-        /// <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.btnIgnore = new System.Windows.Forms.Button();
-            this.panelButtons = new System.Windows.Forms.FlowLayoutPanel();
-            this.btnAskLater = new System.Windows.Forms.Button();
-            this.btnMigrate = new System.Windows.Forms.Button();
-            this.btnMigrateUninstall = new System.Windows.Forms.Button();
-            this.labelQuestion = new System.Windows.Forms.Label();
-            this.panelButtons.SuspendLayout();
-            this.SuspendLayout();
-            // 
-            // btnIgnore
-            // 
-            this.btnIgnore.AutoSize = true;
-            this.btnIgnore.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnIgnore.Location = new System.Drawing.Point(391, 0);
-            this.btnIgnore.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0);
-            this.btnIgnore.Name = "btnIgnore";
-            this.btnIgnore.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
-            this.btnIgnore.Size = new System.Drawing.Size(53, 23);
-            this.btnIgnore.TabIndex = 1;
-            this.btnIgnore.Text = "Ignore";
-            this.btnIgnore.UseVisualStyleBackColor = true;
-            this.btnIgnore.Click += new System.EventHandler(this.btnIgnore_Click);
-            // 
-            // panelButtons
-            // 
-            this.panelButtons.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.panelButtons.Controls.Add(this.btnAskLater);
-            this.panelButtons.Controls.Add(this.btnIgnore);
-            this.panelButtons.Controls.Add(this.btnMigrate);
-            this.panelButtons.Controls.Add(this.btnMigrateUninstall);
-            this.panelButtons.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft;
-            this.panelButtons.Location = new System.Drawing.Point(12, 67);
-            this.panelButtons.Name = "panelButtons";
-            this.panelButtons.Size = new System.Drawing.Size(518, 23);
-            this.panelButtons.TabIndex = 0;
-            // 
-            // btnAskLater
-            // 
-            this.btnAskLater.AutoSize = true;
-            this.btnAskLater.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnAskLater.Location = new System.Drawing.Point(450, 0);
-            this.btnAskLater.Margin = new System.Windows.Forms.Padding(3, 0, 0, 0);
-            this.btnAskLater.Name = "btnAskLater";
-            this.btnAskLater.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
-            this.btnAskLater.Size = new System.Drawing.Size(68, 23);
-            this.btnAskLater.TabIndex = 0;
-            this.btnAskLater.Text = "Ask Later";
-            this.btnAskLater.UseVisualStyleBackColor = true;
-            this.btnAskLater.Click += new System.EventHandler(this.btnAskLater_Click);
-            // 
-            // btnMigrate
-            // 
-            this.btnMigrate.AutoSize = true;
-            this.btnMigrate.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnMigrate.Location = new System.Drawing.Point(327, 0);
-            this.btnMigrate.Margin = new System.Windows.Forms.Padding(3, 0, 3, 0);
-            this.btnMigrate.Name = "btnMigrate";
-            this.btnMigrate.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
-            this.btnMigrate.Size = new System.Drawing.Size(58, 23);
-            this.btnMigrate.TabIndex = 3;
-            this.btnMigrate.Text = "Migrate";
-            this.btnMigrate.UseVisualStyleBackColor = true;
-            this.btnMigrate.Click += new System.EventHandler(this.btnMigrate_Click);
-            // 
-            // btnMigrateUninstall
-            // 
-            this.btnMigrateUninstall.AutoSize = true;
-            this.btnMigrateUninstall.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
-            this.btnMigrateUninstall.Location = new System.Drawing.Point(223, 0);
-            this.btnMigrateUninstall.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
-            this.btnMigrateUninstall.Name = "btnMigrateUninstall";
-            this.btnMigrateUninstall.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
-            this.btnMigrateUninstall.Size = new System.Drawing.Size(98, 23);
-            this.btnMigrateUninstall.TabIndex = 4;
-            this.btnMigrateUninstall.Text = "Migrate && Purge";
-            this.btnMigrateUninstall.UseVisualStyleBackColor = true;
-            this.btnMigrateUninstall.Click += new System.EventHandler(this.btnMigrateUninstall_Click);
-            // 
-            // labelQuestion
-            // 
-            this.labelQuestion.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.labelQuestion.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(238)));
-            this.labelQuestion.Location = new System.Drawing.Point(49, 9);
-            this.labelQuestion.Margin = new System.Windows.Forms.Padding(40, 3, 3, 3);
-            this.labelQuestion.Name = "labelQuestion";
-            this.labelQuestion.Size = new System.Drawing.Size(481, 52);
-            this.labelQuestion.TabIndex = 2;
-            // 
-            // FormMigrationQuestion
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(542, 102);
-            this.Controls.Add(this.labelQuestion);
-            this.Controls.Add(this.panelButtons);
-            this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-            this.MaximizeBox = false;
-            this.MinimizeBox = false;
-            this.Name = "FormMigrationQuestion";
-            this.ShowIcon = false;
-            this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-            this.Text = "TweetDeck Migration";
-            this.panelButtons.ResumeLayout(false);
-            this.panelButtons.PerformLayout();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private System.Windows.Forms.Button btnIgnore;
-        private System.Windows.Forms.FlowLayoutPanel panelButtons;
-        private System.Windows.Forms.Button btnMigrate;
-        private System.Windows.Forms.Label labelQuestion;
-        private System.Windows.Forms.Button btnAskLater;
-        private System.Windows.Forms.Button btnMigrateUninstall;
-    }
-}

Migration/FormMigrationQuestion.cs

@@ -1,42 +0,0 @@
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-
-namespace TweetDck.Migration{
-    partial class FormMigrationQuestion : Form{
-        public MigrationDecision Decision { get; private set; }
-
-        public FormMigrationQuestion(){
-            InitializeComponent();
-
-            labelQuestion.Text = "Hey there, I found some TweetDeck data! Do you want to »Migrate« it and delete the old data folder, »Ignore« the request forever, or try "+Program.BrandName+" out first?\r\nYou may also »Migrate && Purge« which uninstalls TweetDeck too!";
-        }
-
-        protected override void OnPaint(PaintEventArgs e){
-            e.Graphics.DrawIcon(SystemIcons.Question, 10, 10);
-            base.OnPaint(e);
-        }
-
-        private void btnMigrateUninstall_Click(object sender, EventArgs e){
-            Close(MigrationDecision.MigratePurge);
-        }
-
-        private void btnMigrate_Click(object sender, EventArgs e){
-            Close(MigrationDecision.Migrate);
-        }
-
-        private void btnIgnore_Click(object sender, EventArgs e){
-            Close(MigrationDecision.Ignore);
-        }
-
-        private void btnAskLater_Click(object sender, EventArgs e){
-            Close(MigrationDecision.AskLater);
-        }
-
-        private void Close(MigrationDecision decision){
-            Decision = decision;
-            DialogResult = DialogResult.OK;
-            Close();
-        }
-    }
-}

Migration/Helpers/ProgramRegistrySearch.cs

@@ -1,43 +0,0 @@
-using System;
-using System.Linq;
-using Microsoft.Win32;
-
-namespace TweetDck.Migration.Helpers{
-    static class ProgramRegistrySearch{
-        public static string FindByDisplayName(string displayName){
-            Predicate<RegistryKey> predicate = key => displayName.Equals(key.GetValue("DisplayName") as string, StringComparison.OrdinalIgnoreCase);
-            string guid;
-
-            return FindMatchingSubKey(Registry.LocalMachine, @"SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall", predicate, out guid) ||
-                   FindMatchingSubKey(Registry.LocalMachine, @"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall", predicate, out guid) ||
-                   FindMatchingSubKey(Registry.CurrentUser, @"SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall", predicate, out guid)
-                   ? guid : null;
-        }
-
-        private static bool FindMatchingSubKey(RegistryKey keyHandle, string path, Predicate<RegistryKey> predicate, out string guid){
-            string outputId = null;
-
-            try{
-                RegistryKey parentKey = keyHandle.OpenSubKey(path, false);
-                if (parentKey == null)throw new InvalidOperationException();
-
-                foreach(RegistryKey subKey in parentKey.GetSubKeyNames().Select(subName => parentKey.OpenSubKey(subName, false)).Where(subKey => subKey != null)){
-                    if (predicate(subKey)){
-                        outputId = subKey.Name.Substring(subKey.Name.LastIndexOf('\\')+1);
-                        subKey.Close();
-                        break;
-                    }
-
-                    subKey.Close();
-                }
-
-                parentKey.Close();
-            }catch(Exception){
-                guid = null;
-                return false;
-            }
-
-            return (guid = outputId) != null;
-        }
-    }
-}

Migration/MigrationDecision.cs

@@ -1,23 +0,0 @@
-namespace TweetDck.Migration{
-    enum MigrationDecision{
-        /// <summary>
-        /// Copies the important files and then deletes the TweetDeck folder.
-        /// </summary>
-        Migrate,
-        
-        /// <summary>
-        /// Does exactly what <see cref="Migrate"/> does, but also silently uninstalls TweetDeck.
-        /// </summary>
-        MigratePurge,
-
-        /// <summary>
-        /// Does not copy any files and does not ask the user about data migration again.
-        /// </summary>
-        Ignore,
-        
-        /// <summary>
-        /// Does not copy any files but asks the user again when the program is re-ran.
-        /// </summary>
-        AskLater
-    }
-}

Migration/MigrationManager.cs

@@ -1,188 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.IO;
-using System.Linq;
-using System.Threading;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-using Microsoft.Win32;
-using TweetDck.Migration.Helpers;
-
-namespace TweetDck.Migration{
-    static class MigrationManager{
-        private static readonly string TweetDeckPathParent = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "twitter");
-        private static readonly string TweetDeckPath = Path.Combine(TweetDeckPathParent, "TweetDeck");
-
-        private static readonly string TweetDickStorage = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "TweetDick");
-
-        public static void Run(){
-            #if DUCK
-            if (!Program.IsPortable && Directory.Exists(TweetDickStorage) && !Directory.Exists(Program.StoragePath)){
-                if (MessageBox.Show("Welcome to TweetDuck! Would you like to move your old TweetDick configuration and login data?", "TweetDick Migration", MessageBoxButtons.YesNo, MessageBoxIcon.Question) == DialogResult.Yes){
-                    try{
-                        Directory.Move(TweetDickStorage, Program.StoragePath);
-                        MessageBox.Show("All done! You can now uninstall TweetDick.", "TweetDick Migration", MessageBoxButtons.OK, MessageBoxIcon.Information);
-                    }catch(Exception ex){
-                        Program.HandleException("An unexpected exception has occurred during the migration process.", ex);
-                    }
-                }
-
-                return;
-            }
-            #endif
-
-            if (!Program.UserConfig.IgnoreMigration && Directory.Exists(TweetDeckPath)){
-                MigrationDecision decision;
-
-                using(FormMigrationQuestion formQuestion = new FormMigrationQuestion()){
-                    decision = formQuestion.ShowDialog() == DialogResult.OK ? formQuestion.Decision : MigrationDecision.AskLater;
-                }
-
-                switch(decision){
-                    case MigrationDecision.MigratePurge:
-                    case MigrationDecision.Migrate:
-                        FormBackgroundWork formWait = new FormBackgroundWork();
-
-                        formWait.ShowWorkDialog(() => {
-                            if (!BeginMigration(decision, ex => formWait.Invoke(new Action(() => {
-                                formWait.Close();
-
-                                if (ex != null){
-                                    Program.HandleException("An unexpected exception has occurred during the migration process.", ex);
-                                    return;
-                                }
-
-                                Program.UserConfig.IgnoreMigration = true;
-                                Program.UserConfig.Save();
-                            })))){
-                                formWait.Close();
-                            }
-                        });
-
-                        break;
-
-                    case MigrationDecision.Ignore:
-                        Program.UserConfig.IgnoreMigration = true;
-                        Program.UserConfig.Save();
-                        break;
-                }
-            }
-            else if (!Program.UserConfig.IgnoreUninstallCheck){
-                string guid = ProgramRegistrySearch.FindByDisplayName("TweetDeck");
-
-                if (guid != null && MessageBox.Show("TweetDeck is still installed on your computer, do you want to uninstall it?", "Uninstall TweetDeck", MessageBoxButtons.YesNo, MessageBoxIcon.Question, MessageBoxDefaultButton.Button2) == DialogResult.Yes){
-                    RunUninstaller(guid, 0);
-                    CleanupTweetDeck();
-                }
-
-                Program.UserConfig.IgnoreUninstallCheck = true;
-                Program.UserConfig.Save();
-            }
-        }
-
-        private static bool BeginMigration(MigrationDecision decision, Action<Exception> onFinished){
-            if (decision != MigrationDecision.MigratePurge && decision != MigrationDecision.Migrate){
-                return false;
-            }
-
-            Task task = new Task(() => {
-                Directory.CreateDirectory(Program.StoragePath);
-                Directory.CreateDirectory(Path.Combine(Program.StoragePath, "localStorage"));
-                Directory.CreateDirectory(Path.Combine(Program.StoragePath, "Local Storage"));
-
-                CopyFile("Cookies");
-                CopyFile("Cookies-journal");
-                CopyFile("localStorage"+Path.DirectorySeparatorChar+"qrc__0.localstorage");
-                CopyFile("Local Storage"+Path.DirectorySeparatorChar+"https_tweetdeck.twitter.com_0.localstorage");
-                CopyFile("Local Storage"+Path.DirectorySeparatorChar+"https_tweetdeck.twitter.com_0.localstorage-journal");
-
-                if (decision == MigrationDecision.Migrate || decision == MigrationDecision.MigratePurge){
-                    // kill process if running
-                    Process runningProcess = null;
-
-                    try{
-                        runningProcess = Process.GetProcessesByName("TweetDeck").FirstOrDefault(process => process.MainWindowHandle != IntPtr.Zero);
-                    }catch(Exception){
-                        // process not found
-                    }
-
-                    if (runningProcess != null){
-                        runningProcess.CloseMainWindow();
-
-                        for(int wait = 0; wait < 100 && !runningProcess.HasExited; wait++){ // 10 seconds
-                            runningProcess.Refresh();
-                            Thread.Sleep(100);
-                        }
-                            
-                        runningProcess.Close();
-                    }
-
-                    // delete folders
-                    for(int wait = 0; wait < 50; wait++){
-                        try{
-                            Directory.Delete(TweetDeckPath, true);
-                            break;
-                        }catch(Exception){
-                            // browser subprocess not ended yet, wait
-                            Thread.Sleep(300);
-                        }
-                    }
-
-                    try{
-                        Directory.Delete(TweetDeckPathParent, false);
-                    }catch(IOException){
-                        // most likely not empty, ignore
-                    }
-                }
-
-                if (decision == MigrationDecision.MigratePurge){
-                    // uninstall in the background
-                    string guid = ProgramRegistrySearch.FindByDisplayName("TweetDeck");
-
-                    if (guid != null){
-                        RunUninstaller(guid, 5000);
-                    }
-
-                    // registry cleanup
-                    CleanupTweetDeck();
-
-                    // migration finished like a boss
-                }
-            });
-
-            task.ContinueWith(originalTask => onFinished(originalTask.Exception), TaskContinuationOptions.ExecuteSynchronously);
-            task.Start();
-
-            return true;
-        }
-
-        private static void CopyFile(string relativePath){
-            try{
-                File.Copy(Path.Combine(TweetDeckPath, relativePath), Path.Combine(Program.StoragePath, relativePath), true);
-            }catch(FileNotFoundException){
-            }catch(DirectoryNotFoundException){
-            }
-        }
-
-        private static void RunUninstaller(string guid, int timeout){
-            Process uninstaller = Process.Start("msiexec.exe", "/x "+guid+" /quiet /qn");
-
-            if (uninstaller != null){
-                if (timeout > 0){
-                    uninstaller.WaitForExit(timeout); // it appears that the process is restarted or something that triggers this, but it shouldn't be a problem
-                }
-
-                uninstaller.Close();
-            }
-        }
-
-        private static void CleanupTweetDeck(){
-            try{
-                Registry.CurrentUser.DeleteSubKeyTree(@"Software\Twitter\TweetDeck", true);
-                Registry.CurrentUser.DeleteSubKey(@"Software\Twitter"); // only if empty
-            }catch(Exception){
-                // not found or too bad
-            }
-        }
-    }
-}

Plugins/Controls/PluginControl.cs

@@ -50,7 +50,7 @@ namespace TweetDck.Plugins.Controls{
         }
 
         private void btnOpenConfig_Click(object sender, EventArgs e){
-            using(Process.Start("explorer.exe", "/select,\""+plugin.ConfigPath+"\"")){}
+            using(Process.Start("explorer.exe", "/select,\""+plugin.ConfigPath.Replace('/', '\\')+"\"")){}
         }
 
         private void btnToggleState_Click(object sender, EventArgs e){

Plugins/Enums/PluginEnvironment.cs

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

Plugins/Enums/PluginFolder.cs

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

Plugins/Enums/PluginGroup.cs

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

Plugins/Plugin.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Text;
+using TweetDck.Plugins.Enums;
 
 namespace TweetDck.Plugins{
     class Plugin{
@@ -24,37 +25,32 @@ namespace TweetDck.Plugins{
             }
         }
 
-        public string FolderPath{
-            get{
-                return path;
-            }
-        }
-
         public bool HasConfig{
             get{
-                return ConfigFile.Length > 0 && GetFullPathIfSafe(ConfigFile).Length > 0;
+                return ConfigFile.Length > 0 && GetFullPathIfSafe(PluginFolder.Data, ConfigFile).Length > 0;
             }
         }
 
         public string ConfigPath{
             get{
-                return HasConfig ? Path.Combine(path, ConfigFile) : string.Empty;
+                return HasConfig ? Path.Combine(GetPluginFolder(PluginFolder.Data), ConfigFile) : string.Empty;
             }
         }
 
         public bool HasDefaultConfig{
             get{
-                return ConfigDefault.Length > 0 && GetFullPathIfSafe(ConfigDefault).Length > 0;
+                return ConfigDefault.Length > 0 && GetFullPathIfSafe(PluginFolder.Root, ConfigDefault).Length > 0;
             }
         }
 
         public string DefaultConfigPath{
             get{
-                return HasDefaultConfig ? Path.Combine(path, ConfigDefault) : string.Empty;
+                return HasDefaultConfig ? Path.Combine(GetPluginFolder(PluginFolder.Root), ConfigDefault) : string.Empty;
             }
         }
 
-        private readonly string path;
+        private readonly string pathRoot;
+        private readonly string pathData;
         private readonly string identifier;
         private readonly Dictionary<string, string> metadata = new Dictionary<string, string>(4){
             { "NAME", "" },
@@ -70,8 +66,13 @@ namespace TweetDck.Plugins{
         private bool? canRun;
 
         private Plugin(string path, PluginGroup group){
-            this.path = path;
-            this.identifier = group.GetIdentifierPrefix()+Path.GetFileName(path);
+            string name = Path.GetFileName(path);
+            System.Diagnostics.Debug.Assert(name != null);
+
+            this.pathRoot = path;
+            this.pathData = Path.Combine(Program.PluginDataPath, group.GetIdentifierPrefix(), name);
+
+            this.identifier = group.GetIdentifierPrefix()+name;
             this.Group = group;
             this.Environments = PluginEnvironment.None;
         }
@@ -80,10 +81,29 @@ namespace TweetDck.Plugins{
             string configPath = ConfigPath, defaultConfigPath = DefaultConfigPath;
 
             if (configPath.Length > 0 && defaultConfigPath.Length > 0 && !File.Exists(configPath) && File.Exists(defaultConfigPath)){
+                string dataFolder = GetPluginFolder(PluginFolder.Data);
+
+                if (!Directory.Exists(dataFolder)){ // config migration
+                    string originalFile = Path.Combine(GetPluginFolder(PluginFolder.Root), ConfigFile);
+
+                    if (File.Exists(originalFile)){
                         try{
+                            Directory.CreateDirectory(dataFolder);
+                            File.Copy(originalFile, configPath, false);
+                            File.Delete(originalFile); // will fail without write perms in program folder, ignore if so
+                        }catch{
+                            // ignore
+                        }
+
+                        return;
+                    }
+                }
+
+                try{
+                    Directory.CreateDirectory(dataFolder);
                     File.Copy(defaultConfigPath, configPath, false);
                 }catch(Exception e){
-                    Program.HandleException("Could not generate a configuration file for '"+identifier+"' plugin.", e);
+                    Program.Reporter.HandleException("Plugin Loading Error", "Could not generate a configuration file for '"+identifier+"' plugin.", true, e);
                 }
             }
         }
@@ -91,18 +111,27 @@ namespace TweetDck.Plugins{
         public string GetScriptPath(PluginEnvironment environment){
             if (Environments.HasFlag(environment)){
                 string file = environment.GetScriptFile();
-                return file != null ? Path.Combine(path, file) : string.Empty;
+                return file != null ? Path.Combine(pathRoot, file) : string.Empty;
             }
             else{
                 return string.Empty;
             }
         }
 
-        public string GetFullPathIfSafe(string relativePath){
-            string fullPath = Path.Combine(path, relativePath);
+        public string GetPluginFolder(PluginFolder folder){
+            switch(folder){
+                case PluginFolder.Root: return pathRoot;
+                case PluginFolder.Data: return pathData;
+                default: return string.Empty;
+            }
+        }
+
+        public string GetFullPathIfSafe(PluginFolder folder, string relativePath){
+            string rootFolder = GetPluginFolder(folder);
+            string fullPath = Path.Combine(rootFolder, relativePath);
 
             try{
-                string folderPathName = new DirectoryInfo(path).FullName;
+                string folderPathName = new DirectoryInfo(rootFolder).FullName;
                 DirectoryInfo currentInfo = new DirectoryInfo(fullPath);
 
                 while(currentInfo.Parent != null){
@@ -130,7 +159,7 @@ namespace TweetDck.Plugins{
 
         public override bool Equals(object obj){
             Plugin plugin = obj as Plugin;
-            return plugin != null && plugin.path.Equals(path);
+            return plugin != null && plugin.identifier.Equals(identifier);
         }
 
         public static Plugin CreateFromFolder(string path, PluginGroup group, out string error){

Plugins/PluginBridge.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
+using TweetDck.Plugins.Enums;
 using TweetDck.Plugins.Events;
 
 namespace TweetDck.Plugins{
@@ -18,35 +19,26 @@ namespace TweetDck.Plugins{
             fileCache.Clear();
         }
 
-        private string GetFullPathIfSafe(int token, string path){
+        private string GetFullPathOrThrow(int token, PluginFolder folder, string path){
             Plugin plugin = manager.GetPluginFromToken(token);
-            return plugin == null ? string.Empty : plugin.GetFullPathIfSafe(path);
-        }
-
-        public void WriteFile(int token, string path, string contents){
-            string fullPath = GetFullPathIfSafe(token, path);
-
-            if (fullPath == string.Empty){
-                throw new Exception("File path has to be relative to the plugin folder.");
-            }
-
-            // ReSharper disable once AssignNullToNotNullAttribute
-            Directory.CreateDirectory(Path.GetDirectoryName(fullPath));
-
-            File.WriteAllText(fullPath, contents, Encoding.UTF8);
-            fileCache[fullPath] = contents;
-        }
-
-        public string ReadFile(int token, string path, bool cache){
-            string fullPath = GetFullPathIfSafe(token, path);
-
-            if (fullPath == string.Empty){
-                throw new Exception("File path has to be relative to the plugin folder.");
+            string fullPath = plugin == null ? string.Empty : plugin.GetFullPathIfSafe(folder, path);
+
+            if (fullPath.Length == 0){
+                switch(folder){
+                    case PluginFolder.Data: throw new Exception("File path has to be relative to the plugin data folder.");
+                    case PluginFolder.Root: throw new Exception("File path has to be relative to the plugin root folder.");
+                    default: throw new Exception("Invalid folder type "+folder+", this is a "+Program.BrandName+" error.");
+                }
+            }
+            else{
+                return fullPath;
+            }
         }
 
+        private string ReadFileUnsafe(string fullPath, bool readCached){
             string cachedContents;
             
-            if (cache && fileCache.TryGetValue(fullPath, out cachedContents)){
+            if (readCached && fileCache.TryGetValue(fullPath, out cachedContents)){
                 return cachedContents;
             }
 
@@ -59,25 +51,39 @@ namespace TweetDck.Plugins{
             }
         }
 
-        public void DeleteFile(int token, string path){
-            string fullPath = GetFullPathIfSafe(token, path);
+        // Public methods
 
-            if (fullPath.Length == 0){
-                throw new Exception("File path has to be relative to the plugin folder.");
+        public void WriteFile(int token, string path, string contents){
+            string fullPath = GetFullPathOrThrow(token, PluginFolder.Data, path);
+
+            // ReSharper disable once AssignNullToNotNullAttribute
+            Directory.CreateDirectory(Path.GetDirectoryName(fullPath));
+
+            File.WriteAllText(fullPath, contents, Encoding.UTF8);
+            fileCache[fullPath] = contents;
         }
 
+        public string ReadFile(int token, string path, bool cache){
+            return ReadFileUnsafe(GetFullPathOrThrow(token, PluginFolder.Data, path), cache);
+        }
+
+        public void DeleteFile(int token, string path){
+            string fullPath = GetFullPathOrThrow(token, PluginFolder.Data, path);
+
             fileCache.Remove(fullPath);
             File.Delete(fullPath);
         }
 
         public bool CheckFileExists(int token, string path){
-            string fullPath = GetFullPathIfSafe(token, path);
-
-            if (fullPath.Length == 0){
-                throw new Exception("File path has to be relative to the plugin folder.");
+            return File.Exists(GetFullPathOrThrow(token, PluginFolder.Data, path));
         }
 
-            return File.Exists(fullPath);
+        public string ReadFileRoot(int token, string path){
+            return ReadFileUnsafe(GetFullPathOrThrow(token, PluginFolder.Root, path), true);
+        }
+
+        public bool CheckFileExistsRoot(int token, string path){
+            return File.Exists(GetFullPathOrThrow(token, PluginFolder.Root, path));
         }
     }
 }

Plugins/PluginConfig.cs

@@ -6,7 +6,7 @@ namespace TweetDck.Plugins{
     [Serializable]
     sealed class PluginConfig{
         [field:NonSerialized]
-        public event EventHandler<PluginChangedStateEventArgs> PluginChangedState;
+        public event EventHandler<PluginChangedStateEventArgs> InternalPluginChangedState; // should only be accessed from PluginManager
 
         public IEnumerable<string> DisabledPlugins{
             get{
@@ -24,8 +24,8 @@ namespace TweetDck.Plugins{
 
         public void SetEnabled(Plugin plugin, bool enabled){
             if ((enabled && Disabled.Remove(plugin.Identifier)) || (!enabled && Disabled.Add(plugin.Identifier))){
-                if (PluginChangedState != null){
-                    PluginChangedState(this, new PluginChangedStateEventArgs(plugin, enabled));
+                if (InternalPluginChangedState != null){
+                    InternalPluginChangedState(this, new PluginChangedStateEventArgs(plugin, enabled));
                 }
             }
         }

Plugins/PluginManager.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using CefSharp;
+using TweetDck.Plugins.Enums;
 using TweetDck.Plugins.Events;
 using TweetDck.Resources;
 
@@ -20,6 +21,7 @@ namespace TweetDck.Plugins{
         public PluginBridge Bridge { get; private set; }
         
         public event EventHandler<PluginLoadEventArgs> Reloaded;
+        public event EventHandler<PluginChangedStateEventArgs> PluginChangedState;
 
         private readonly string rootPath;
         private readonly HashSet<Plugin> plugins = new HashSet<Plugin>();
@@ -30,10 +32,25 @@ namespace TweetDck.Plugins{
 
         public PluginManager(string path, PluginConfig config){
             this.rootPath = path;
-            this.Config = config;
+            this.SetConfig(config);
             this.Bridge = new PluginBridge(this);
         }
 
+        public void SetConfig(PluginConfig config){
+            this.Config = config;
+            this.Config.InternalPluginChangedState += Config_InternalPluginChangedState;
+        }
+
+        private void Config_InternalPluginChangedState(object sender, PluginChangedStateEventArgs e){
+            if (PluginChangedState != null){
+                PluginChangedState(this, e);
+            }
+        }
+
+        public bool IsPluginInstalled(string identifier){
+            return plugins.Any(plugin => plugin.Identifier.Equals(identifier));
+        }
+
         public IEnumerable<Plugin> GetPluginsByGroup(PluginGroup group){
             return plugins.Where(plugin => plugin.Group == group);
         }
@@ -103,6 +120,10 @@ namespace TweetDck.Plugins{
         }
 
         private IEnumerable<Plugin> LoadPluginsFrom(string path, PluginGroup group){
+            if (!Directory.Exists(path)){
+                yield break;
+            }
+
             foreach(string fullDir in Directory.EnumerateDirectories(path, "*", SearchOption.TopDirectoryOnly)){
                 string error;
                 Plugin plugin = Plugin.CreateFromFolder(fullDir, group, out error);

Plugins/PluginScriptGenerator.cs

@@ -1,4 +1,5 @@
 using System.Text;
+using TweetDck.Plugins.Enums;
 
 namespace TweetDck.Plugins{
     static class PluginScriptGenerator{

Program.cs

@@ -1,44 +1,41 @@
 using System;
 using System.Diagnostics;
-using System.Globalization;
 using System.IO;
-using System.Text;
 using System.Windows.Forms;
 using CefSharp;
 using TweetDck.Configuration;
 using TweetDck.Core;
-using TweetDck.Migration;
 using TweetDck.Core.Utils;
 using System.Linq;
 using System.Threading;
 using TweetDck.Plugins;
 using TweetDck.Plugins.Events;
 using TweetDck.Core.Other.Settings.Export;
+using TweetDck.Core.Handling;
+using TweetDck.Core.Other;
+using TweetDck.Updates;
 
 [assembly: CLSCompliant(true)]
 namespace TweetDck{
     static class Program{
-        #if DUCK
         public const string BrandName = "TweetDuck";
-        public const string Website = "http://tweetduck.chylex.com";
-        #else
-        public const string BrandName = "TweetDick";
-        public const string Website = "http://tweetdick.chylex.com";
-        #endif
+        public const string Website = "https://tweetduck.chylex.com";
 
-        public const string BrowserSubprocess = BrandName+".Browser.exe";
-
-        public const string VersionTag = "1.3.2";
-        public const string VersionFull = "1.3.2.0";
+        public const string VersionTag = "1.5.1";
+        public const string VersionFull = "1.5.1.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();
         public static readonly string TemporaryPath = IsPortable ? Path.Combine(ProgramPath, "portable", "tmp") : Path.Combine(Path.GetTempPath(), BrandName+'_'+Path.GetRandomFileName().Substring(0, 6));
+
+        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");
         
         public static readonly string ScriptPath = Path.Combine(ProgramPath, "scripts");
         public static readonly string PluginPath = Path.Combine(ProgramPath, "plugins");
@@ -49,12 +46,7 @@ namespace TweetDck{
         private static bool HasCleanedUp;
         
         public static UserConfig UserConfig { get; private set; }
-
-        public static string LogFile{
-            get{
-                return Path.Combine(ProgramPath, "td-log.txt");
-            }
-        }
+        public static Reporter Reporter { get; private set; }
 
         [STAThread]
         private static void Main(){
@@ -63,35 +55,55 @@ namespace TweetDck{
 
             WindowRestoreMessage = NativeMethods.RegisterWindowMessage("TweetDuckRestore");
 
-            if (!File.Exists(LogFile) && !Log(string.Empty)){
-                MessageBox.Show("Could not write to the log file. If you installed "+BrandName+" to Program Files, please run it as Administrator.", "Administrator Required", MessageBoxButtons.OK, MessageBoxIcon.Warning);
+            if (!WindowsUtils.CheckFolderWritePermission(StoragePath)){
+                MessageBox.Show(BrandName+" does not have write permissions to the storage folder: "+StoragePath, "Permission Error", MessageBoxButtons.OK, MessageBoxIcon.Warning);
                 return;
             }
 
-            string[] programArguments = Environment.GetCommandLineArgs();
+            Reporter = new Reporter(LogFilePath);
+            Reporter.SetupUnhandledExceptionHandler(BrandName+" Has Failed :(");
 
-            if (programArguments.Contains("-restart")){
-                for(int attempt = 0; attempt < 41; attempt++){
-                    if (LockManager.Lock()){
+            if (Args.HasFlag("-restart")){
+                for(int attempt = 0; attempt < 21; attempt++){
+                    LockManager.Result lockResult = LockManager.Lock();
+
+                    if (lockResult == LockManager.Result.Success){
                         break;
                     }
-                    else if (attempt == 40){
-                        MessageBox.Show(BrandName+" is taking too long to close, please wait and then start the application again manually.", BrandName+" Cannot Restart", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    else if (lockResult == LockManager.Result.Fail){
+                        MessageBox.Show("An unknown error occurred accessing the data folder. Please, make sure "+BrandName+" is not already running. If the problem persists, try restarting your system.", BrandName+" Has Failed :(", MessageBoxButtons.OK, MessageBoxIcon.Error);
                         return;
                     }
+                    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");
+
+                            if (form.ShowDialog() == DialogResult.OK){
+                                if (form.ClickedButton == btnRetry){
+                                    attempt /= 2;
+                                    continue;
+                                }
+                            }
+
+                            return;
+                        }
+                    }
                     else{
                         Thread.Sleep(500);
                     }
                 }
             }
             else{
-                if (!LockManager.Lock()){
+                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;
                     }
                     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(20000)){
+                        if (!LockManager.CloseLockingProcess(30000)){
                             MessageBox.Show("Could not close the other process.", BrandName+" Has Failed :(", MessageBoxButtons.OK, MessageBoxIcon.Error);
                             return;
                         }
@@ -100,68 +112,61 @@ namespace TweetDck{
                     }
                     else return;
                 }
-            }
-
-            if (programArguments.Contains("-importcookies") && File.Exists(ExportManager.TempCookiesPath)){
-                try{
-                    if (File.Exists(ExportManager.CookiesPath)){
-                        File.Delete(ExportManager.CookiesPath);
-                    }
-
-                    File.Move(ExportManager.TempCookiesPath, ExportManager.CookiesPath);
-                }catch(Exception e){
-                    HandleException("Could not import the cookie file to restore login session.", e);
+                else if (lockResult != LockManager.Result.Success){
+                    MessageBox.Show("An unknown error occurred accessing the data folder. Please, make sure "+BrandName+" is not already running. If the problem persists, try restarting your system.", BrandName+" Has Failed :(", MessageBoxButtons.OK, MessageBoxIcon.Error);
+                    return;
                 }
             }
 
             ReloadConfig();
 
-            MigrationManager.Run();
-
-            Cef.OnContextInitialized = () => {
-                using(IRequestContext ctx = Cef.GetGlobalRequestContext()){
-                    string err;
-                    ctx.SetPreference("browser.enable_spellchecking", false, out err);
+            if (Args.HasFlag("-importcookies")){
+                ExportManager.ImportCookies();
             }
-            };
+
+            BrowserCache.ClearOldCacheFiles();
 
             CefSettings settings = new CefSettings{
                 AcceptLanguageList = BrowserUtils.HeaderAcceptLanguage,
                 UserAgent = BrowserUtils.HeaderUserAgent,
-                Locale = CultureInfo.CurrentCulture.TwoLetterISOLanguageName,
+                Locale = Args.GetValue("-locale", "en"),
                 CachePath = StoragePath,
-                BrowserSubprocessPath = File.Exists(BrowserSubprocess) ? BrowserSubprocess : "CefSharp.BrowserSubprocess.exe",
+                LogFile = Path.Combine(StoragePath, "TD_Console.txt"),
                 #if !DEBUG
-                LogSeverity = programArguments.Contains("-log") ? LogSeverity.Info : LogSeverity.Disable
+                BrowserSubprocessPath = BrandName+".Browser.exe",
+                LogSeverity = Args.HasFlag("-log") ? LogSeverity.Info : LogSeverity.Disable
                 #endif
             };
 
-            CommandLineArgsParser.AddToDictionary(UserConfig.CustomCefArgs, settings.CefCommandLineArgs);
+            CommandLineArgsParser.ReadCefArguments(UserConfig.CustomCefArgs).ToDictionary(settings.CefCommandLineArgs);
 
-            Cef.Initialize(settings);
-
-            AppDomain.CurrentDomain.UnhandledException += (sender, args) => {
-                Exception ex = args.ExceptionObject as Exception;
-
-                if (ex != null){
-                    HandleException("An unhandled exception has occurred.", ex);
+            if (!HardwareAcceleration.IsEnabled){
+                settings.CefCommandLineArgs["disable-gpu"] = "1";
+                settings.CefCommandLineArgs["disable-gpu-vsync"] = "1";
             }
-            };
+
+            Cef.Initialize(settings, false, new BrowserProcessHandler());
 
             Application.ApplicationExit += (sender, args) => ExitCleanup();
 
             PluginManager plugins = new PluginManager(PluginPath, UserConfig.Plugins);
             plugins.Reloaded += plugins_Reloaded;
-            plugins.Config.PluginChangedState += (sender, args) => UserConfig.Save();
+            plugins.PluginChangedState += (sender, args) => UserConfig.Save();
             plugins.Reload();
 
-            FormBrowser mainForm = new FormBrowser(plugins);
+            FormBrowser mainForm = new FormBrowser(plugins, new UpdaterSettings{
+                AllowPreReleases = Args.HasFlag("-debugupdates")
+            });
+
             Application.Run(mainForm);
 
             if (mainForm.UpdateInstallerPath != null){
                 ExitCleanup();
 
-                Process.Start(mainForm.UpdateInstallerPath, "/SP- /SILENT /NOICONS /CLOSEAPPLICATIONS");
+                string updaterArgs = "/SP- /SILENT /CLOSEAPPLICATIONS /UPDATEPATH=\""+ProgramPath+"\" /RUNARGS=\""+GetArgsClean().ToString().Replace("\"", "^\"")+"\""+(IsPortable ? " /PORTABLE=1" : "");
+                bool runElevated = !IsPortable || !WindowsUtils.CheckFolderWritePermission(ProgramPath);
+
+                WindowsUtils.StartProcess(mainForm.UpdateInstallerPath, updaterArgs, runElevated); // ProgramPath has a trailing backslash
                 Application.Exit();
             }
         }
@@ -170,57 +175,28 @@ namespace TweetDck{
             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 string GetCmdArgumentValue(string search){
-            string[] args = Environment.GetCommandLineArgs();
-            int index = Array.FindIndex(args, arg => arg.Equals(search, StringComparison.OrdinalIgnoreCase));
-
-            return index >= 0 && index < args.Length-1 ? args[index+1] : null;
+            ((PluginManager)sender).SetConfig(UserConfig.Plugins);
         }
 
         private static string GetDataStoragePath(){
-            string custom = GetCmdArgumentValue("-datafolder");
+            string custom = Args.GetValue("-datafolder", null);
 
             if (custom != null && (custom.Contains(Path.DirectorySeparatorChar) || custom.Contains(Path.AltDirectorySeparatorChar))){
-                return custom;
+                if (Path.GetInvalidPathChars().Any(custom.Contains)){
+                    Reporter.HandleEarlyFailure("Data Folder Invalid", "The data folder contains invalid characters:\n"+custom);
+                }
+                else if (!Path.IsPathRooted(custom)){
+                    Reporter.HandleEarlyFailure("Data Folder Invalid", "The data folder has to be either a simple folder name, or a full path:\n"+custom);
+                }
+
+                return Environment.ExpandEnvironmentVariables(custom);
             }
             else{
                 return Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), custom ?? BrandName);
             }
         }
 
-        public static void HandleException(string message, Exception e){
-            if (Log(e.ToString())){
-                if (MessageBox.Show(message+"\r\nDo you want to open the log file to report the issue?", BrandName+" Has Failed :(", MessageBoxButtons.YesNo, MessageBoxIcon.Error, MessageBoxDefaultButton.Button2) == DialogResult.Yes){
-                    Process.Start(LogFile);
-                }
-            }
-            else{
-                MessageBox.Show(message+"\r\nFailed writing the error into the log file.\r\nOriginal exception: "+e, BrandName+" Has Failed :(", MessageBoxButtons.OK);
-            }
-        }
-
-        public static bool Log(string data){
-            StringBuilder build = new StringBuilder();
-
-            if (!File.Exists(LogFile)){
-                build.Append("Please, report all issues to: https://github.com/chylex/TweetDuck/issues\r\n\r\n");
-            }
-
-            if (data.Length > 0){
-                build.Append("[").Append(DateTime.Now.ToString("G", CultureInfo.CurrentCulture)).Append("]\r\n");
-                build.Append(data).Append("\r\n\r\n");
-            }
-
-            try{
-                File.AppendAllText(LogFile, build.ToString(), Encoding.UTF8);
-                return true;
-            }catch{
-                return false;
-            }
-        }
-
         public static void ReloadConfig(){
             UserConfig = UserConfig.Load(ConfigFilePath);
         }
@@ -230,13 +206,42 @@ namespace TweetDck{
                 File.Delete(ConfigFilePath);
                 File.Delete(UserConfig.GetBackupFile(ConfigFilePath));
             }catch(Exception e){
-                HandleException("Could not delete configuration files to reset the settings.", e);
+                Reporter.HandleException("Configuration Reset Error", "Could not delete configuration files to reset the settings.", true, e);
                 return;
             }
 
             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 = GetArgsClean();
+            args.AddFlag("-restart");
+            
+            CommandLineArgs.ReadStringArray('-', extraArgs, args);
+
+            browserForm.ForceClose();
+            ExitCleanup();
+
+            Process.Start(Application.ExecutablePath, args.ToString());
+            Application.Exit();
+        }
+
         private static void ExitCleanup(){
             if (HasCleanedUp)return;
 

README.md

@@ -1,13 +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 49 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. For **CefSharp**, you will need version 53 or newer currently available as a pre-release.
 ```
-PM> Install-Package CefSharp.WinForms -Pre -Version 49.0.0-pre02
+PM> Install-Package CefSharp.WinForms -Pre -Version 53.0.0-pre01
 PM> Install-Package Microsoft.VC120.CRT.JetBrains
 ```
 
-TweetD\*ck comes in two variants - TweetDick and TweetDuck. The solution includes both configurations under the names **Release Dick** and **Release Duck**, so make sure to select the correct one, or build both using Batch Build.
-
 After building, run **_postbuild.bat** which deletes unnecessary files that CefSharp adds after post-build events >_>
 
 Built files are then available in **bin/x86** and/or **bin/x64**.

Reporter.cs

@@ -0,0 +1,103 @@
+using System;
+using System.Diagnostics;
+using System.Drawing;
+using System.Globalization;
+using System.IO;
+using System.Text;
+using System.Windows.Forms;
+using TweetDck.Core.Other;
+
+namespace TweetDck{
+    class Reporter{
+        private readonly string logFile;
+
+        public Reporter(string logFile){
+            this.logFile = logFile;
+        }
+
+        public void SetupUnhandledExceptionHandler(string caption){
+            AppDomain.CurrentDomain.UnhandledException += (sender, args) => {
+                Exception ex = args.ExceptionObject as Exception;
+
+                if (ex != null){
+                    HandleException(caption, "An unhandled exception has occurred.", false, ex);
+                }
+            };
+        }
+
+        public bool Log(string data){
+            StringBuilder build = new StringBuilder();
+
+            if (!File.Exists(logFile)){
+                build.Append("Please, report all issues to: https://github.com/chylex/TweetDuck/issues\r\n\r\n");
+            }
+
+            build.Append("[").Append(DateTime.Now.ToString("G", CultureInfo.CurrentCulture)).Append("]\r\n");
+            build.Append(data).Append("\r\n\r\n");
+
+            try{
+                File.AppendAllText(logFile, build.ToString(), Encoding.UTF8);
+                return true;
+            }catch{
+                return false;
+            }
+        }
+
+        public void HandleException(string caption, string message, bool canIgnore, Exception e){
+            bool loggedSuccessfully = Log(e.ToString());
+
+            FormMessage form = new FormMessage(caption, message+"\r\nError: "+e.Message, canIgnore ? MessageBoxIcon.Warning : MessageBoxIcon.Error);
+            
+            form.AddButton("Exit");
+            Button btnIgnore = form.AddButton("Ignore");
+
+            Button btnOpenLog = new Button{
+                Anchor = AnchorStyles.Bottom | AnchorStyles.Left,
+                Enabled = loggedSuccessfully,
+                Font = SystemFonts.MessageBoxFont,
+                Location = new Point(12, 12),
+                Margin = new Padding(0, 0, 48, 0),
+                Size = new Size(88, 26),
+                Text = "Show Error Log",
+                UseVisualStyleBackColor = true
+            };
+
+            btnOpenLog.Click += (sender, args) => {
+                using(Process.Start(logFile)){}
+            };
+
+            form.AddActionControl(btnOpenLog);
+
+            if (!canIgnore){
+                btnIgnore.Enabled = false;
+            }
+
+            if (form.ShowDialog() == DialogResult.OK){
+                if (form.ClickedButton == btnIgnore){
+                    return;
+                }
+            }
+
+            try{
+                Process.GetCurrentProcess().Kill();
+            }catch{
+                Environment.FailFast(message, e);
+            }
+        }
+
+        public static void HandleEarlyFailure(string caption, string message){
+            Application.EnableVisualStyles();
+            Application.SetCompatibleTextRenderingDefault(false);
+
+            FormMessage form = new FormMessage(caption, message, MessageBoxIcon.Error);
+            form.AddButton("Exit");
+            form.ShowDialog();
+
+            try{
+                Process.GetCurrentProcess().Kill();
+            }catch{
+                Environment.FailFast(message, new Exception(message));
+            }
+        }
+    }
+}

Resources/Plugins/clear-columns/.meta

@@ -3,12 +3,16 @@ Clear columns
 
 [description]
 - Adds buttons and keyboard shortcuts to quickly clear columns
+- Hold Shift when clicking or using a keyboard shortcut to reset the column instead
 
 [author]
 chylex
 
 [version]
-1.0
+1.1
 
 [website]
 https://tweetduck.chylex.com
+
+[requires]
+1.4.1

Resources/Plugins/clear-columns/browser.js

@@ -11,38 +11,75 @@ enabled(){
     TD.controller.stats.columnActionClick("clear");
   };
   
-  var clearAllColumns = () => {
-    Object.keys(TD.controller.columnManager.getAll()).forEach(key => clearColumn(key));
+  var resetColumn = (columnName) => {
+    var col = TD.controller.columnManager.get(columnName);
+    col.model.setClearedTimestamp(0);
+    col.reloadTweets();
+  };
+  
+  var forEachColumn = (func) => {
+    Object.keys(TD.controller.columnManager.getAll()).forEach(func);
   };
   
   var replaceMustache = (key, search, replace) => {
     TD.mustaches[key] = TD.mustaches[key].replace(search, replace);
   };
   
+  var wasShiftPressed = false;
+  
+  var updateShiftState = (pressed) => {
+    if (pressed != wasShiftPressed){
+      wasShiftPressed = pressed;
+      
+      if (pressed){
+        $(document).on("mousemove", this.eventKeyUp);
+      }
+      else{
+        $(document).off("mousemove", this.eventKeyUp);
+      }
+      
+      $("#clear-columns-btn-all").text(pressed ? "Reset all" : "Clear all");
+    }
+  };
+  
   // prepare event handlers
-  this.eventClearSingle = function(){
-    clearColumn($(this).closest(".js-column").attr("data-column"));
+  this.eventClickSingle = function(e){
+    var name = $(this).closest(".js-column").attr("data-column");
+    e.shiftKey ? resetColumn(name) : clearColumn(name);
   };
   
-  this.eventClearAll = function(){
-    clearAllColumns();
+  this.eventClickAll = function(e){
+    forEachColumn(e.shiftKey ? resetColumn : clearColumn);
   };
   
-  this.eventKeys = function(e){
-    if (e.keyCode === 46 && (document.activeElement === null || document.activeElement === document.body)){ // 46 = delete
+  this.eventKeyDown = function(e){
+    if (!(document.activeElement === null || document.activeElement === document.body)){
+      return;
+    }
+    
+    updateShiftState(e.shiftKey);
+    
+    if (e.keyCode === 46){ // 46 = delete
       if (e.altKey){
-        clearAllColumns();
+        forEachColumn(e.shiftKey ? resetColumn : clearColumn);
       }
       else{
         var focusedColumn = $(".js-column.is-focused");
         
         if (focusedColumn.length){
-          clearColumn(focusedColumn.attr("data-column"));
+          var name = focusedColumn.attr("data-column");
+          e.shiftKey ? resetColumn(name) : clearColumn(name);
         }
       }
     }
   };
   
+  this.eventKeyUp = function(e){
+    if (!e.shiftKey){
+      updateShiftState(false);
+    }
+  };
+  
   // add column buttons and keyboard shortcut info to UI
   replaceMustache("column/column_header.mustache", "</header>", [
     '{{^isTemporary}}',
@@ -62,27 +99,26 @@ enabled(){
   ].join(""));
   
   // load custom style
-  var style = document.createElement("style");
-  document.head.appendChild(style);
-
-  var sheet = style.sheet;
-  sheet.insertRule(".column-title { margin-right: 60px !important; }", 0);
-  sheet.insertRule(".column-type-message .column-title { margin-right: 115px !important; }", 0);
-  sheet.insertRule(".mark-all-read-link { right: 59px !important; }", 0);
-  sheet.insertRule(".open-compose-dm-link { right: 90px !important; }", 0);
+  var css = window.TDPF_createCustomStyle(this);
+  css.insert(".column-title { margin-right: 60px !important; }");
+  css.insert(".column-type-message .column-title { margin-right: 115px !important; }");
+  css.insert(".mark-all-read-link { right: 59px !important; }");
+  css.insert(".open-compose-dm-link { right: 90px !important; }");
+  css.insert("button[data-action='clear'].btn-options-tray { display: none !important; }");
 }
 
 ready(){
   // setup events
-  $(document).on("click", "[data-action='td-clearcolumns-dosingle']", this.eventClearSingle);
-  $(document).on("click", "[data-action='td-clearcolumns-doall']", this.eventClearAll);
-  $(document).on("keydown", this.eventKeys);
+  $(document).on("click", "[data-action='td-clearcolumns-dosingle']", this.eventClickSingle);
+  $(document).on("click", "[data-action='td-clearcolumns-doall']", this.eventClickAll);
+  $(document).on("keydown", this.eventKeyDown);
+  $(document).on("keyup", this.eventKeyUp);
   
   // add clear all button
   $("nav.app-navigator").first().append([
     '<a class="link-clean cf app-nav-link padding-hl" data-title="Clear all" data-action="td-clearcolumns-doall">',
     '<div class="obj-left"><i class="icon icon-large icon-clear-timeline"></i></div>',
-    '<div class="nbfc padding-ts hide-condensed">Clear all</div>',
+    '<div id="clear-columns-btn-all" class="nbfc padding-ts hide-condensed">Clear all</div>',
     '</a></nav>'
   ].join(""));
 }

Resources/Plugins/design-revert/.meta

@@ -9,7 +9,10 @@ Revert TweetDeck design changes
 chylex
 
 [version]
-1.0
+1.1
 
 [website]
 https://tweetduck.chylex.com
+
+[requires]
+1.4.1

Resources/Plugins/design-revert/browser.js

@@ -1,15 +1,11 @@
 enabled(){
   // add a stylesheet to change tweet actions
-  var style = document.createElement("style");
-  style.id = "design-revert";
-  document.head.appendChild(style);
-
-  var sheet = style.sheet;
-  sheet.insertRule(".tweet-actions { float: right !important; width: auto !important; }", 0);
-  sheet.insertRule(".tweet-action { opacity: 0; }", 0);
-  sheet.insertRule(".is-favorite .tweet-action, .is-retweet .tweet-action { opacity: 0.5; visibility: visible !important; }", 0);
-  sheet.insertRule(".tweet:hover .tweet-action, .is-favorite .tweet-action[rel='favorite'], .is-retweet .tweet-action[rel='retweet'] { opacity: 1; visibility: visible !important; }", 0);
-  sheet.insertRule(".tweet-actions > li:nth-child(4) { margin-right: 2px !important; }", 0);
+  this.css = window.TDPF_createCustomStyle(this);
+  this.css.insert(".tweet-actions { float: right !important; width: auto !important; }");
+  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; }");
+  this.css.insert(".tweet-actions > li:nth-child(4) { margin-right: 2px !important; }");
 
   // revert small links around the tweet
   this.prevFooterMustache = TD.mustaches["status/tweet_single_footer.mustache"];
@@ -31,7 +27,8 @@ ready(){
 }
 
 disabled(){
-  $("#design-revert").remove();
+  this.css.remove();
+  
   $(document).off("uiShowActionsMenu", this.uiShowActionsMenuEvent);
   TD.mustaches["status/tweet_single_footer.mustache"] = this.prevFooterMustache;
 }

Resources/Plugins/reply-account/.meta

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

Resources/Plugins/reply-account/browser.js

@@ -1,67 +1,137 @@
 enabled(){
-  var configuration = { defaultAccount: "" };
+  var configuration = { defaultAccount: "#preferred" };
   
   window.TDPF_loadConfigurationFile(this, "configuration.js", "configuration.default.js", obj => configuration = obj);
   
-  this.uiInlineComposeTweetEvent = function(e, data){
-    var account = null;
+  this.lastSelectedAccount = null;
   
-    if (configuration.useAdvancedSelector && configuration.customSelector){
-      var column = TD.controller.columnManager.get(data.element.closest("section.column").attr("data-column"));
-      var result = configuration.customSelector(column);
-      
-      if (typeof result === "string" && result[0] === '@'){
-        account = result.substring(1);
-      }
-    }
-    
-    if (account === null){
-      if (configuration.defaultAccount === false){
+  this.uiComposeTweetEvent = (e, data) => {
+    if (data.type !== "reply" || data.popFromInline || !("element" in data)){
       return;
     }
-      else if (configuration.defaultAccount !== "" && configuration.defaultAccount[0] === '@'){
-        account = configuration.defaultAccount.substring(1);
-      }
+    
+    var query;
+    
+    if (configuration.useAdvancedSelector){
+      if (configuration.customSelector){
+        if (configuration.customSelector.toString().startsWith("function (column){")){
+          $TD.alert("warning", "Plugin reply-account has invalid configuration: customSelector needs to be updated due to TweetDeck changes, please read the default configuration file for the updated guide");
+          return;
         }
         
-    var identifier;
+        var section = data.element.closest("section.column");
         
-    if (account === null){
-      identifier = TD.storage.clientController.client.getDefaultAccount();
+        var column = TD.controller.columnManager.get(section.attr("data-column"));
+        var header = $("h1.column-title", section);
+        
+        var columnTitle = header.children(".column-head-title").text();
+        var columnAccount = header.children(".attribution").text();
+        
+        try{
+          query = configuration.customSelector(column.getColumnType(), columnTitle, columnAccount, column);
+        }catch(e){
+          $TD.alert("warning", "Plugin reply-account has invalid configuration: customSelector threw an error: "+e.message);
+          return;
+        }
       }
       else{
-      var obj = TD.storage.accountController.getAccountFromUsername(account);
+        $TD.alert("warning", "Plugin reply-account has invalid configuration: useAdvancedSelector is true, but customSelector function is missing");
+        return;
+      }
+    }
+    else{
+      query = configuration.defaultAccount;
+      
+      if (query === ""){
+        query = "#preferred";
+      }
+      else if (typeof query !== "string"){
+        query = "#default";
+      }
+    }
+    
+    if (typeof query === "undefined"){
+      query = "#preferred";
+    }
+    
+    if (typeof query !== "string"){
+      return;
+    }
+    else if (query.length === 0){
+      $TD.alert("warning", "Plugin reply-account has invalid configuration: the requested account is empty");
+      return;
+    }
+    else if (query[0] !== '@' && query[0] !== '#'){
+      $TD.alert("warning", "Plugin reply-account has invalid configuration: the requested account does not begin with @ or #: "+query);
+      return;
+    }
+    
+    var identifier = null;
+    
+    switch(query){
+      case "#preferred":
+        identifier = TD.storage.clientController.client.getDefaultAccount();
+        break;
+      
+      case "#last":
+        if (this.lastSelectedAccount === null){
+          return;
+        }
+        
+        identifier = this.lastSelectedAccount;
+        break;
+      
+      case "#default":
+        return;
+      
+      default:
+        if (query[0] === '@'){
+          var obj = TD.storage.accountController.getAccountFromUsername(query.substring(1));
           
           if (obj.length === 0){
+            $TD.alert("warning", "Plugin reply-account has invalid configuration: requested account not found: "+query);
             return;
           }
           else{
             identifier = obj[0].privateState.key;
           }
         }
+        else{
+          $TD.alert("warning", "Plugin reply-account has invalid configuration: unknown requested account query: "+query);
+          return;
+        }
+    }
     
     data.singleFrom = data.from = [ identifier ];
   };
+  
+  this.onSelectedAccountChanged = () => {
+    var selected = $(".js-account-item.is-selected", ".js-account-list");
+    this.lastSelectedAccount = selected.length === 1 ? selected.attr("data-account-key") : null;
+  };
 }
 
 ready(){
   var events = $._data(document, "events");
   
-  if ("uiInlineComposeTweet" in events){
-    $(document).on("uiInlineComposeTweet", this.uiInlineComposeTweetEvent);
+  for(var event of [ "uiInlineComposeTweet", "uiDockedComposeTweet" ]){
+    $(document).on(event, this.uiComposeTweetEvent);
     
-    var handlers = events["uiInlineComposeTweet"];
-    var oldHandler = handlers[0];
-    var newHandler = handlers[1];
+    var handlers = events[event];
+    var newHandler = handlers[handlers.length-1];
+    
+    for(var index = handlers.length-1; index > 0; index--){
+      handlers[index] = handlers[index-1];
+    }
     
     handlers[0] = newHandler;
-    handlers[1] = oldHandler;
-  }
-  else{
-    $(document).on("uiInlineComposeTweet", this.uiInlineComposeTweetEvent);
   }
+  
+  $(document).on("click", ".js-account-list .js-account-item", this.onSelectedAccountChanged);
 }
 
 disabled(){
-  $(document).off("uiInlineComposeTweet", this.uiInlineComposeTweetEvent);
+  $(document).off("uiInlineComposeTweet", this.uiComposeTweetEvent);
+  $(document).off("uiDockedComposeTweet", this.uiComposeTweetEvent);
+  $(document).off("click", ".js-account-list .js-account-item", this.onSelectedAccountChanged);
 }

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

@@ -13,13 +13,14 @@
    *
    * Set value of 'defaultAccount' to one of the following values:
    *
-   *   ""            to use your preferred TweetDeck account for all replies (default)
+   *   "#preferred"  to use your preferred TweetDeck account (the one used to log into TweetDeck)
+   *   "#last"       to specify the account that was selected last time (only updates if a single account is selected)
+   *   "#default"    to fall back to default TweetDeck behavior; useful for advanced configuration below, otherwise disable the plugin instead
    *   "@myAccount"  to specify an account name to use; has to be one of your registered account names
-   *   false         to fall back to default TweetDeck behavior; useful for advanced configuration below, otherwise disable the plugin instead
    *
    */
   
-  defaultAccount: "",
+  defaultAccount: "#preferred",
   
   /*
    * Advanced way of configuring the plugin
@@ -30,45 +31,46 @@
    * 1. Set value of 'useAdvancedSelector' to true
    * 2. Uncomment the 'customSelector' function, and replace the example code with your desired behavior
    *
-   * If 'customSelector' returns a string containing a full name of one of the registered accounts (including @), that account is used.
-   * If it returns anything else (for example false, undefined, or an account name that is not registered), it falls back to 'defaultAccount' behavior.
+   * The 'customSelector' function should return a string in one of the formats supported by 'defaultAccount'.
+   * If it returns anything else (for example, false or undefined), it falls back to 'defaultAccount' behavior.
    *
-   * The 'column' parameter is a TweetDeck column object. If you want to see all properties of the object, open your browser, nagivate to TweetDeck,
-   * log in, and run the following code in your browser console, which will return an object containing all of the column objects mapped to their IDs:
-   *   TD.controller.columnManager.getAll()
-   *
-   * The example below shows how to extract the column type, title, and account from the object.
-   * Column type is prefixed with col_, and may be one of the following:
    *
+   * The 'type' parameter is TweetDeck column type. Here is the full list of column types, note that some are
+   * unused and have misleading names (for example, Home columns are 'col_timeline' instead of 'col_home'):
    *   col_timeline, col_interactions, col_mentions, col_followers, col_search, col_list,
    *   col_customtimeline, col_messages, col_usertweets, col_favorites, col_activity,
    *   col_dataminr, col_home, col_me, col_inbox, col_scheduled, col_unknown
    *
-   * Some of these appear to be unused (for example, Home columns are 'col_timeline' instead of 'col_home').
+   * If you want to see your current column types, run this in your browser console:
+   *   TD.controller.columnManager.getAllOrdered().map(obj => obj.getColumnType());
    *
-   * If you want to see your column types, run this in your browser console:
-   *   Object.values(TD.controller.columnManager.getAll()).forEach(obj => console.log(obj.getColumnType()));
    *
-   * You can also get the jQuery column object using: $("section.column[data-column='"+column.ui.state.columnKey+"']")
+   * The 'title' parameter is the column title. Some are fixed (such as 'Home' or 'Notifications'),
+   * some contain specific information (for example, Search columns contain the search query).
+   *
+   *
+   * The 'account' parameter is the account name displayed next to the column title (including the @).
+   * This parameter is empty for some columns (such as Messages, or Notifications for all accounts) or can
+   * contain other text (for example, the Scheduled column contains the string 'All accounts').
+   *
+   *
+   * The 'column' parameter is a TweetDeck column object. If you want to see all properties of the object,
+   * run the following code in your browser console, which will return an array containing all of your
+   * current column objects in order:
+   *   TD.controller.columnManager.getAllOrdered()
    *
    */
   
   useAdvancedSelector: false,
   
-  /*customSelector: function(column){
-    var titleObj = $(column.getTitleHTML());
-    
-    var columnType = column.getColumnType(); // col_timeline
-    var columnTitle = titleObj.siblings(".column-head-title").text(); // Home
-    var columnAccount = titleObj.siblings(".attribution").text(); // @chylexmc
-    
-    if (columnType === "col_search" && columnTitle === "TweetDuck"){
+  /*customSelector: function(type, title, account, column){
+    if (type === "col_search" && title === "TweetDuck"){
       // This is a search column that looks for 'TweetDuck' in the tweets,
       // search columns are normally linked to the preferred account
       // so this forces the @TryTweetDuck account to be used instead.
       return "@TryTweetDuck";
     }
-    else if (columnType === "col_timeline" && columnAccount === "@chylexcz"){
+    else if (type === "col_timeline" && account === "@chylexcz"){
       // This is a Home column of my test account @chylexcz,
       // but I want to reply to tweets from my official account.
       return "@chylexmc";

Resources/Plugins/timeline-polls/.meta

@@ -0,0 +1,18 @@
+[name]
+Polls in timelines
+
+[description]
+- Adds poll result display directly into timelines
+- Experimental, may be buggy or break when TweetDeck updates
+
+[author]
+chylex
+
+[version]
+1.0
+
+[website]
+https://tweetduck.chylex.com
+
+[requires]
+1.4.1

Resources/Plugins/timeline-polls/browser.js

@@ -0,0 +1,25 @@
+constructor(){
+  super({
+    requiresPageReload: true
+  });
+}
+
+enabled(){
+  // add a stylesheet
+  window.TDPF_createCustomStyle(this).insert(".column-detail .timeline-poll-container { display: none }");
+  
+  // setup layout injecting
+  var injectLayout = (mustache, onlyIfNotFound, search, replace) => {
+    if (TD.mustaches[mustache].indexOf(onlyIfNotFound) === -1){
+      TD.mustaches[mustache] = TD.mustaches[mustache].replace(search, replace);
+    }
+  };
+
+  // add poll rendering to tweets
+  injectLayout("status/tweet_single.mustache", "status/poll", "{{/quotedTweetMissing}} {{#translation}}", "{{/quotedTweetMissing}} <div class='timeline-poll-container'>{{>duck/tweet_single/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>';
+}
+
+disabled(){
+  // not needed, plugin reloads the page when enabled or disabled
+}

Resources/Scripts/code.js

@@ -104,11 +104,14 @@
       var html = $(tweet.render({
         withFooter: false,
         withTweetActions: false,
-        withMediaPreview: false
+        withMediaPreview: true,
+        isMediaPreviewOff: true,
+        isMediaPreviewSmall: false,
+        isMediaPreviewLarge: false
       }));
       
       html.css("border", "0");
-      html.find(".tweet-body").first().children("footer").remove();
+      html.find("footer").last().remove(); // apparently withTweetActions breaks for certain tweets, nice
       
       var url = html.find("time").first().children("a").first().attr("href") || "";
       
@@ -376,26 +379,39 @@
   //
   // Block: Support for extra mouse buttons.
   //
+  (function(){
+    var tryClickSelector = function(selector, parent){
+      return $(selector, parent).click().length;
+    };
+    
+    var tryCloseModal = function(){
+      var modal = $("#open-modal");
+      return modal.is(":visible") && tryClickSelector("a[rel=dismiss]", modal);
+    };
+    
+    var tryCloseHighlightedColumn = function(){
+      if (highlightedColumnEle){
+        var column = highlightedColumnEle.closest(".js-column");
+        return (column.is(".is-shifted-2") && tryClickSelector(".js-tweet-social-proof-back", column)) || (column.is(".is-shifted-1") && tryClickSelector(".js-column-back", column));
+      }
+    };
+    
     window.TDGF_onMouseClickExtra = function(button){
       if (button === 1){ // back button
-      var modal = $("#open-modal");
-      
-      if (highlightedColumnEle && highlightedColumnEle.closest(".js-column").is(".is-shifted-1")){
-        highlightedColumnEle.find(".js-column-back").first().click();
-      }
-      else if (modal.is(":visible")){
-        modal.find("a[rel=dismiss]").click();
-      }
-      else{
+        tryCloseModal() ||
+        tryClickSelector(".js-inline-compose-close") ||
+        tryCloseHighlightedColumn() ||
+        tryClickSelector(".js-app-content.is-open .js-drawer-close:visible") ||
+        tryClickSelector(".is-shifted-2 .js-tweet-social-proof-back") ||
         $(".js-column-back").click();
       }
-    }
       else if (button === 2){ // forward button
         if (highlightedTweetEle){
           highlightedTweetEle.children().first().click();
         }
       }
     };
+  })();
   
   //
   // Block: Fix scheduled tweets not showing up sometimes.

Resources/Scripts/notification.js

@@ -114,9 +114,39 @@
     var account = embedded[0].getElementsByClassName("account-link");
     if (account.length === 0)return;
     
-    $TD.setNotificationTweetEmbedded(account[0].getAttribute("href")+"/status/"+tweetId);
+    $TD.setNotificationQuotedTweet(account[0].getAttribute("href")+"/status/"+tweetId);
   })();
   
+  //
+  // Block: Setup a skip button.
+  //
+  (function(){
+    if (document.body.hasAttribute("td-example-notification")){
+      return;
+    }
+    
+    document.body.insertAdjacentHTML("afterbegin", [
+      '<svg id="td-skip" xmlns="http://www.w3.org/2000/svg" width="10" height="17" viewBox="0 0 350 600" style="position:fixed;left:30px;bottom:10px;z-index:1000">',
+      '<path fill="#888" d="M0,151.656l102.208-102.22l247.777,247.775L102.208,544.986L0,442.758l145.546-145.547">',
+      '</svg>'
+    ].join(""));
+    
+    document.getElementById("td-skip").addEventListener("click", function(){
+      $TD.loadNextNotification();
+    });
+  })();
+  
+  //
+  // Block: Setup a hover class on body.
+  //
+  document.body.addEventListener("mouseenter", function(){
+    document.body.classList.add("td-hover");
+  });
+
+  document.body.addEventListener("mouseleave", function(){
+    document.body.classList.remove("td-hover");
+  });
+  
   //
   // Block: Page fully loaded.
   //

Resources/Scripts/plugins.js

@@ -9,13 +9,13 @@
     $TDP.checkFileExists(token, fileNameUser).then(exists => {
       var fileName = exists ? fileNameUser : fileNameDefault;
       
-      $TDP.readFile(token, fileName, true).then(contents => {
+      (exists ? $TDP.readFile(token, fileName, true) : $TDP.readFileRoot(token, fileName)).then(contents => {
         var obj;
 
         try{
           obj = eval("("+contents+")");
         }catch(err){
-          if (!(onFailure && onFailure(err.message))){
+          if (!(onFailure && onFailure(err))){
             $TD.alert("warning", "Problem loading '"+fileName+"' file for '"+identifier+"' plugin, the JavaScript syntax is invalid: "+err.message);
           }
 
@@ -34,4 +34,21 @@
       }
     });
   };
+  
+  //
+  // Block: Setup a function to add/remove custom CSS.
+  //
+  window.TDPF_createCustomStyle = function(pluginObject){
+    var element = document.createElement("style");
+    element.id = "plugin-"+pluginObject.$id+"-"+Math.random().toString(36).substring(2, 7);
+    document.head.appendChild(element);
+    
+    var obj = {
+      insert: (rule) => element.sheet.insertRule(rule, 0),
+      remove: () => $(element).remove()
+    };
+    
+    obj.element = element;
+    return obj;
+  };
 })($TDP);

Resources/Scripts/update.js

@@ -12,14 +12,18 @@
   //
   // Constant: Url that returns JSON data about latest version.
   //
-  const updateCheckUrl = "https://api.github.com/repos/chylex/"+$TDU.brandName+"/releases/latest";
+  const updateCheckUrlLatest = "https://api.github.com/repos/chylex/"+$TDU.brandName+"/releases/latest";
+  
+  //
+  // Constant: Url that returns JSON data about all versions, including prereleases.
+  //
+  const updateCheckUrlAll = "https://api.github.com/repos/chylex/"+$TDU.brandName+"/releases";
   
   //
   // Function: Creates the update notification element. Removes the old one if already exists.
   //
   var createUpdateNotificationElement = function(version, download){
     var outdated = version === "unsupported";
-    var tweetdick = version === "tweetdick";
     
     var ele = $("#tweetdck-update");
     var existed = ele.length > 0;
@@ -37,15 +41,6 @@
       "<button class='btn btn-negative tdu-btn-dismiss'><span class='label'>Dismiss</span></button>",
       "</div>",
       "</div>"
-    ] : tweetdick ? [
-      "<div id='tweetdck-update'>",
-      "<p class='tdu-title'>TweetDick Ending</p>",
-      "<p class='tdu-info'>Please, move to TweetDuck.</p>",
-      "<div class='tdu-buttons'>",
-      "<button class='btn btn-positive tdu-btn-unsupported'><span class='label'>Read More</span></button>",
-      "<button class='btn btn-negative tdu-btn-dismiss'><span class='label'>Dismiss</span></button>",
-      "</div>",
-      "</div>"
     ] : [
       "<div id='tweetdck-update'>",
       "<p class='tdu-title'>"+$TDU.brandName+" Update</p>",
@@ -118,10 +113,6 @@
       $TDU.openBrowser("https://github.com/chylex/TweetDuck/wiki/Supported-Systems");
     });
 
-    buttonDiv.children(".tdu-btn-tweetdick").click(function(){
-      $TDU.openBrowser("https://github.com/chylex/TweetDick/wiki/Future-of-TweetDick");
-    });
-
     buttonDiv.children(".tdu-btn-dismiss,.tdu-btn-unsupported").click(function(){
       $TDU.onUpdateDismissed(version);
       ele.slideUp(function(){ ele.remove(); });
@@ -145,29 +136,28 @@
       
       return;
     }
-    else if ($TDU.brandName === "TweetDick"){
-      if ($TDU.dismissedVersionTag !== "tweetdick"){
-        createUpdateNotificationElement("tweetdick");
-      }
-      
-      return;
-    }
     
     clearTimeout(updateCheckTimeoutID);
     updateCheckTimeoutID = setTimeout(runUpdateCheck, 1000*60*60); // 1 hour
     
-    if (!$TDU.updateCheckEnabled && !force)return;
+    if (!$TDU.updateCheckEnabled && !force){
+      return;
+    }
     
-    $.getJSON(updateCheckUrl, function(response){
-      var tagName = response.tag_name;
-      var hasUpdate = tagName !== $TDU.versionTag && tagName !== $TDU.dismissedVersionTag && response.assets.length > 0;
+    var allowPre = $TDU.allowPreReleases;
+    
+    $.getJSON(allowPre ? updateCheckUrlAll : updateCheckUrlLatest, function(response){
+      var release = allowPre ? response[0] : response;
+      
+      var tagName = release.tag_name;
+      var hasUpdate = tagName !== $TDU.versionTag && tagName !== $TDU.dismissedVersionTag && release.assets.length > 0;
       
       if (hasUpdate){
-        var obj = response.assets.find(asset => asset.name === updateFileName) || response.assets[0];
+        var obj = release.assets.find(asset => asset.name === updateFileName) || release.assets[0];
         createUpdateNotificationElement(tagName, obj.browser_download_url);
       }
       
-      if (eventID !== 0){
+      if (eventID){ // ignore undefined and 0
         $TDU.onUpdateCheckFinished(eventID, hasUpdate, tagName);
       }
     });

TweetDck.csproj

@@ -1,5 +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.0-pre01\build\CefSharp.WinForms.props" Condition="Exists('packages\CefSharp.WinForms.53.0.0-pre01\build\CefSharp.WinForms.props')" />
+  <Import Project="packages\CefSharp.Common.53.0.0-pre01\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.53.0.0-pre01\build\CefSharp.Common.props')" />
   <Import Project="packages\CefSharp.WinForms.49.0.0-pre02\build\CefSharp.WinForms.props" Condition="Exists('packages\CefSharp.WinForms.49.0.0-pre02\build\CefSharp.WinForms.props')" />
   <Import Project="packages\CefSharp.Common.49.0.0-pre02\build\CefSharp.Common.props" Condition="Exists('packages\CefSharp.Common.49.0.0-pre02\build\CefSharp.Common.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
@@ -11,12 +13,12 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TweetDck</RootNamespace>
     <AssemblyName Condition=" '$(Configuration)' == 'Debug' ">TweetDick</AssemblyName>
-    <AssemblyName Condition=" '$(Configuration)' == 'Release Dick' ">TweetDick</AssemblyName>
-    <AssemblyName Condition=" '$(Configuration)' == 'Release Duck' ">TweetDuck</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <AssemblyName Condition=" '$(Configuration)' == 'Release' ">TweetDuck</AssemblyName>
+    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <NuGetPackageImportStamp>ff8ce4f3</NuGetPackageImportStamp>
-    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
+    <NuGetPackageImportStamp>e83161d1</NuGetPackageImportStamp>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -41,24 +43,13 @@
     <PlatformTarget>x86</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release Dick|x86' ">
-    <OutputPath>bin\x86\Release Dick\</OutputPath>
-    <DefineConstants>
-    </DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>none</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
-    <UseVSHostingProcess>false</UseVSHostingProcess>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationIcon>Resources\icon.ico</ApplicationIcon>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release Duck|x86' ">
-    <OutputPath>bin\x86\Release Duck\</OutputPath>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <OutputPath>bin\x86\Release\</OutputPath>
     <Optimize>true</Optimize>
     <PlatformTarget>x86</PlatformTarget>
     <UseVSHostingProcess>false</UseVSHostingProcess>
@@ -66,7 +57,12 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
-    <DefineConstants>DUCK</DefineConstants>
+    <DefineConstants>
+    </DefineConstants>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup>
+    <AssemblyName>TweetDuck</AssemblyName>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
@@ -99,6 +95,7 @@
     <Compile Include="Core\Controls\TabPanel.Designer.cs">
       <DependentUpon>TabPanel.cs</DependentUpon>
     </Compile>
+    <Compile Include="Core\Handling\BrowserProcessHandler.cs" />
     <Compile Include="Core\Handling\ContextMenuBase.cs" />
     <Compile Include="Core\Handling\ContextMenuBrowser.cs" />
     <Compile Include="Core\FormBrowser.cs">
@@ -123,6 +120,12 @@
     <Compile Include="Core\Other\FormAbout.Designer.cs">
       <DependentUpon>FormAbout.cs</DependentUpon>
     </Compile>
+    <Compile Include="Core\Other\FormMessage.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Core\Other\FormMessage.Designer.cs">
+      <DependentUpon>FormMessage.cs</DependentUpon>
+    </Compile>
     <Compile Include="Core\Other\FormPlugins.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -173,14 +176,10 @@
     <Compile Include="Core\Other\Settings\TabSettingsUpdates.Designer.cs">
       <DependentUpon>TabSettingsUpdates.cs</DependentUpon>
     </Compile>
+    <Compile Include="Core\Utils\CommandLineArgs.cs" />
     <Compile Include="Core\Utils\CommandLineArgsParser.cs" />
     <Compile Include="Core\Utils\WindowState.cs" />
-    <Compile Include="Migration\FormBackgroundWork.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Migration\FormBackgroundWork.Designer.cs">
-      <DependentUpon>FormBackgroundWork.cs</DependentUpon>
-    </Compile>
+    <Compile Include="Core\Utils\WindowsUtils.cs" />
     <Compile Include="Core\Handling\TweetDeckBridge.cs" />
     <Compile Include="Core\Other\FormSettings.cs">
       <SubType>Form</SubType>
@@ -200,15 +199,17 @@
     <Compile Include="Plugins\Controls\PluginListFlowLayout.Designer.cs">
       <DependentUpon>PluginListFlowLayout.cs</DependentUpon>
     </Compile>
+    <Compile Include="Plugins\Enums\PluginFolder.cs" />
     <Compile Include="Plugins\Plugin.cs" />
     <Compile Include="Plugins\Events\PluginChangedStateEventArgs.cs" />
     <Compile Include="Plugins\PluginBridge.cs" />
     <Compile Include="Plugins\PluginConfig.cs" />
-    <Compile Include="Plugins\PluginEnvironment.cs" />
-    <Compile Include="Plugins\PluginGroup.cs" />
+    <Compile Include="Plugins\Enums\PluginEnvironment.cs" />
+    <Compile Include="Plugins\Enums\PluginGroup.cs" />
     <Compile Include="Plugins\Events\PluginLoadEventArgs.cs" />
     <Compile Include="Plugins\PluginManager.cs" />
     <Compile Include="Plugins\PluginScriptGenerator.cs" />
+    <Compile Include="Reporter.cs" />
     <Compile Include="Updates\FormUpdateDownload.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -229,15 +230,6 @@
     <Compile Include="Updates\UpdateCheckEventArgs.cs" />
     <Compile Include="Updates\UpdateHandler.cs" />
     <Compile Include="Updates\UpdateInfo.cs" />
-    <Compile Include="Migration\FormMigrationQuestion.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Migration\FormMigrationQuestion.Designer.cs">
-      <DependentUpon>FormMigrationQuestion.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Migration\MigrationDecision.cs" />
-    <Compile Include="Migration\MigrationManager.cs" />
-    <Compile Include="Migration\Helpers\ProgramRegistrySearch.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
@@ -246,6 +238,7 @@
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
     <Compile Include="Resources\ScriptLoader.cs" />
+    <Compile Include="Updates\UpdaterSettings.cs" />
     <None Include="Configuration\app.config" />
     <None Include="Configuration\packages.config" />
   </ItemGroup>
@@ -312,15 +305,13 @@
     <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.2623.1396\build\cef.redist.x86.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x86.3.2623.1396\build\cef.redist.x86.targets'))" />
-    <Error Condition="!Exists('packages\cef.redist.x64.3.2623.1396\build\cef.redist.x64.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x64.3.2623.1396\build\cef.redist.x64.targets'))" />
-    <Error Condition="!Exists('packages\CefSharp.Common.49.0.0-pre02\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.49.0.0-pre02\build\CefSharp.Common.props'))" />
-    <Error Condition="!Exists('packages\CefSharp.Common.49.0.0-pre02\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.49.0.0-pre02\build\CefSharp.Common.targets'))" />
-    <Error Condition="!Exists('packages\CefSharp.WinForms.49.0.0-pre02\build\CefSharp.WinForms.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.49.0.0-pre02\build\CefSharp.WinForms.props'))" />
+    <Error Condition="!Exists('packages\cef.redist.x86.3.2785.1478\build\cef.redist.x86.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x86.3.2785.1478\build\cef.redist.x86.targets'))" />
+    <Error Condition="!Exists('packages\cef.redist.x64.3.2785.1478\build\cef.redist.x64.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\cef.redist.x64.3.2785.1478\build\cef.redist.x64.targets'))" />
+    <Error Condition="!Exists('packages\CefSharp.Common.53.0.0-pre01\build\CefSharp.Common.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.53.0.0-pre01\build\CefSharp.Common.props'))" />
+    <Error Condition="!Exists('packages\CefSharp.Common.53.0.0-pre01\build\CefSharp.Common.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.Common.53.0.0-pre01\build\CefSharp.Common.targets'))" />
+    <Error Condition="!Exists('packages\CefSharp.WinForms.53.0.0-pre01\build\CefSharp.WinForms.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.53.0.0-pre01\build\CefSharp.WinForms.props'))" />
+    <Error Condition="!Exists('packages\CefSharp.WinForms.53.0.0-pre01\build\CefSharp.WinForms.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\CefSharp.WinForms.53.0.0-pre01\build\CefSharp.WinForms.targets'))" />
   </Target>
-  <Import Project="packages\cef.redist.x86.3.2623.1396\build\cef.redist.x86.targets" Condition="Exists('packages\cef.redist.x86.3.2623.1396\build\cef.redist.x86.targets')" />
-  <Import Project="packages\cef.redist.x64.3.2623.1396\build\cef.redist.x64.targets" Condition="Exists('packages\cef.redist.x64.3.2623.1396\build\cef.redist.x64.targets')" />
-  <Import Project="packages\CefSharp.Common.49.0.0-pre02\build\CefSharp.Common.targets" Condition="Exists('packages\CefSharp.Common.49.0.0-pre02\build\CefSharp.Common.targets')" />
   <PropertyGroup>
     <PostBuildEvent>del "$(TargetPath).config"
 xcopy "$(ProjectDir)LICENSE.md" "$(TargetDir)" /Y
@@ -340,6 +331,10 @@ xcopy "$(ProjectDir)Resources\Plugins\*" "$(TargetDir)plugins\official\" /E /Y
 rmdir "$(ProjectDir)\bin\Debug"
 rmdir "$(ProjectDir)\bin\Release"</PostBuildEvent>
   </PropertyGroup>
+  <Import Project="packages\cef.redist.x86.3.2785.1478\build\cef.redist.x86.targets" Condition="Exists('packages\cef.redist.x86.3.2785.1478\build\cef.redist.x86.targets')" />
+  <Import Project="packages\cef.redist.x64.3.2785.1478\build\cef.redist.x64.targets" Condition="Exists('packages\cef.redist.x64.3.2785.1478\build\cef.redist.x64.targets')" />
+  <Import Project="packages\CefSharp.Common.53.0.0-pre01\build\CefSharp.Common.targets" Condition="Exists('packages\CefSharp.Common.53.0.0-pre01\build\CefSharp.Common.targets')" />
+  <Import Project="packages\CefSharp.WinForms.53.0.0-pre01\build\CefSharp.WinForms.targets" Condition="Exists('packages\CefSharp.WinForms.53.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">

TweetDck.sln

@@ -1,4 +1,4 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
 VisualStudioVersion = 12.0.40629.0
@@ -8,17 +8,14 @@ EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x86 = Debug|x86
-		Release Dick|x86 = Release Dick|x86
-		Release Duck|x86 = Release Duck|x86
+		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{2389A7CD-E0D3-4706-8294-092929A33A2D}.Debug|x86.ActiveCfg = Debug|x86
 		{2389A7CD-E0D3-4706-8294-092929A33A2D}.Debug|x86.Build.0 = Debug|x86
 		{2389A7CD-E0D3-4706-8294-092929A33A2D}.Debug|x86.Deploy.0 = Debug|x86
-		{2389A7CD-E0D3-4706-8294-092929A33A2D}.Release Dick|x86.ActiveCfg = Release Dick|x86
-		{2389A7CD-E0D3-4706-8294-092929A33A2D}.Release Dick|x86.Build.0 = Release Dick|x86
-		{2389A7CD-E0D3-4706-8294-092929A33A2D}.Release Duck|x86.ActiveCfg = Release Duck|x86
-		{2389A7CD-E0D3-4706-8294-092929A33A2D}.Release Duck|x86.Build.0 = Release Duck|x86
+		{2389A7CD-E0D3-4706-8294-092929A33A2D}.Release|x86.ActiveCfg = Release|x86
+		{2389A7CD-E0D3-4706-8294-092929A33A2D}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

Updates/FormUpdateDownload.cs

@@ -90,7 +90,7 @@ namespace TweetDck.Updates{
                     }
                 }
                 else if (e.Error != null){
-                    Program.Log(e.Error.ToString());
+                    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);

Updates/UpdateHandler.cs

@@ -10,21 +10,24 @@ namespace TweetDck.Updates{
     class UpdateHandler{
         private readonly ChromiumWebBrowser browser;
         private readonly FormBrowser form;
+        private readonly UpdaterSettings settings;
 
         public event EventHandler<UpdateAcceptedEventArgs> UpdateAccepted;
         public event EventHandler<UpdateCheckEventArgs> CheckFinished;
 
         private int lastEventId;
 
-        public UpdateHandler(ChromiumWebBrowser browser, FormBrowser form){
+        public UpdateHandler(ChromiumWebBrowser browser, FormBrowser form, UpdaterSettings settings){
             this.browser = browser;
             this.form = form;
+            this.settings = settings;
+
             browser.FrameLoadEnd += browser_FrameLoadEnd;
             browser.RegisterJsObject("$TDU", new Bridge(this));
         }
 
         private void browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
-            if (e.Frame.IsMain){
+            if (e.Frame.IsMain && BrowserUtils.IsTweetDeckWebsite(e.Frame)){
                 ScriptLoader.ExecuteFile(e.Frame, "update.js");
             }
         }
@@ -71,6 +74,12 @@ namespace TweetDck.Updates{
                 }
             }
 
+            public bool AllowPreReleases{
+                get{
+                    return owner.settings.AllowPreReleases;
+                }
+            }
+
             public bool IsSystemSupported{
                 get{
                     return Environment.OSVersion.Version >= new Version("6.1"); // 6.1 NT version = Windows 7

Updates/UpdaterSettings.cs

@@ -0,0 +1,5 @@
+namespace TweetDck.Updates{
+    class UpdaterSettings{
+        public bool AllowPreReleases { get; set; }
+    }
+}

_postbuild.bat

@@ -1,9 +1,6 @@
-del "bin\x86\Release Dick\*.xml"
-del "bin\x86\Release Dick\devtools_resources.pak"
-del "bin\x86\Release Duck\*.xml"
-del "bin\x86\Release Duck\devtools_resources.pak"
+del "bin\x86\Release\*.xml"
+del "bin\x86\Release\devtools_resources.pak"
+del "bin\x86\Release\d3dcompiler_43.dll"
 
-del "bin\x86\Release Dick\TweetDick.Browser.exe"
-ren "bin\x86\Release Dick\CefSharp.BrowserSubprocess.exe" "TweetDick.Browser.exe"
-del "bin\x86\Release Duck\TweetDuck.Browser.exe"
-ren "bin\x86\Release Duck\CefSharp.BrowserSubprocess.exe" "TweetDuck.Browser.exe"
+del "bin\x86\Release\TweetDuck.Browser.exe"
+ren "bin\x86\Release\CefSharp.BrowserSubprocess.exe" "TweetDuck.Browser.exe"

bld/Resources/LICENSE

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

bld/gen_full.iss

@@ -0,0 +1,149 @@
+; Script generated by the Inno Script Studio Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+#define MyAppName "TweetDuck"
+#define MyAppPublisher "chylex"
+#define MyAppURL "https://tweetduck.chylex.com"
+#define MyAppExeName "TweetDuck.exe"
+
+#define MyAppVersion GetFileVersion("..\bin\x86\Release\TweetDuck.exe")
+
+[Setup]
+AppId={{8C25A716-7E11-4AAD-9992-8B5D0C78AE06}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={pf}\{#MyAppName}
+DefaultGroupName={#MyAppName}
+OutputBaseFilename={#MyAppName}
+VersionInfoVersion={#MyAppVersion}
+LicenseFile=.\Resources\LICENSE
+SetupIconFile=.\Resources\icon.ico
+Uninstallable=TDIsUninstallable
+UninstallDisplayName={#MyAppName}
+UninstallDisplayIcon={app}\{#MyAppExeName}
+Compression=lzma
+SolidCompression=yes
+InternalCompressLevel=max
+MinVersion=0,6.1
+
+[Languages]
+Name: "english"; MessagesFile: "compiler:Default.isl"
+
+[Tasks]
+Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
+
+[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"
+
+[Icons]
+Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Check: TDIsUninstallable
+Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall shellexec skipifsilent
+
+[InstallDelete]
+Type: files; Name: "{app}\td-log.txt"
+
+[UninstallDelete]
+Type: files; Name: "{app}\debug.log"
+Type: filesandordirs; Name: "{localappdata}\{#MyAppName}\Cache"
+Type: filesandordirs; Name: "{localappdata}\{#MyAppName}\GPUCache"
+
+[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;
+    Exit;
+  end;
+  
+  if (MsgBox('{#MyAppName} requires .NET Framework 4.5.2 or newer,'+#13+#10+'please download it from {#MyAppURL}'+#13+#10+#13+#10'Do you want to proceed with the setup anyway?', mbCriticalError, MB_YESNO or MB_DEFBUTTON2) = IDNO) then
+  begin
+    Result := False;
+    Exit;
+  end;
+  
+  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;
+
+{ Check for an old TweetDeck profile and show a warning before installation. }
+procedure CurStepChanged(CurStep: TSetupStep);
+begin
+  if CurStep = ssInstall then
+  begin
+    if DirExists(ExpandConstant('{localappdata}\twitter\TweetDeck')) then
+    begin
+      MsgBox('Detected a profile from an old TweetDeck installation, you may uninstall the old client to free up some space.', mbInformation, MB_OK)
+    end;
+  end;
+end;
+
+{ Ask user if they want to delete 'AppData\TweetDuck' and 'plugins' folders after uninstallation. }
+procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
+var ProfileDataFolder: String;
+var PluginDataFolder: String;
+
+begin
+  if CurUninstallStep = usPostUninstall then
+  begin
+    ProfileDataFolder := ExpandConstant('{localappdata}\{#MyAppName}')
+    PluginDataFolder := ExpandConstant('{app}\plugins')
+    
+    if (DirExists(ProfileDataFolder) or DirExists(PluginDataFolder)) and (MsgBox('Do you also want to delete your {#MyAppName} profile and plugins?', mbConfirmation, MB_YESNO or MB_DEFBUTTON2) = IDYES) then
+    begin
+      DelTree(ProfileDataFolder, True, True, True);
+      DelTree(PluginDataFolder, True, True, True);
+      DelTree(ExpandConstant('{app}'), True, False, False);
+    end;
+  end;
+end;
+
+{ Returns true if the installer should create uninstallation entries (i.e. not running in full update mode). }
+function TDIsUninstallable: Boolean;
+begin
+  Result := (UpdatePath = '')
+end;
+
+{ Return DWORD value containing the build version of .NET Framework. }
+function TDGetNetFrameworkVersion: Cardinal;
+var FrameworkVersion: Cardinal;
+
+begin
+  if RegQueryDWordValue(HKEY_LOCAL_MACHINE, 'Software\Microsoft\NET Framework Setup\NDP\v4\Full', 'Release', FrameworkVersion) then
+  begin
+    Result := FrameworkVersion;
+    Exit;
+  end;
+  
+  Result := 0;
+end;

bld/gen_port.iss

@@ -0,0 +1,92 @@
+; Script generated by the Inno Script Studio Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+#define MyAppName "TweetDuck"
+#define MyAppPublisher "chylex"
+#define MyAppURL "https://tweetduck.chylex.com"
+#define MyAppExeName "TweetDuck.exe"
+
+#define MyAppVersion GetFileVersion("..\bin\x86\Release\TweetDuck.exe")
+
+[Setup]
+AppId={{8C25A716-7E11-4AAD-9992-8B5D0C78AE06}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={pf}\{#MyAppName}
+DefaultGroupName={#MyAppName}
+OutputBaseFilename={#MyAppName}.Portable
+VersionInfoVersion={#MyAppVersion}
+LicenseFile=.\Resources\LICENSE
+SetupIconFile=.\Resources\icon.ico
+Uninstallable=no
+UsePreviousAppDir=no
+PrivilegesRequired=lowest
+Compression=lzma
+SolidCompression=yes
+InternalCompressLevel=max
+MinVersion=0,6.1
+
+[Languages]
+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"
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall shellexec
+
+[Code]
+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
+  if TDGetNetFrameworkVersion() >= 379893 then
+  begin
+    Result := True;
+    Exit;
+  end;
+  
+  if (MsgBox('{#MyAppName} requires .NET Framework 4.5.2 or newer,'+#13+#10+'please download it from {#MyAppURL}'+#13+#10+#13+#10'Do you want to proceed with the setup anyway?', mbCriticalError, MB_YESNO or MB_DEFBUTTON2) = IDNO) then
+  begin
+    Result := False;
+    Exit;
+  end;
+  
+  Result := True;
+end;
+
+{ Return DWORD value containing the build version of .NET Framework. }
+function TDGetNetFrameworkVersion: Cardinal;
+var FrameworkVersion: Cardinal;
+
+begin
+  if RegQueryDWordValue(HKEY_LOCAL_MACHINE, 'Software\Microsoft\NET Framework Setup\NDP\v4\Full', 'Release', FrameworkVersion) then
+  begin
+    Result := FrameworkVersion;
+    Exit;
+  end;
+  
+  Result := 0;
+end;
+
+{ Create a 'makeportable' file if running in portable mode. }
+procedure CurStepChanged(CurStep: TSetupStep);
+begin
+  if CurStep = ssPostInstall then
+  begin
+    while not SaveStringToFile(ExpandConstant('{app}\makeportable'), '', False) do
+    begin
+      if MsgBox('Could not create a ''makeportable'' file in the installation folder. If the file is not present, the installation will not be fully portable.', mbCriticalError, MB_RETRYCANCEL) <> IDRETRY then
+      begin
+        break;
+      end;
+    end;
+  end;
+end;

bld/gen_upd.iss

@@ -0,0 +1,266 @@
+; Script generated by the Inno Script Studio Wizard.
+; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
+
+#define MyAppName "TweetDuck"
+#define MyAppPublisher "chylex"
+#define MyAppURL "https://tweetduck.chylex.com"
+#define MyAppExeName "TweetDuck.exe"
+
+#define MyAppID "8C25A716-7E11-4AAD-9992-8B5D0C78AE06"
+#define MyAppVersion GetFileVersion("..\bin\x86\Release\TweetDuck.exe")
+#define CefVersion "3.2785.1478.0"
+
+[Setup]
+AppId={{{#MyAppID}}
+AppName={#MyAppName}
+AppVersion={#MyAppVersion}
+AppVerName={#MyAppName} {#MyAppVersion}
+AppPublisher={#MyAppPublisher}
+AppPublisherURL={#MyAppURL}
+AppSupportURL={#MyAppURL}
+AppUpdatesURL={#MyAppURL}
+DefaultDirName={pf}\{#MyAppName}
+DefaultGroupName={#MyAppName}
+OutputBaseFilename={#MyAppName}.Update
+VersionInfoVersion={#MyAppVersion}
+LicenseFile=.\Resources\LICENSE
+SetupIconFile=.\Resources\icon.ico
+Uninstallable=TDIsUninstallable
+UninstallDisplayName={#MyAppName}
+UninstallDisplayIcon={app}\{#MyAppExeName}
+PrivilegesRequired=lowest
+Compression=lzma
+SolidCompression=yes
+InternalCompressLevel=max
+MinVersion=0,6.1
+
+#include <idp.iss>
+
+[Languages]
+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"
+
+[Icons]
+Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Check: TDIsUninstallable
+
+[Run]
+Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Parameters: "{param:RUNARGS}"; Flags: nowait postinstall shellexec
+
+[InstallDelete]
+Type: files; Name: "{app}\*.xml"
+Type: files; Name: "{app}\*.js"
+Type: files; Name: "{app}\d3dcompiler_43.dll"
+Type: files; Name: "{app}\devtools_resources.pak"
+Type: files; Name: "{app}\CefSharp.BrowserSubprocess.exe"
+Type: files; Name: "{app}\td-log.txt"
+Type: files; Name: "{app}\debug.log"
+Type: files; Name: "{localappdata}\{#MyAppName}\ChromeDWriteFontCache"
+
+[UninstallDelete]
+Type: files; Name: "{app}\*.*"
+Type: filesandordirs; Name: "{app}\locales"
+Type: filesandordirs; Name: "{app}\scripts"
+Type: filesandordirs; Name: "{localappdata}\{#MyAppName}\Cache"
+Type: filesandordirs; Name: "{localappdata}\{#MyAppName}\GPUCache"
+
+[Code]
+function TDIsUninstallable: Boolean; forward;
+function TDFindUpdatePath: String; forward;
+function TDGetNetFrameworkVersion: Cardinal; forward;
+function TDGetAppVersionClean: String; forward;
+function TDIsMatchingCEFVersion: Boolean; forward;
+procedure TDExecuteFullDownload; forward;
+
+var IsPortable: Boolean;
+var UpdatePath: String;
+
+{ Check .NET Framework version on startup, ask user if they want to proceed if older than 4.5.2. Prepare full download package if required. }
+function InitializeSetup: Boolean;
+begin
+  IsPortable := ExpandConstant('{param:PORTABLE}') = '1'
+  UpdatePath := TDFindUpdatePath()
+  
+  if UpdatePath = '' then
+  begin
+    MsgBox('{#MyAppName} installation could not be found on your system.', mbCriticalError, MB_OK);
+    Result := False;
+    Exit;
+  end;
+  
+  if not TDIsMatchingCEFVersion() then
+  begin
+    idpAddFile('https://github.com/{#MyAppPublisher}/{#MyAppName}/releases/download/'+TDGetAppVersionClean()+'/{#MyAppName}.exe', ExpandConstant('{tmp}\{#MyAppName}.Full.exe'));
+  end;
+  
+  if TDGetNetFrameworkVersion() >= 379893 then
+  begin
+    Result := True;
+    Exit;
+  end;
+  
+  if (MsgBox('{#MyAppName} requires .NET Framework 4.5.2 or newer,'+#13+#10+'please download it from {#MyAppURL}'+#13+#10+#13+#10'Do you want to proceed with the setup anyway?', mbCriticalError, MB_YESNO or MB_DEFBUTTON2) = IDNO) then
+  begin
+    Result := False;
+    Exit;
+  end;
+  
+  Result := True;
+end;
+
+{ Prepare download plugin if there are any files to download, and set the installation path. }
+procedure InitializeWizard();
+begin
+  WizardForm.DirEdit.Text := UpdatePath;
+  
+  if idpFilesCount <> 0 then
+  begin
+    idpDownloadAfter(wpReady);
+  end;
+end;
+
+{ Ask user if they want to delete 'AppData\TweetDuck' and 'plugins' folders after uninstallation. }
+procedure CurUninstallStepChanged(CurUninstallStep: TUninstallStep);
+var ProfileDataFolder: String;
+var PluginDataFolder: String;
+
+begin
+  if CurUninstallStep = usPostUninstall then
+  begin
+    ProfileDataFolder := ExpandConstant('{localappdata}\{#MyAppName}');
+    PluginDataFolder := ExpandConstant('{app}\plugins');
+    
+    if (DirExists(ProfileDataFolder) or DirExists(PluginDataFolder)) and (MsgBox('Do you also want to delete your {#MyAppName} profile and plugins?', mbConfirmation, MB_YESNO or MB_DEFBUTTON2) = IDYES) then
+    begin
+      DelTree(ProfileDataFolder, True, True, True);
+      DelTree(PluginDataFolder, True, True, True);
+      DelTree(ExpandConstant('{app}'), True, False, False);
+    end;
+  end;
+end;
+
+{ Remove uninstallation data and application to force them to be replaced with updated ones. }
+procedure CurStepChanged(CurStep: TSetupStep);
+begin
+  if CurStep = ssInstall then
+  begin
+    TDExecuteFullDownload();
+    
+    if TDIsUninstallable() then
+    begin
+      DeleteFile(ExpandConstant('{app}\unins000.dat'));
+      DeleteFile(ExpandConstant('{app}\unins000.exe'));
+    end;
+  end;
+end;
+
+{ Returns true if the installer should create uninstallation entries (i.e. not running in portable mode). }
+function TDIsUninstallable: Boolean;
+begin
+  Result := not IsPortable
+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;
+
+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
+  begin
+    Result := ''
+    Exit
+  end;
+  
+  if not FileExists(Path+'{#MyAppExeName}') then
+  begin
+    Result := ''
+    Exit
+  end;
+  
+  Result := Path
+end;
+
+{ Return DWORD value containing the build version of .NET Framework. }
+function TDGetNetFrameworkVersion: Cardinal;
+var FrameworkVersion: Cardinal;
+
+begin
+  if RegQueryDWordValue(HKEY_LOCAL_MACHINE, 'Software\Microsoft\NET Framework Setup\NDP\v4\Full', 'Release', FrameworkVersion) then
+  begin
+    Result := FrameworkVersion;
+    Exit;
+  end;
+  
+  Result := 0;
+end;
+
+{ Return whether the version of the installed libcef.dll library matches internal one. }
+function TDIsMatchingCEFVersion: Boolean;
+var CEFVersion: String;
+
+begin
+  Result := (GetVersionNumbersString(UpdatePath+'libcef.dll', CEFVersion) and (CompareStr(CEFVersion, '{#CefVersion}') = 0))
+end;
+
+{ Return a cleaned up form of the app version string (removes all .0 suffixes). }
+function TDGetAppVersionClean: String;
+var Substr: String;
+var CleanVersion: String;
+
+begin
+  CleanVersion := '{#MyAppVersion}'
+  
+  while True do
+  begin
+    Substr := Copy(CleanVersion, Length(CleanVersion)-1, 2);
+    
+    if (CompareStr(Substr, '.0') <> 0) then
+    begin
+      break;
+    end;
+    
+    CleanVersion := Copy(CleanVersion, 1, Length(CleanVersion)-2);
+  end;
+  
+  Result := CleanVersion;
+end;
+
+{ Run the full package installer if downloaded. }
+procedure TDExecuteFullDownload;
+var InstallFile: String;
+var ResultCode: Integer;
+
+begin
+  InstallFile := ExpandConstant('{tmp}\{#MyAppName}.Full.exe')
+  
+  if FileExists(InstallFile) then
+  begin
+    WizardForm.ProgressGauge.Style := npbstMarquee;
+    
+    try
+      if Exec(InstallFile, '/SP- /SILENT /MERGETASKS="!desktopicon" /UPDATEPATH="'+UpdatePath+'"', '', SW_SHOW, ewWaitUntilTerminated, ResultCode) then
+      begin
+        if ResultCode <> 0 then
+        begin
+          DeleteFile(InstallFile);
+          Abort();
+          Exit;
+        end;
+      end else
+      begin
+        MsgBox('Could not run the full installer, please visit {#MyAppURL} and download the latest version manually. Error: '+SysErrorMessage(ResultCode), mbCriticalError, MB_OK);
+        
+        DeleteFile(InstallFile);
+        Abort();
+        Exit;
+      end;
+    finally
+      WizardForm.ProgressGauge.Style := npbstNormal;
+      DeleteFile(InstallFile);
+    end;
+  end;
+end;