Release 1.7.1

Fix occasional twitter.js crash due to it loading too early
Customize login and logout pages
2025-09-14 19:32:10 +02:00 · 2017-04-07 00:32:27 +02:00 · 2017-04-07 00:18:59 +02:00 · 2017-04-06 23:16:58 +02:00 · 2017-04-06 18:39:47 +02:00 · 2017-04-06 18:11:52 +02:00
34 changed files with 353 additions and 251 deletions
--- a/Configuration/UserConfig.cs
+++ b/Configuration/UserConfig.cs
@@ -19,6 +19,7 @@ namespace TweetDck.Configuration{
        // START OF CONFIGURATION

        public WindowState BrowserWindow { get; set; }
+        public bool DisplayNotificationColumn { get; set; }
        public bool DisplayNotificationTimer { get; set; }
        public bool NotificationTimerCountDown { get; set; }
        public bool NotificationNonIntrusiveMode { get; set; }
@@ -32,7 +33,6 @@ namespace TweetDck.Configuration{

        public bool EnableSpellCheck { get; set; }
        public bool ExpandLinksOnHover { get; set; }
-        public bool ShowScreenshotBorder { get; set; }
        public bool EnableTrayHighlight { get; set; }

        public bool EnableUpdateCheck { get; set; }
--- a/Core/Bridge/TweetDeckBridge.cs
+++ b/Core/Bridge/TweetDeckBridge.cs
@@ -57,10 +57,10 @@ namespace TweetDck.Core.Bridge{
            form.InvokeAsyncSafe(form.OpenContextMenu);
        }

-        public void OnTweetPopup(string tweetHtml, string tweetUrl, int tweetCharacters){
+        public void OnTweetPopup(string columnName, string tweetHtml, string tweetUrl, int tweetCharacters){
            notification.InvokeAsyncSafe(() => {
                form.OnTweetNotification();
-                notification.ShowNotification(new TweetNotification(tweetHtml, tweetUrl, tweetCharacters));
+                notification.ShowNotification(new TweetNotification(columnName, tweetHtml, tweetUrl, tweetCharacters));
            });
        }

--- a/Core/FormBrowser.cs
+++ b/Core/FormBrowser.cs
@@ -79,6 +79,7 @@ namespace TweetDck.Core{
            #endif

            this.browser.LoadingStateChanged += browser_LoadingStateChanged;
+            this.browser.FrameLoadStart += browser_FrameLoadStart;
            this.browser.FrameLoadEnd += browser_FrameLoadEnd;
            this.browser.LoadError += browser_LoadError;
            this.browser.RegisterAsyncJsObject("$TD", new TweetDeckBridge(this, notification));
@@ -161,6 +162,12 @@ namespace TweetDck.Core{
            }
        }

+        private void browser_FrameLoadStart(object sender, FrameLoadStartEventArgs e){
+            if (e.Frame.IsMain && BrowserUtils.IsTwitterWebsite(e.Frame)){
+                ScriptLoader.ExecuteFile(e.Frame, "twitter.js");
+            }
+        }
+
        private void browser_FrameLoadEnd(object sender, FrameLoadEndEventArgs e){
            if (e.Frame.IsMain && BrowserUtils.IsTweetDeckWebsite(e.Frame)){
                e.Frame.ExecuteJavaScriptAsync(BrowserUtils.BackgroundColorFix);
--- a/Core/Notification/FormNotificationBase.cs
+++ b/Core/Notification/FormNotificationBase.cs
@@ -71,6 +71,7 @@ namespace TweetDck.Core.Notification{
        protected readonly Form owner;
        protected readonly ChromiumWebBrowser browser;

+        private string currentColumn;
        private int pauseCounter;

        public bool IsPaused{
@@ -151,6 +152,7 @@ namespace TweetDck.Core.Notification{
            }

            Location = ControlExtensions.InvisibleLocation;
+            currentColumn = null;
        }

        public virtual void FinishCurrentNotification(){}
@@ -175,6 +177,7 @@ namespace TweetDck.Core.Notification{
        protected virtual void LoadTweet(TweetNotification tweet){
            CurrentUrl = tweet.Url;
            CurrentQuotedTweetUrl = string.Empty; // load from JS
+            currentColumn = tweet.Column;
            browser.LoadHtml(GetTweetHTML(tweet), "http://tweetdeck.twitter.com/?"+DateTime.Now.Ticks);
        }

@@ -196,7 +199,7 @@ namespace TweetDck.Core.Notification{
        }

        protected virtual void UpdateTitle(){
-            Text = Program.BrandName;
+            Text = string.IsNullOrEmpty(currentColumn) || !Program.UserConfig.DisplayNotificationColumn ? Program.BrandName : Program.BrandName+" - "+currentColumn;
        }

        public void DisplayTooltip(string text){
@@ -206,7 +209,7 @@ namespace TweetDck.Core.Notification{
            else{
                Point position = PointToClient(Cursor.Position);
                position.Offset(20, 5);
-                toolTip.Show(text, this, position); // TODO figure out flickering when moving the mouse
+                toolTip.Show(text, this, position);
            }
        }
    }
--- a/Core/Notification/FormNotificationMain.cs
+++ b/Core/Notification/FormNotificationMain.cs
@@ -165,6 +165,8 @@ namespace TweetDck.Core.Notification{
            else{
                PrepareAndDisplayWindow();
            }
+
+            UpdateTitle();
        }

        public override void HideNotification(bool loadBlank){
--- a/Core/Notification/FormNotificationTweet.cs
+++ b/Core/Notification/FormNotificationTweet.cs
@@ -117,7 +117,11 @@ namespace TweetDck.Core.Notification{
        }

        protected override void UpdateTitle(){
-            Text = tweetQueue.Count > 0 ? Program.BrandName+" ("+tweetQueue.Count+" more left)" : Program.BrandName;
+            base.UpdateTitle();
+
+            if (tweetQueue.Count > 0){
+                Text = Text+" ("+tweetQueue.Count+" more left)";
+            }
        }

        protected override void OnNotificationReady(){
--- a/Core/Notification/Screenshot/FormNotificationScreenshotable.cs
+++ b/Core/Notification/Screenshot/FormNotificationScreenshotable.cs
@@ -22,26 +22,21 @@ namespace TweetDck.Core.Notification.Screenshot{

        public void LoadNotificationForScreenshot(TweetNotification tweet, int width, int height){
            browser.LoadHtml(tweet.GenerateHtml(enableCustomCSS: false), "http://tweetdeck.twitter.com/?"+DateTime.Now.Ticks);
-            
-            Location = ControlExtensions.InvisibleLocation;
            SetNotificationSize(width, height);
        }

        public void TakeScreenshot(){
-            MoveToVisibleLocation();
-            
-            bool border = Program.UserConfig.ShowScreenshotBorder;
-            IntPtr context = NativeMethods.GetDeviceContext(this, border);
+            IntPtr context = NativeMethods.GetDC(this.Handle);

            if (context == IntPtr.Zero){
                MessageBox.Show("Could not retrieve a graphics context handle for the notification window to take the screenshot.", "Screenshot Failed", MessageBoxButtons.OK, MessageBoxIcon.Error);
            }
            else{
-                using(Bitmap bmp = new Bitmap(border ? Width : ClientSize.Width, border ? Height : ClientSize.Height, PixelFormat.Format32bppRgb)){
+                using(Bitmap bmp = new Bitmap(ClientSize.Width, ClientSize.Height, PixelFormat.Format32bppRgb)){
                    try{
                        NativeMethods.RenderSourceIntoBitmap(context, bmp);
                    }finally{
-                        NativeMethods.ReleaseDeviceContext(this, context);
+                        NativeMethods.ReleaseDC(this.Handle, context);
                    }

                    Clipboard.SetImage(bmp);
--- a/Core/Notification/Screenshot/TweetScreenshotManager.cs
+++ b/Core/Notification/Screenshot/TweetScreenshotManager.cs
@@ -44,7 +44,7 @@ namespace TweetDck.Core.Notification.Screenshot{
                CanMoveWindow = () => false
            };

-            screenshot.LoadNotificationForScreenshot(new TweetNotification(html, string.Empty, 0), width, height);
+            screenshot.LoadNotificationForScreenshot(new TweetNotification(string.Empty, html, string.Empty, 0), width, height);
            screenshot.Show();
            timeout.Start();
        }
--- a/Core/Notification/TweetNotification.cs
+++ b/Core/Notification/TweetNotification.cs
@@ -35,7 +35,7 @@ namespace TweetDck.Core.Notification{
                    #endif
                }

-                return new TweetNotification(ExampleTweetHTML, "", 95, true);
+                return new TweetNotification("Home", ExampleTweetHTML, "", 95, true);
            }
        }

@@ -51,20 +51,28 @@ namespace TweetDck.Core.Notification{
            TopLeft, TopRight, BottomLeft, BottomRight, Custom
        }

+        public string Column{
+            get{
+                return column;
+            }
+        }
+
        public string Url{
            get{
                return url;
            }
        }

+        private readonly string column;
        private readonly string html;
        private readonly string url;
        private readonly int characters;
        private readonly bool isExample;

-        public TweetNotification(string html, string url, int characters) : this(html, url, characters, false){}
+        public TweetNotification(string column, string html, string url, int characters) : this(column, html, url, characters, false){}

-        private TweetNotification(string html, string url, int characters, bool isExample){
+        private TweetNotification(string column, string html, string url, int characters, bool isExample){
+            this.column = column;
            this.html = html;
            this.url = url;
            this.characters = characters;
--- a/Core/Other/FormAbout.Designer.cs
+++ b/Core/Other/FormAbout.Designer.cs
@@ -57,7 +57,7 @@ namespace TweetDck.Core.Other {
            this.labelDescription.Location = new System.Drawing.Point(114, 12);
            this.labelDescription.Name = "labelDescription";
            this.labelDescription.Size = new System.Drawing.Size(232, 109);
-            this.labelDescription.TabIndex = 1;
+            this.labelDescription.TabIndex = 0;
            // 
            // labelTips
            // 
@@ -68,7 +68,8 @@ namespace TweetDck.Core.Other {
            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.TabIndex = 1;
+            this.labelTips.TabStop = true;
            this.labelTips.Text = "Tips && Tricks";
            this.labelTips.TextAlign = System.Drawing.ContentAlignment.MiddleCenter;
            this.labelTips.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.OnLinkClicked);
@@ -83,7 +84,8 @@ namespace TweetDck.Core.Other {
            this.labelWebsite.Margin = new System.Windows.Forms.Padding(0);
            this.labelWebsite.Name = "labelWebsite";
            this.labelWebsite.Size = new System.Drawing.Size(117, 16);
-            this.labelWebsite.TabIndex = 2;
+            this.labelWebsite.TabIndex = 0;
+            this.labelWebsite.TabStop = true;
            this.labelWebsite.Text = "Official Website";
            this.labelWebsite.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
            this.labelWebsite.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.OnLinkClicked);
@@ -104,7 +106,7 @@ namespace TweetDck.Core.Other {
            this.tablePanelLinks.RowCount = 1;
            this.tablePanelLinks.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
            this.tablePanelLinks.Size = new System.Drawing.Size(334, 16);
-            this.tablePanelLinks.TabIndex = 4;
+            this.tablePanelLinks.TabIndex = 1;
            // 
            // labelIssues
            // 
@@ -115,7 +117,8 @@ namespace TweetDck.Core.Other {
            this.labelIssues.Margin = new System.Windows.Forms.Padding(0);
            this.labelIssues.Name = "labelIssues";
            this.labelIssues.Size = new System.Drawing.Size(118, 16);
-            this.labelIssues.TabIndex = 4;
+            this.labelIssues.TabIndex = 2;
+            this.labelIssues.TabStop = true;
            this.labelIssues.Text = "Report an Issue";
            this.labelIssues.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
            this.labelIssues.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.OnLinkClicked);
--- a/Core/Other/FormPlugins.Designer.cs
+++ b/Core/Other/FormPlugins.Designer.cs
@@ -76,7 +76,7 @@
            this.tabPanelPlugins.Location = new System.Drawing.Point(12, 12);
            this.tabPanelPlugins.Name = "tabPanelPlugins";
            this.tabPanelPlugins.Size = new System.Drawing.Size(680, 421);
-            this.tabPanelPlugins.TabIndex = 4;
+            this.tabPanelPlugins.TabIndex = 0;
            // 
            // FormPlugins
            // 
--- a/Core/Other/Settings/Dialogs/DialogSettingsCSS.Designer.cs
+++ b/Core/Other/Settings/Dialogs/DialogSettingsCSS.Designer.cs
@@ -52,7 +52,7 @@
            this.textBoxBrowserCSS.Name = "textBoxBrowserCSS";
            this.textBoxBrowserCSS.ScrollBars = System.Windows.Forms.ScrollBars.Both;
            this.textBoxBrowserCSS.Size = new System.Drawing.Size(373, 253);
-            this.textBoxBrowserCSS.TabIndex = 0;
+            this.textBoxBrowserCSS.TabIndex = 1;
            this.textBoxBrowserCSS.WordWrap = false;
            this.textBoxBrowserCSS.KeyUp += new System.Windows.Forms.KeyEventHandler(this.textBoxBrowserCSS_KeyUp);
            // 
@@ -63,7 +63,7 @@
            this.btnCancel.Name = "btnCancel";
            this.btnCancel.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
            this.btnCancel.Size = new System.Drawing.Size(56, 23);
-            this.btnCancel.TabIndex = 1;
+            this.btnCancel.TabIndex = 2;
            this.btnCancel.Text = "Cancel";
            this.btnCancel.UseVisualStyleBackColor = true;
            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
@@ -75,7 +75,7 @@
            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);
-            this.btnApply.TabIndex = 2;
+            this.btnApply.TabIndex = 1;
            this.btnApply.Text = "Apply";
            this.btnApply.UseVisualStyleBackColor = true;
            this.btnApply.Click += new System.EventHandler(this.btnApply_Click);
@@ -102,7 +102,7 @@
            this.splitContainer.Size = new System.Drawing.Size(760, 269);
            this.splitContainer.SplitterDistance = 373;
            this.splitContainer.SplitterWidth = 5;
-            this.splitContainer.TabIndex = 5;
+            this.splitContainer.TabIndex = 0;
            // 
            // labelBrowser
            // 
@@ -111,7 +111,7 @@
            this.labelBrowser.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
            this.labelBrowser.Name = "labelBrowser";
            this.labelBrowser.Size = new System.Drawing.Size(45, 13);
-            this.labelBrowser.TabIndex = 1;
+            this.labelBrowser.TabIndex = 0;
            this.labelBrowser.Text = "Browser";
            // 
            // labelNotification
@@ -121,7 +121,7 @@
            this.labelNotification.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
            this.labelNotification.Name = "labelNotification";
            this.labelNotification.Size = new System.Drawing.Size(60, 13);
-            this.labelNotification.TabIndex = 2;
+            this.labelNotification.TabIndex = 0;
            this.labelNotification.Text = "Notification";
            // 
            // textBoxNotificationCSS
@@ -135,7 +135,7 @@
            this.textBoxNotificationCSS.Multiline = true;
            this.textBoxNotificationCSS.Name = "textBoxNotificationCSS";
            this.textBoxNotificationCSS.ScrollBars = System.Windows.Forms.ScrollBars.Both;
-            this.textBoxNotificationCSS.Size = new System.Drawing.Size(373, 253);
+            this.textBoxNotificationCSS.Size = new System.Drawing.Size(372, 253);
            this.textBoxNotificationCSS.TabIndex = 1;
            this.textBoxNotificationCSS.WordWrap = false;
            // 
@@ -146,7 +146,7 @@
            this.labelWarning.Location = new System.Drawing.Point(91, 292);
            this.labelWarning.Name = "labelWarning";
            this.labelWarning.Size = new System.Drawing.Size(341, 13);
-            this.labelWarning.TabIndex = 6;
+            this.labelWarning.TabIndex = 3;
            this.labelWarning.Text = "The code is not validated, please make sure there are no syntax errors.";
            // 
            // btnOpenWiki
@@ -157,7 +157,7 @@
            this.btnOpenWiki.Name = "btnOpenWiki";
            this.btnOpenWiki.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
            this.btnOpenWiki.Size = new System.Drawing.Size(73, 23);
-            this.btnOpenWiki.TabIndex = 7;
+            this.btnOpenWiki.TabIndex = 4;
            this.btnOpenWiki.Text = "Open Wiki";
            this.btnOpenWiki.UseVisualStyleBackColor = true;
            this.btnOpenWiki.Click += new System.EventHandler(this.btnOpenWiki_Click);
--- a/Core/Other/Settings/Dialogs/DialogSettingsCefArgs.Designer.cs
+++ b/Core/Other/Settings/Dialogs/DialogSettingsCefArgs.Designer.cs
@@ -40,7 +40,7 @@
            this.textBoxArgs.Multiline = true;
            this.textBoxArgs.Name = "textBoxArgs";
            this.textBoxArgs.Size = new System.Drawing.Size(460, 193);
-            this.textBoxArgs.TabIndex = 0;
+            this.textBoxArgs.TabIndex = 1;
            // 
            // btnCancel
            // 
@@ -49,7 +49,7 @@
            this.btnCancel.Name = "btnCancel";
            this.btnCancel.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
            this.btnCancel.Size = new System.Drawing.Size(56, 23);
-            this.btnCancel.TabIndex = 1;
+            this.btnCancel.TabIndex = 3;
            this.btnCancel.Text = "Cancel";
            this.btnCancel.UseVisualStyleBackColor = true;
            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
@@ -74,7 +74,7 @@
            this.btnHelp.Name = "btnHelp";
            this.btnHelp.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
            this.btnHelp.Size = new System.Drawing.Size(124, 23);
-            this.btnHelp.TabIndex = 3;
+            this.btnHelp.TabIndex = 4;
            this.btnHelp.Text = "List of Chromium Args";
            this.btnHelp.UseVisualStyleBackColor = true;
            this.btnHelp.Click += new System.EventHandler(this.btnHelp_Click);
@@ -86,7 +86,7 @@
            this.labelWarning.Margin = new System.Windows.Forms.Padding(3, 0, 3, 3);
            this.labelWarning.Name = "labelWarning";
            this.labelWarning.Size = new System.Drawing.Size(423, 13);
-            this.labelWarning.TabIndex = 4;
+            this.labelWarning.TabIndex = 0;
            this.labelWarning.Text = "Warning: Some arguments may cause the program to stop working, edit at your own r" +
    "isk.";
            // 
--- a/Core/Other/Settings/Dialogs/DialogSettingsExport.Designer.cs
+++ b/Core/Other/Settings/Dialogs/DialogSettingsExport.Designer.cs
@@ -40,7 +40,7 @@
            this.btnCancel.Name = "btnCancel";
            this.btnCancel.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
            this.btnCancel.Size = new System.Drawing.Size(56, 23);
-            this.btnCancel.TabIndex = 0;
+            this.btnCancel.TabIndex = 4;
            this.btnCancel.Text = "Cancel";
            this.btnCancel.UseVisualStyleBackColor = true;
            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
@@ -54,7 +54,7 @@
            this.btnApply.Name = "btnApply";
            this.btnApply.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
            this.btnApply.Size = new System.Drawing.Size(26, 23);
-            this.btnApply.TabIndex = 1;
+            this.btnApply.TabIndex = 3;
            this.btnApply.Text = " ";
            this.btnApply.UseVisualStyleBackColor = true;
            this.btnApply.Click += new System.EventHandler(this.btnApply_Click);
@@ -65,7 +65,7 @@
            this.cbConfig.Location = new System.Drawing.Point(13, 13);
            this.cbConfig.Name = "cbConfig";
            this.cbConfig.Size = new System.Drawing.Size(106, 17);
-            this.cbConfig.TabIndex = 2;
+            this.cbConfig.TabIndex = 0;
            this.cbConfig.Text = "Program Settings";
            this.toolTip.SetToolTip(this.cbConfig, "Interface, notification, and update settings.\r\nIncludes a list of disabled plugin" +
        "s.");
@@ -78,7 +78,7 @@
            this.cbSession.Location = new System.Drawing.Point(13, 37);
            this.cbSession.Name = "cbSession";
            this.cbSession.Size = new System.Drawing.Size(92, 17);
-            this.cbSession.TabIndex = 3;
+            this.cbSession.TabIndex = 1;
            this.cbSession.Text = "Login Session";
            this.toolTip.SetToolTip(this.cbSession, "A token that allows logging into the\r\ncurrent TweetDeck account.");
            this.cbSession.UseVisualStyleBackColor = true;
@@ -90,7 +90,7 @@
            this.cbPluginData.Location = new System.Drawing.Point(13, 61);
            this.cbPluginData.Name = "cbPluginData";
            this.cbPluginData.Size = new System.Drawing.Size(81, 17);
-            this.cbPluginData.TabIndex = 4;
+            this.cbPluginData.TabIndex = 2;
            this.cbPluginData.Text = "Plugin Data";
            this.toolTip.SetToolTip(this.cbPluginData, "Data files generated by plugins.\r\nDoes not include the plugins themselves.");
            this.cbPluginData.UseVisualStyleBackColor = true;
--- a/Core/Other/Settings/Dialogs/DialogSettingsRestart.Designer.cs
+++ b/Core/Other/Settings/Dialogs/DialogSettingsRestart.Designer.cs
@@ -43,7 +43,7 @@
            this.btnCancel.Name = "btnCancel";
            this.btnCancel.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
            this.btnCancel.Size = new System.Drawing.Size(56, 23);
-            this.btnCancel.TabIndex = 1;
+            this.btnCancel.TabIndex = 7;
            this.btnCancel.Text = "Cancel";
            this.btnCancel.UseVisualStyleBackColor = true;
            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
@@ -56,7 +56,7 @@
            this.btnRestart.Name = "btnRestart";
            this.btnRestart.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
            this.btnRestart.Size = new System.Drawing.Size(57, 23);
-            this.btnRestart.TabIndex = 2;
+            this.btnRestart.TabIndex = 6;
            this.btnRestart.Text = "Restart";
            this.btnRestart.UseVisualStyleBackColor = true;
            this.btnRestart.Click += new System.EventHandler(this.btnRestart_Click);
@@ -67,7 +67,7 @@
            this.cbLogging.Location = new System.Drawing.Point(12, 12);
            this.cbLogging.Name = "cbLogging";
            this.cbLogging.Size = new System.Drawing.Size(64, 17);
-            this.cbLogging.TabIndex = 3;
+            this.cbLogging.TabIndex = 0;
            this.cbLogging.Text = "Logging";
            this.toolTip.SetToolTip(this.cbLogging, "Logging JavaScript output into a\r\ndebug.txt file in the data folder.");
            this.cbLogging.UseVisualStyleBackColor = true;
@@ -78,7 +78,7 @@
            this.cbDebugUpdates.Location = new System.Drawing.Point(12, 35);
            this.cbDebugUpdates.Name = "cbDebugUpdates";
            this.cbDebugUpdates.Size = new System.Drawing.Size(127, 17);
-            this.cbDebugUpdates.TabIndex = 4;
+            this.cbDebugUpdates.TabIndex = 1;
            this.cbDebugUpdates.Text = "Pre-Release Updates";
            this.toolTip.SetToolTip(this.cbDebugUpdates, "Allows updating to pre-releases.");
            this.cbDebugUpdates.UseVisualStyleBackColor = true;
@@ -90,7 +90,7 @@
            this.labelLocale.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
            this.labelLocale.Name = "labelLocale";
            this.labelLocale.Size = new System.Drawing.Size(39, 13);
-            this.labelLocale.TabIndex = 5;
+            this.labelLocale.TabIndex = 2;
            this.labelLocale.Text = "Locale";
            // 
            // comboLocale
@@ -101,7 +101,7 @@
            this.comboLocale.Location = new System.Drawing.Point(15, 83);
            this.comboLocale.Name = "comboLocale";
            this.comboLocale.Size = new System.Drawing.Size(201, 21);
-            this.comboLocale.TabIndex = 6;
+            this.comboLocale.TabIndex = 3;
            // 
            // labelDataFolder
            // 
@@ -110,7 +110,7 @@
            this.labelDataFolder.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
            this.labelDataFolder.Name = "labelDataFolder";
            this.labelDataFolder.Size = new System.Drawing.Size(62, 13);
-            this.labelDataFolder.TabIndex = 7;
+            this.labelDataFolder.TabIndex = 4;
            this.labelDataFolder.Text = "Data Folder";
            // 
            // tbDataFolder
@@ -120,7 +120,7 @@
            this.tbDataFolder.Location = new System.Drawing.Point(15, 135);
            this.tbDataFolder.Name = "tbDataFolder";
            this.tbDataFolder.Size = new System.Drawing.Size(201, 20);
-            this.tbDataFolder.TabIndex = 8;
+            this.tbDataFolder.TabIndex = 5;
            // 
            // DialogSettingsRestart
            // 
--- a/Core/Other/Settings/TabSettingsAdvanced.Designer.cs
+++ b/Core/Other/Settings/TabSettingsAdvanced.Designer.cs
@@ -49,7 +49,7 @@
            this.btnClearCache.Location = new System.Drawing.Point(6, 44);
            this.btnClearCache.Name = "btnClearCache";
            this.btnClearCache.Size = new System.Drawing.Size(171, 23);
-            this.btnClearCache.TabIndex = 14;
+            this.btnClearCache.TabIndex = 1;
            this.btnClearCache.Text = "Clear Cache (calculating)";
            this.toolTip.SetToolTip(this.btnClearCache, "Clearing cache will free up space taken by downloaded images and other resources." +
        "");
@@ -58,11 +58,11 @@
            // checkHardwareAcceleration
            // 
            this.checkHardwareAcceleration.AutoSize = true;
-            this.checkHardwareAcceleration.Location = new System.Drawing.Point(6, 21);
-            this.checkHardwareAcceleration.Margin = new System.Windows.Forms.Padding(3, 5, 3, 3);
+            this.checkHardwareAcceleration.Location = new System.Drawing.Point(9, 21);
+            this.checkHardwareAcceleration.Margin = new System.Windows.Forms.Padding(6, 5, 3, 3);
            this.checkHardwareAcceleration.Name = "checkHardwareAcceleration";
            this.checkHardwareAcceleration.Size = new System.Drawing.Size(134, 17);
-            this.checkHardwareAcceleration.TabIndex = 12;
+            this.checkHardwareAcceleration.TabIndex = 0;
            this.checkHardwareAcceleration.Text = "Hardware Acceleration";
            this.toolTip.SetToolTip(this.checkHardwareAcceleration, "Uses your graphics card to improve performance.\r\nDisable if you experience issues" +
        " with rendering.");
@@ -73,7 +73,7 @@
            this.btnEditCefArgs.Location = new System.Drawing.Point(6, 19);
            this.btnEditCefArgs.Name = "btnEditCefArgs";
            this.btnEditCefArgs.Size = new System.Drawing.Size(171, 23);
-            this.btnEditCefArgs.TabIndex = 15;
+            this.btnEditCefArgs.TabIndex = 0;
            this.btnEditCefArgs.Text = "Edit CEF Arguments";
            this.toolTip.SetToolTip(this.btnEditCefArgs, "Set custom command line arguments for Chromium Embedded Framework.");
            this.btnEditCefArgs.UseVisualStyleBackColor = true;
@@ -83,7 +83,7 @@
            this.btnEditCSS.Location = new System.Drawing.Point(6, 48);
            this.btnEditCSS.Name = "btnEditCSS";
            this.btnEditCSS.Size = new System.Drawing.Size(171, 23);
-            this.btnEditCSS.TabIndex = 16;
+            this.btnEditCSS.TabIndex = 1;
            this.btnEditCSS.Text = "Edit CSS";
            this.toolTip.SetToolTip(this.btnEditCSS, "Set custom CSS for browser and notification windows.");
            this.btnEditCSS.UseVisualStyleBackColor = true;
@@ -93,7 +93,7 @@
            this.btnRestartArgs.Location = new System.Drawing.Point(6, 106);
            this.btnRestartArgs.Name = "btnRestartArgs";
            this.btnRestartArgs.Size = new System.Drawing.Size(171, 23);
-            this.btnRestartArgs.TabIndex = 18;
+            this.btnRestartArgs.TabIndex = 3;
            this.btnRestartArgs.Text = "Restart with Arguments";
            this.toolTip.SetToolTip(this.btnRestartArgs, "Restarts the program with customizable\r\ncommand line arguments.");
            this.btnRestartArgs.UseVisualStyleBackColor = true;
@@ -103,7 +103,7 @@
            this.btnRestart.Location = new System.Drawing.Point(6, 77);
            this.btnRestart.Name = "btnRestart";
            this.btnRestart.Size = new System.Drawing.Size(171, 23);
-            this.btnRestart.TabIndex = 17;
+            this.btnRestart.TabIndex = 2;
            this.btnRestart.Text = "Restart the Program";
            this.toolTip.SetToolTip(this.btnRestart, "Restarts the program using the same command\r\nline arguments that were used at lau" +
        "nch.");
@@ -114,7 +114,7 @@
            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.TabIndex = 0;
            this.btnOpenAppFolder.Text = "Open Program Folder";
            this.toolTip.SetToolTip(this.btnOpenAppFolder, "Opens the folder where the app is located.");
            this.btnOpenAppFolder.UseVisualStyleBackColor = true;
@@ -124,7 +124,7 @@
            this.btnOpenDataFolder.Location = new System.Drawing.Point(6, 48);
            this.btnOpenDataFolder.Name = "btnOpenDataFolder";
            this.btnOpenDataFolder.Size = new System.Drawing.Size(171, 23);
-            this.btnOpenDataFolder.TabIndex = 19;
+            this.btnOpenDataFolder.TabIndex = 1;
            this.btnOpenDataFolder.Text = "Open Data Folder";
            this.toolTip.SetToolTip(this.btnOpenDataFolder, "Opens the folder where your profile data is located.");
            this.btnOpenDataFolder.UseVisualStyleBackColor = true;
@@ -137,7 +137,7 @@
            this.btnReset.Name = "btnReset";
            this.btnReset.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
            this.btnReset.Size = new System.Drawing.Size(102, 23);
-            this.btnReset.TabIndex = 17;
+            this.btnReset.TabIndex = 5;
            this.btnReset.Text = "Restore Defaults";
            this.btnReset.UseVisualStyleBackColor = true;
            // 
@@ -149,7 +149,7 @@
            this.btnImport.Name = "btnImport";
            this.btnImport.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
            this.btnImport.Size = new System.Drawing.Size(84, 23);
-            this.btnImport.TabIndex = 16;
+            this.btnImport.TabIndex = 4;
            this.btnImport.Text = "Import Profile";
            this.btnImport.UseVisualStyleBackColor = true;
            // 
@@ -162,7 +162,7 @@
            this.btnExport.Name = "btnExport";
            this.btnExport.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
            this.btnExport.Size = new System.Drawing.Size(85, 23);
-            this.btnExport.TabIndex = 15;
+            this.btnExport.TabIndex = 3;
            this.btnExport.Text = "Export Profile";
            this.btnExport.UseVisualStyleBackColor = true;
            // 
@@ -173,7 +173,7 @@
            this.groupPerformance.Location = new System.Drawing.Point(9, 9);
            this.groupPerformance.Name = "groupPerformance";
            this.groupPerformance.Size = new System.Drawing.Size(183, 74);
-            this.groupPerformance.TabIndex = 18;
+            this.groupPerformance.TabIndex = 0;
            this.groupPerformance.TabStop = false;
            this.groupPerformance.Text = "Performance";
            // 
@@ -184,7 +184,7 @@
            this.groupConfiguration.Location = new System.Drawing.Point(9, 89);
            this.groupConfiguration.Name = "groupConfiguration";
            this.groupConfiguration.Size = new System.Drawing.Size(183, 77);
-            this.groupConfiguration.TabIndex = 19;
+            this.groupConfiguration.TabIndex = 1;
            this.groupConfiguration.TabStop = false;
            this.groupConfiguration.Text = "Configuration";
            // 
@@ -197,7 +197,7 @@
            this.groupApp.Location = new System.Drawing.Point(198, 9);
            this.groupApp.Name = "groupApp";
            this.groupApp.Size = new System.Drawing.Size(183, 135);
-            this.groupApp.TabIndex = 20;
+            this.groupApp.TabIndex = 2;
            this.groupApp.TabStop = false;
            this.groupApp.Text = "App";
            // 
--- a/Core/Other/Settings/TabSettingsGeneral.Designer.cs
+++ b/Core/Other/Settings/TabSettingsGeneral.Designer.cs
@@ -29,13 +29,12 @@
            this.toolTip = new System.Windows.Forms.ToolTip(this.components);
            this.checkTrayHighlight = new System.Windows.Forms.CheckBox();
            this.checkSpellCheck = new System.Windows.Forms.CheckBox();
-            this.checkScreenshotBorder = new System.Windows.Forms.CheckBox();
+            this.checkUpdateNotifications = new System.Windows.Forms.CheckBox();
+            this.btnCheckUpdates = new System.Windows.Forms.Button();
            this.groupTray = new System.Windows.Forms.GroupBox();
            this.labelTrayIcon = new System.Windows.Forms.Label();
            this.groupInterface = new System.Windows.Forms.GroupBox();
            this.groupUpdates = new System.Windows.Forms.GroupBox();
-            this.checkUpdateNotifications = new System.Windows.Forms.CheckBox();
-            this.btnCheckUpdates = new System.Windows.Forms.Button();
            this.groupTray.SuspendLayout();
            this.groupInterface.SuspendLayout();
            this.groupUpdates.SuspendLayout();
@@ -45,10 +44,10 @@
            // 
            this.checkExpandLinks.AutoSize = true;
            this.checkExpandLinks.Location = new System.Drawing.Point(9, 21);
-            this.checkExpandLinks.Margin = new System.Windows.Forms.Padding(3, 5, 3, 3);
+            this.checkExpandLinks.Margin = new System.Windows.Forms.Padding(6, 5, 3, 3);
            this.checkExpandLinks.Name = "checkExpandLinks";
            this.checkExpandLinks.Size = new System.Drawing.Size(166, 17);
-            this.checkExpandLinks.TabIndex = 14;
+            this.checkExpandLinks.TabIndex = 0;
            this.checkExpandLinks.Text = "Expand Links When Hovered";
            this.toolTip.SetToolTip(this.checkExpandLinks, "Expands links inside the tweets. If disabled,\r\nthe full links show up in a toolti" +
        "p instead.");
@@ -61,17 +60,17 @@
            this.comboBoxTrayType.Location = new System.Drawing.Point(6, 19);
            this.comboBoxTrayType.Name = "comboBoxTrayType";
            this.comboBoxTrayType.Size = new System.Drawing.Size(171, 21);
-            this.comboBoxTrayType.TabIndex = 13;
+            this.comboBoxTrayType.TabIndex = 0;
            this.toolTip.SetToolTip(this.comboBoxTrayType, "Changes behavior of the Tray icon.\r\nRight-click the icon for an action menu.");
            // 
            // checkTrayHighlight
            // 
            this.checkTrayHighlight.AutoSize = true;
            this.checkTrayHighlight.Location = new System.Drawing.Point(9, 70);
-            this.checkTrayHighlight.Margin = new System.Windows.Forms.Padding(3, 5, 3, 3);
+            this.checkTrayHighlight.Margin = new System.Windows.Forms.Padding(6, 5, 3, 3);
            this.checkTrayHighlight.Name = "checkTrayHighlight";
            this.checkTrayHighlight.Size = new System.Drawing.Size(103, 17);
-            this.checkTrayHighlight.TabIndex = 15;
+            this.checkTrayHighlight.TabIndex = 2;
            this.checkTrayHighlight.Text = "Enable Highlight";
            this.toolTip.SetToolTip(this.checkTrayHighlight, "Highlights the tray icon if there are new tweets.\r\nOnly works for columns with po" +
        "pup or audio notifications.\r\nThe icon resets when the main window is restored.");
@@ -81,78 +80,22 @@
            // 
            this.checkSpellCheck.AutoSize = true;
            this.checkSpellCheck.Location = new System.Drawing.Point(9, 44);
+            this.checkSpellCheck.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
            this.checkSpellCheck.Name = "checkSpellCheck";
            this.checkSpellCheck.Size = new System.Drawing.Size(119, 17);
-            this.checkSpellCheck.TabIndex = 15;
+            this.checkSpellCheck.TabIndex = 1;
            this.checkSpellCheck.Text = "Enable Spell Check";
            this.toolTip.SetToolTip(this.checkSpellCheck, "Underlines words that are spelled incorrectly.");
            this.checkSpellCheck.UseVisualStyleBackColor = true;
            // 
-            // checkScreenshotBorder
-            // 
-            this.checkScreenshotBorder.AutoSize = true;
-            this.checkScreenshotBorder.Location = new System.Drawing.Point(9, 67);
-            this.checkScreenshotBorder.Name = "checkScreenshotBorder";
-            this.checkScreenshotBorder.Size = new System.Drawing.Size(169, 17);
-            this.checkScreenshotBorder.TabIndex = 16;
-            this.checkScreenshotBorder.Text = "Include Border In Screenshots";
-            this.toolTip.SetToolTip(this.checkScreenshotBorder, "Shows the window border in tweet screenshots.\r\nMay be glitchy in some cases, espe" +
-        "cially on Windows 10.");
-            this.checkScreenshotBorder.UseVisualStyleBackColor = true;
-            // 
-            // 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, 109);
-            this.groupTray.Name = "groupTray";
-            this.groupTray.Size = new System.Drawing.Size(183, 93);
-            this.groupTray.TabIndex = 15;
-            this.groupTray.TabStop = false;
-            this.groupTray.Text = "System Tray";
-            // 
-            // labelTrayIcon
-            // 
-            this.labelTrayIcon.AutoSize = true;
-            this.labelTrayIcon.Location = new System.Drawing.Point(6, 52);
-            this.labelTrayIcon.Margin = new System.Windows.Forms.Padding(3, 9, 3, 0);
-            this.labelTrayIcon.Name = "labelTrayIcon";
-            this.labelTrayIcon.Size = new System.Drawing.Size(52, 13);
-            this.labelTrayIcon.TabIndex = 14;
-            this.labelTrayIcon.Text = "Tray Icon";
-            // 
-            // groupInterface
-            // 
-            this.groupInterface.Controls.Add(this.checkScreenshotBorder);
-            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, 90);
-            this.groupInterface.TabIndex = 16;
-            this.groupInterface.TabStop = false;
-            this.groupInterface.Text = "User Interface";
-            // 
-            // groupUpdates
-            // 
-            this.groupUpdates.Controls.Add(this.checkUpdateNotifications);
-            this.groupUpdates.Controls.Add(this.btnCheckUpdates);
-            this.groupUpdates.Location = new System.Drawing.Point(198, 9);
-            this.groupUpdates.Name = "groupUpdates";
-            this.groupUpdates.Size = new System.Drawing.Size(183, 75);
-            this.groupUpdates.TabIndex = 17;
-            this.groupUpdates.TabStop = false;
-            this.groupUpdates.Text = "Updates";
-            // 
            // checkUpdateNotifications
            // 
            this.checkUpdateNotifications.AutoSize = true;
-            this.checkUpdateNotifications.Location = new System.Drawing.Point(6, 21);
-            this.checkUpdateNotifications.Margin = new System.Windows.Forms.Padding(3, 5, 3, 3);
+            this.checkUpdateNotifications.Location = new System.Drawing.Point(9, 21);
+            this.checkUpdateNotifications.Margin = new System.Windows.Forms.Padding(6, 5, 3, 3);
            this.checkUpdateNotifications.Name = "checkUpdateNotifications";
            this.checkUpdateNotifications.Size = new System.Drawing.Size(165, 17);
-            this.checkUpdateNotifications.TabIndex = 14;
+            this.checkUpdateNotifications.TabIndex = 0;
            this.checkUpdateNotifications.Text = "Check Updates Automatically";
            this.toolTip.SetToolTip(this.checkUpdateNotifications, "Checks for updates every hour.\r\nIf an update is dismissed, it will not appear aga" +
        "in.");
@@ -163,11 +106,55 @@
            this.btnCheckUpdates.Location = new System.Drawing.Point(6, 44);
            this.btnCheckUpdates.Name = "btnCheckUpdates";
            this.btnCheckUpdates.Size = new System.Drawing.Size(171, 23);
-            this.btnCheckUpdates.TabIndex = 15;
+            this.btnCheckUpdates.TabIndex = 1;
            this.btnCheckUpdates.Text = "Check Updates Now";
            this.toolTip.SetToolTip(this.btnCheckUpdates, "Forces an update check, even for updates that had been dismissed.");
            this.btnCheckUpdates.UseVisualStyleBackColor = true;
            // 
+            // groupTray
+            // 
+            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, 82);
+            this.groupTray.Name = "groupTray";
+            this.groupTray.Size = new System.Drawing.Size(183, 93);
+            this.groupTray.TabIndex = 1;
+            this.groupTray.TabStop = false;
+            this.groupTray.Text = "System Tray";
+            // 
+            // labelTrayIcon
+            // 
+            this.labelTrayIcon.AutoSize = true;
+            this.labelTrayIcon.Location = new System.Drawing.Point(6, 52);
+            this.labelTrayIcon.Margin = new System.Windows.Forms.Padding(3, 9, 3, 0);
+            this.labelTrayIcon.Name = "labelTrayIcon";
+            this.labelTrayIcon.Size = new System.Drawing.Size(52, 13);
+            this.labelTrayIcon.TabIndex = 1;
+            this.labelTrayIcon.Text = "Tray Icon";
+            // 
+            // groupInterface
+            // 
+            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, 67);
+            this.groupInterface.TabIndex = 0;
+            this.groupInterface.TabStop = false;
+            this.groupInterface.Text = "User Interface";
+            // 
+            // groupUpdates
+            // 
+            this.groupUpdates.Controls.Add(this.checkUpdateNotifications);
+            this.groupUpdates.Controls.Add(this.btnCheckUpdates);
+            this.groupUpdates.Location = new System.Drawing.Point(198, 9);
+            this.groupUpdates.Name = "groupUpdates";
+            this.groupUpdates.Size = new System.Drawing.Size(183, 75);
+            this.groupUpdates.TabIndex = 2;
+            this.groupUpdates.TabStop = false;
+            this.groupUpdates.Text = "Updates";
+            // 
            // TabSettingsGeneral
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -197,7 +184,6 @@
        private System.Windows.Forms.Label labelTrayIcon;
        private System.Windows.Forms.CheckBox checkTrayHighlight;
        private System.Windows.Forms.CheckBox checkSpellCheck;
-        private System.Windows.Forms.CheckBox checkScreenshotBorder;
        private System.Windows.Forms.GroupBox groupUpdates;
        private System.Windows.Forms.CheckBox checkUpdateNotifications;
        private System.Windows.Forms.Button btnCheckUpdates;
--- a/Core/Other/Settings/TabSettingsGeneral.cs
+++ b/Core/Other/Settings/TabSettingsGeneral.cs
@@ -24,7 +24,6 @@ namespace TweetDck.Core.Other.Settings{

            checkExpandLinks.Checked = Config.ExpandLinksOnHover;
            checkSpellCheck.Checked = Config.EnableSpellCheck;
-            checkScreenshotBorder.Checked = Config.ShowScreenshotBorder;
            checkTrayHighlight.Checked = Config.EnableTrayHighlight;

            checkUpdateNotifications.Checked = Config.EnableUpdateCheck;
@@ -33,7 +32,6 @@ namespace TweetDck.Core.Other.Settings{
        public override void OnReady(){
            checkExpandLinks.CheckedChanged += checkExpandLinks_CheckedChanged;
            checkSpellCheck.CheckedChanged += checkSpellCheck_CheckedChanged;
-            checkScreenshotBorder.CheckedChanged += checkScreenshotBorder_CheckedChanged;

            comboBoxTrayType.SelectedIndexChanged += comboBoxTrayType_SelectedIndexChanged;
            checkTrayHighlight.CheckedChanged += checkTrayHighlight_CheckedChanged;
@@ -51,10 +49,6 @@ namespace TweetDck.Core.Other.Settings{
            PromptRestart();
        }

-        private void checkScreenshotBorder_CheckedChanged(object sender, EventArgs e){
-            Config.ShowScreenshotBorder = checkScreenshotBorder.Checked;
-        }
-
        private void comboBoxTrayType_SelectedIndexChanged(object sender, EventArgs e){
            Config.TrayBehavior = (TrayIcon.Behavior)comboBoxTrayType.SelectedIndex;
        }
--- a/Core/Other/Settings/TabSettingsNotifications.Designer.cs
+++ b/Core/Other/Settings/TabSettingsNotifications.Designer.cs
@@ -43,6 +43,7 @@
            this.labelDurationValue = new System.Windows.Forms.Label();
            this.trackBarDuration = new System.Windows.Forms.TrackBar();
            this.groupUserInterface = new System.Windows.Forms.GroupBox();
+            this.checkColumnName = new System.Windows.Forms.CheckBox();
            this.labelIdlePause = new System.Windows.Forms.Label();
            this.comboBoxIdlePause = new System.Windows.Forms.ComboBox();
            this.checkNonIntrusive = new System.Windows.Forms.CheckBox();
@@ -72,7 +73,7 @@
            this.groupNotificationLocation.Location = new System.Drawing.Point(198, 9);
            this.groupNotificationLocation.Name = "groupNotificationLocation";
            this.groupNotificationLocation.Size = new System.Drawing.Size(183, 264);
-            this.groupNotificationLocation.TabIndex = 1;
+            this.groupNotificationLocation.TabIndex = 2;
            this.groupNotificationLocation.TabStop = false;
            this.groupNotificationLocation.Text = "Location";
            // 
@@ -83,18 +84,18 @@
            this.labelEdgeDistanceValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
            this.labelEdgeDistanceValue.Name = "labelEdgeDistanceValue";
            this.labelEdgeDistanceValue.Size = new System.Drawing.Size(34, 13);
-            this.labelEdgeDistanceValue.TabIndex = 11;
+            this.labelEdgeDistanceValue.TabIndex = 9;
            this.labelEdgeDistanceValue.Text = "0 px";
            this.labelEdgeDistanceValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
            // 
            // labelDisplay
            // 
            this.labelDisplay.AutoSize = true;
-            this.labelDisplay.Location = new System.Drawing.Point(3, 148);
+            this.labelDisplay.Location = new System.Drawing.Point(5, 144);
            this.labelDisplay.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
            this.labelDisplay.Name = "labelDisplay";
            this.labelDisplay.Size = new System.Drawing.Size(41, 13);
-            this.labelDisplay.TabIndex = 8;
+            this.labelDisplay.TabIndex = 5;
            this.labelDisplay.Text = "Display";
            // 
            // comboBoxDisplay
@@ -103,25 +104,26 @@
            | System.Windows.Forms.AnchorStyles.Right)));
            this.comboBoxDisplay.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.comboBoxDisplay.FormattingEnabled = true;
-            this.comboBoxDisplay.Location = new System.Drawing.Point(6, 164);
+            this.comboBoxDisplay.Location = new System.Drawing.Point(8, 160);
            this.comboBoxDisplay.Name = "comboBoxDisplay";
            this.comboBoxDisplay.Size = new System.Drawing.Size(171, 21);
-            this.comboBoxDisplay.TabIndex = 7;
+            this.comboBoxDisplay.TabIndex = 6;
            // 
            // labelEdgeDistance
            // 
            this.labelEdgeDistance.AutoSize = true;
-            this.labelEdgeDistance.Location = new System.Drawing.Point(3, 197);
+            this.labelEdgeDistance.Location = new System.Drawing.Point(5, 193);
            this.labelEdgeDistance.Margin = new System.Windows.Forms.Padding(3, 9, 3, 0);
            this.labelEdgeDistance.Name = "labelEdgeDistance";
            this.labelEdgeDistance.Size = new System.Drawing.Size(103, 13);
-            this.labelEdgeDistance.TabIndex = 6;
+            this.labelEdgeDistance.TabIndex = 7;
            this.labelEdgeDistance.Text = "Distance From Edge";
            // 
            // radioLocCustom
            // 
            this.radioLocCustom.AutoSize = true;
-            this.radioLocCustom.Location = new System.Drawing.Point(7, 116);
+            this.radioLocCustom.Location = new System.Drawing.Point(8, 112);
+            this.radioLocCustom.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
            this.radioLocCustom.Name = "radioLocCustom";
            this.radioLocCustom.Size = new System.Drawing.Size(60, 17);
            this.radioLocCustom.TabIndex = 4;
@@ -133,7 +135,8 @@
            // radioLocBR
            // 
            this.radioLocBR.AutoSize = true;
-            this.radioLocBR.Location = new System.Drawing.Point(7, 92);
+            this.radioLocBR.Location = new System.Drawing.Point(8, 89);
+            this.radioLocBR.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
            this.radioLocBR.Name = "radioLocBR";
            this.radioLocBR.Size = new System.Drawing.Size(86, 17);
            this.radioLocBR.TabIndex = 3;
@@ -144,7 +147,8 @@
            // radioLocBL
            // 
            this.radioLocBL.AutoSize = true;
-            this.radioLocBL.Location = new System.Drawing.Point(7, 68);
+            this.radioLocBL.Location = new System.Drawing.Point(8, 66);
+            this.radioLocBL.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
            this.radioLocBL.Name = "radioLocBL";
            this.radioLocBL.Size = new System.Drawing.Size(79, 17);
            this.radioLocBL.TabIndex = 2;
@@ -155,7 +159,8 @@
            // radioLocTR
            // 
            this.radioLocTR.AutoSize = true;
-            this.radioLocTR.Location = new System.Drawing.Point(7, 44);
+            this.radioLocTR.Location = new System.Drawing.Point(8, 43);
+            this.radioLocTR.Margin = new System.Windows.Forms.Padding(5, 3, 3, 3);
            this.radioLocTR.Name = "radioLocTR";
            this.radioLocTR.Size = new System.Drawing.Size(72, 17);
            this.radioLocTR.TabIndex = 1;
@@ -166,7 +171,8 @@
            // radioLocTL
            // 
            this.radioLocTL.AutoSize = true;
-            this.radioLocTL.Location = new System.Drawing.Point(7, 20);
+            this.radioLocTL.Location = new System.Drawing.Point(8, 20);
+            this.radioLocTL.Margin = new System.Windows.Forms.Padding(5, 4, 3, 3);
            this.radioLocTL.Name = "radioLocTL";
            this.radioLocTL.Size = new System.Drawing.Size(65, 17);
            this.radioLocTL.TabIndex = 0;
@@ -179,13 +185,13 @@
            this.trackBarEdgeDistance.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
            | System.Windows.Forms.AnchorStyles.Right)));
            this.trackBarEdgeDistance.LargeChange = 8;
-            this.trackBarEdgeDistance.Location = new System.Drawing.Point(6, 213);
+            this.trackBarEdgeDistance.Location = new System.Drawing.Point(8, 209);
            this.trackBarEdgeDistance.Maximum = 40;
            this.trackBarEdgeDistance.Minimum = 8;
            this.trackBarEdgeDistance.Name = "trackBarEdgeDistance";
            this.trackBarEdgeDistance.Size = new System.Drawing.Size(141, 45);
            this.trackBarEdgeDistance.SmallChange = 2;
-            this.trackBarEdgeDistance.TabIndex = 5;
+            this.trackBarEdgeDistance.TabIndex = 8;
            this.trackBarEdgeDistance.TickFrequency = 4;
            this.trackBarEdgeDistance.Value = 8;
            // 
@@ -194,10 +200,10 @@
            this.groupNotificationDuration.Controls.Add(this.tableLayoutDurationButtons);
            this.groupNotificationDuration.Controls.Add(this.labelDurationValue);
            this.groupNotificationDuration.Controls.Add(this.trackBarDuration);
-            this.groupNotificationDuration.Location = new System.Drawing.Point(9, 160);
+            this.groupNotificationDuration.Location = new System.Drawing.Point(9, 184);
            this.groupNotificationDuration.Name = "groupNotificationDuration";
            this.groupNotificationDuration.Size = new System.Drawing.Size(183, 89);
-            this.groupNotificationDuration.TabIndex = 9;
+            this.groupNotificationDuration.TabIndex = 1;
            this.groupNotificationDuration.TabStop = false;
            this.groupNotificationDuration.Text = "Duration";
            // 
@@ -217,7 +223,7 @@
            this.tableLayoutDurationButtons.RowCount = 1;
            this.tableLayoutDurationButtons.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
            this.tableLayoutDurationButtons.Size = new System.Drawing.Size(171, 27);
-            this.tableLayoutDurationButtons.TabIndex = 5;
+            this.tableLayoutDurationButtons.TabIndex = 2;
            // 
            // btnDurationMedium
            // 
@@ -230,7 +236,7 @@
            this.btnDurationMedium.Margin = new System.Windows.Forms.Padding(1);
            this.btnDurationMedium.Name = "btnDurationMedium";
            this.btnDurationMedium.Size = new System.Drawing.Size(59, 25);
-            this.btnDurationMedium.TabIndex = 2;
+            this.btnDurationMedium.TabIndex = 1;
            this.btnDurationMedium.Text = "Medium";
            this.btnDurationMedium.UseVisualStyleBackColor = true;
            // 
@@ -245,7 +251,7 @@
            this.btnDurationLong.Margin = new System.Windows.Forms.Padding(1);
            this.btnDurationLong.Name = "btnDurationLong";
            this.btnDurationLong.Size = new System.Drawing.Size(54, 25);
-            this.btnDurationLong.TabIndex = 1;
+            this.btnDurationLong.TabIndex = 2;
            this.btnDurationLong.Text = "Long";
            this.btnDurationLong.UseVisualStyleBackColor = true;
            // 
@@ -272,7 +278,7 @@
            this.labelDurationValue.Margin = new System.Windows.Forms.Padding(0, 0, 3, 0);
            this.labelDurationValue.Name = "labelDurationValue";
            this.labelDurationValue.Size = new System.Drawing.Size(48, 13);
-            this.labelDurationValue.TabIndex = 13;
+            this.labelDurationValue.TabIndex = 1;
            this.labelDurationValue.Text = "0 ms/c";
            this.labelDurationValue.TextAlign = System.Drawing.ContentAlignment.TopRight;
            this.toolTip.SetToolTip(this.labelDurationValue, "Milliseconds per character.");
@@ -286,12 +292,13 @@
            this.trackBarDuration.Minimum = 10;
            this.trackBarDuration.Name = "trackBarDuration";
            this.trackBarDuration.Size = new System.Drawing.Size(128, 45);
-            this.trackBarDuration.TabIndex = 12;
+            this.trackBarDuration.TabIndex = 0;
            this.trackBarDuration.TickFrequency = 5;
            this.trackBarDuration.Value = 25;
            // 
            // groupUserInterface
            // 
+            this.groupUserInterface.Controls.Add(this.checkColumnName);
            this.groupUserInterface.Controls.Add(this.labelIdlePause);
            this.groupUserInterface.Controls.Add(this.comboBoxIdlePause);
            this.groupUserInterface.Controls.Add(this.checkNonIntrusive);
@@ -299,40 +306,55 @@
            this.groupUserInterface.Controls.Add(this.checkNotificationTimer);
            this.groupUserInterface.Location = new System.Drawing.Point(9, 9);
            this.groupUserInterface.Name = "groupUserInterface";
-            this.groupUserInterface.Size = new System.Drawing.Size(183, 145);
-            this.groupUserInterface.TabIndex = 10;
+            this.groupUserInterface.Size = new System.Drawing.Size(183, 169);
+            this.groupUserInterface.TabIndex = 0;
            this.groupUserInterface.TabStop = false;
            this.groupUserInterface.Text = "General";
            // 
+            // checkColumnName
+            // 
+            this.checkColumnName.AutoSize = true;
+            this.checkColumnName.Location = new System.Drawing.Point(9, 21);
+            this.checkColumnName.Margin = new System.Windows.Forms.Padding(6, 5, 3, 3);
+            this.checkColumnName.Name = "checkColumnName";
+            this.checkColumnName.Size = new System.Drawing.Size(129, 17);
+            this.checkColumnName.TabIndex = 5;
+            this.checkColumnName.Text = "Display Column Name";
+            this.toolTip.SetToolTip(this.checkColumnName, "Shows column name each notification originated\r\nfrom in the notification window t" +
+        "itle.");
+            this.checkColumnName.UseVisualStyleBackColor = true;
+            // 
            // labelIdlePause
            // 
+            this.labelIdlePause.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left)));
            this.labelIdlePause.AutoSize = true;
-            this.labelIdlePause.Location = new System.Drawing.Point(3, 99);
+            this.labelIdlePause.Location = new System.Drawing.Point(3, 123);
            this.labelIdlePause.Margin = new System.Windows.Forms.Padding(3, 12, 3, 0);
            this.labelIdlePause.Name = "labelIdlePause";
            this.labelIdlePause.Size = new System.Drawing.Size(89, 13);
-            this.labelIdlePause.TabIndex = 10;
+            this.labelIdlePause.TabIndex = 3;
            this.labelIdlePause.Text = "Pause When Idle";
            // 
            // comboBoxIdlePause
            // 
-            this.comboBoxIdlePause.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            this.comboBoxIdlePause.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 
            | System.Windows.Forms.AnchorStyles.Right)));
            this.comboBoxIdlePause.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.comboBoxIdlePause.FormattingEnabled = true;
-            this.comboBoxIdlePause.Location = new System.Drawing.Point(6, 115);
+            this.comboBoxIdlePause.Location = new System.Drawing.Point(6, 139);
            this.comboBoxIdlePause.Name = "comboBoxIdlePause";
            this.comboBoxIdlePause.Size = new System.Drawing.Size(171, 21);
-            this.comboBoxIdlePause.TabIndex = 9;
+            this.comboBoxIdlePause.TabIndex = 4;
            this.toolTip.SetToolTip(this.comboBoxIdlePause, "Pauses new notifications after going idle for a set amount of time.");
            // 
            // checkNonIntrusive
            // 
            this.checkNonIntrusive.AutoSize = true;
-            this.checkNonIntrusive.Location = new System.Drawing.Point(6, 67);
+            this.checkNonIntrusive.Location = new System.Drawing.Point(9, 90);
+            this.checkNonIntrusive.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
            this.checkNonIntrusive.Name = "checkNonIntrusive";
            this.checkNonIntrusive.Size = new System.Drawing.Size(128, 17);
-            this.checkNonIntrusive.TabIndex = 7;
+            this.checkNonIntrusive.TabIndex = 2;
            this.checkNonIntrusive.Text = "Non-Intrusive Popups";
            this.toolTip.SetToolTip(this.checkNonIntrusive, "When not idle and the cursor is within the notification window area,\r\nit will be " +
        "delayed until the cursor moves away to prevent accidental clicks.");
@@ -341,10 +363,11 @@
            // checkTimerCountDown
            // 
            this.checkTimerCountDown.AutoSize = true;
-            this.checkTimerCountDown.Location = new System.Drawing.Point(6, 44);
+            this.checkTimerCountDown.Location = new System.Drawing.Point(9, 67);
+            this.checkTimerCountDown.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
            this.checkTimerCountDown.Name = "checkTimerCountDown";
            this.checkTimerCountDown.Size = new System.Drawing.Size(119, 17);
-            this.checkTimerCountDown.TabIndex = 6;
+            this.checkTimerCountDown.TabIndex = 1;
            this.checkTimerCountDown.Text = "Timer Counts Down";
            this.toolTip.SetToolTip(this.checkTimerCountDown, "The notification timer counts down instead of up.");
            this.checkTimerCountDown.UseVisualStyleBackColor = true;
@@ -352,11 +375,11 @@
            // checkNotificationTimer
            // 
            this.checkNotificationTimer.AutoSize = true;
-            this.checkNotificationTimer.Location = new System.Drawing.Point(6, 21);
-            this.checkNotificationTimer.Margin = new System.Windows.Forms.Padding(3, 5, 3, 3);
+            this.checkNotificationTimer.Location = new System.Drawing.Point(9, 44);
+            this.checkNotificationTimer.Margin = new System.Windows.Forms.Padding(6, 3, 3, 3);
            this.checkNotificationTimer.Name = "checkNotificationTimer";
            this.checkNotificationTimer.Size = new System.Drawing.Size(145, 17);
-            this.checkNotificationTimer.TabIndex = 4;
+            this.checkNotificationTimer.TabIndex = 0;
            this.checkNotificationTimer.Text = "Display Notification Timer";
            this.toolTip.SetToolTip(this.checkNotificationTimer, "Shows how much time is left before the current notification disappears.");
            this.checkNotificationTimer.UseVisualStyleBackColor = true;
@@ -411,5 +434,6 @@
        private System.Windows.Forms.CheckBox checkNonIntrusive;
        private System.Windows.Forms.Label labelIdlePause;
        private System.Windows.Forms.ComboBox comboBoxIdlePause;
+        private System.Windows.Forms.CheckBox checkColumnName;
    }
 }
--- a/Core/Other/Settings/TabSettingsNotifications.cs
+++ b/Core/Other/Settings/TabSettingsNotifications.cs
@@ -55,6 +55,7 @@ namespace TweetDck.Core.Other.Settings{

            comboBoxDisplay.SelectedIndex = Math.Min(comboBoxDisplay.Items.Count-1, Config.NotificationDisplay);
            
+            checkColumnName.Checked = Config.DisplayNotificationColumn;
            checkNotificationTimer.Checked = Config.DisplayNotificationTimer;
            checkTimerCountDown.Enabled = checkNotificationTimer.Checked;
            checkTimerCountDown.Checked = Config.NotificationTimerCountDown;
@@ -78,6 +79,7 @@ namespace TweetDck.Core.Other.Settings{
            btnDurationMedium.Click += btnDurationMedium_Click;
            btnDurationLong.Click += btnDurationLong_Click;

+            checkColumnName.CheckedChanged += checkColumnName_CheckedChanged;
            checkNotificationTimer.CheckedChanged += checkNotificationTimer_CheckedChanged;
            checkTimerCountDown.CheckedChanged += checkTimerCountDown_CheckedChanged;
            checkNonIntrusive.CheckedChanged += checkNonIntrusive_CheckedChanged;
@@ -138,6 +140,11 @@ namespace TweetDck.Core.Other.Settings{
            trackBarDuration.Value = 35;
        }

+        private void checkColumnName_CheckedChanged(object sender, EventArgs e){
+            Config.DisplayNotificationColumn = checkColumnName.Checked;
+            notification.ShowNotificationForSettings(false);
+        }
+
        private void checkNotificationTimer_CheckedChanged(object sender, EventArgs e){
            Config.DisplayNotificationTimer = checkNotificationTimer.Checked;
            checkTimerCountDown.Enabled = checkNotificationTimer.Checked;
--- a/Core/Other/Settings/TabSettingsSounds.Designer.cs
+++ b/Core/Other/Settings/TabSettingsSounds.Designer.cs
@@ -42,7 +42,7 @@
            this.groupCustomSound.Location = new System.Drawing.Point(9, 9);
            this.groupCustomSound.Name = "groupCustomSound";
            this.groupCustomSound.Size = new System.Drawing.Size(372, 75);
-            this.groupCustomSound.TabIndex = 11;
+            this.groupCustomSound.TabIndex = 0;
            this.groupCustomSound.TabStop = false;
            this.groupCustomSound.Text = "Custom Sound Notification";
            // 
@@ -53,7 +53,7 @@
            this.btnPlaySound.Name = "btnPlaySound";
            this.btnPlaySound.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
            this.btnPlaySound.Size = new System.Drawing.Size(43, 23);
-            this.btnPlaySound.TabIndex = 3;
+            this.btnPlaySound.TabIndex = 2;
            this.btnPlaySound.Text = "Play";
            this.btnPlaySound.UseVisualStyleBackColor = true;
            // 
@@ -64,7 +64,7 @@
            this.btnResetSound.Name = "btnResetSound";
            this.btnResetSound.Padding = new System.Windows.Forms.Padding(3, 0, 3, 0);
            this.btnResetSound.Size = new System.Drawing.Size(51, 23);
-            this.btnResetSound.TabIndex = 2;
+            this.btnResetSound.TabIndex = 3;
            this.btnResetSound.Text = "Reset";
            this.btnResetSound.UseVisualStyleBackColor = true;
            // 
--- a/Core/Utils/BrowserUtils.cs
+++ b/Core/Utils/BrowserUtils.cs
@@ -92,6 +92,10 @@ namespace TweetDck.Core.Utils{
            return frame.Url.Contains("//tweetdeck.twitter.com/");
        }

+        public static bool IsTwitterWebsite(IFrame frame){
+            return frame.Url.Contains("//twitter.com/");
+        }
+
        #if DEBUG
        public static void HandleConsoleMessage(object sender, ConsoleMessageEventArgs e){
            Debug.WriteLine("[Console] {0} ({1}:{2})", e.Message, e.Source, e.Line);
--- a/Core/Utils/NativeMethods.cs
+++ b/Core/Utils/NativeMethods.cs
@@ -51,13 +51,10 @@ namespace TweetDck.Core.Utils{
        private static extern bool GetLastInputInfo(ref LASTINPUTINFO info);

        [DllImport("user32.dll")]
-        private static extern IntPtr GetWindowDC(IntPtr hWnd);
+        public static extern IntPtr GetDC(IntPtr hWnd);

        [DllImport("user32.dll")]
-        private static extern IntPtr GetDC(IntPtr hWnd);
-
-        [DllImport("user32.dll")]
-        private static extern bool ReleaseDC(IntPtr hWnd, IntPtr hDC);
+        public static extern bool ReleaseDC(IntPtr hWnd, IntPtr hDC);

        [DllImport("gdi32.dll")]
        [return: MarshalAs(UnmanagedType.Bool)]
@@ -108,10 +105,6 @@ namespace TweetDck.Core.Utils{
            return Math.Max(0, seconds); // ignore rollover after several weeks of uptime
        }

-        public static IntPtr GetDeviceContext(Form form, bool includeBorder){
-            return includeBorder ? GetWindowDC(form.Handle) : GetDC(form.Handle);
-        }
-
        public static void RenderSourceIntoBitmap(IntPtr source, Bitmap target){
            using(Graphics graphics = Graphics.FromImage(target)){
                IntPtr graphicsHandle = graphics.GetHdc();
@@ -123,9 +116,5 @@ namespace TweetDck.Core.Utils{
                }
            }
        }
-
-        public static void ReleaseDeviceContext(Form form, IntPtr ctx){
-            ReleaseDC(form.Handle, ctx);
-        }
    }
 }
--- a/Plugins/Controls/PluginControl.Designer.cs
+++ b/Plugins/Controls/PluginControl.Designer.cs
@@ -42,7 +42,7 @@
            this.btnToggleState.Location = new System.Drawing.Point(459, 80);
            this.btnToggleState.Name = "btnToggleState";
            this.btnToggleState.Size = new System.Drawing.Size(65, 23);
-            this.btnToggleState.TabIndex = 0;
+            this.btnToggleState.TabIndex = 5;
            this.btnToggleState.Text = "Disable";
            this.btnToggleState.UseVisualStyleBackColor = true;
            this.btnToggleState.Click += new System.EventHandler(this.btnToggleState_Click);
@@ -54,7 +54,7 @@
            this.labelName.Location = new System.Drawing.Point(7, 7);
            this.labelName.Name = "labelName";
            this.labelName.Size = new System.Drawing.Size(61, 24);
-            this.labelName.TabIndex = 1;
+            this.labelName.TabIndex = 0;
            this.labelName.Text = "Name";
            this.labelName.UseMnemonic = false;
            // 
@@ -80,7 +80,7 @@
            this.labelDescription.Margin = new System.Windows.Forms.Padding(0);
            this.labelDescription.Name = "labelDescription";
            this.labelDescription.Size = new System.Drawing.Size(13, 39);
-            this.labelDescription.TabIndex = 3;
+            this.labelDescription.TabIndex = 0;
            this.labelDescription.Text = "a\r\nb\r\nc";
            this.labelDescription.UseMnemonic = false;
            // 
@@ -91,7 +91,7 @@
            this.labelAuthor.Margin = new System.Windows.Forms.Padding(3, 0, 32, 0);
            this.labelAuthor.Name = "labelAuthor";
            this.labelAuthor.Size = new System.Drawing.Size(38, 13);
-            this.labelAuthor.TabIndex = 3;
+            this.labelAuthor.TabIndex = 0;
            this.labelAuthor.Text = "Author";
            this.labelAuthor.UseMnemonic = false;
            // 
@@ -104,7 +104,7 @@
            this.flowLayoutInfo.Location = new System.Drawing.Point(11, 85);
            this.flowLayoutInfo.Name = "flowLayoutInfo";
            this.flowLayoutInfo.Size = new System.Drawing.Size(368, 18);
-            this.flowLayoutInfo.TabIndex = 4;
+            this.flowLayoutInfo.TabIndex = 3;
            this.flowLayoutInfo.WrapContents = false;
            // 
            // labelWebsite
@@ -116,7 +116,7 @@
            this.labelWebsite.Location = new System.Drawing.Point(76, 0);
            this.labelWebsite.Name = "labelWebsite";
            this.labelWebsite.Size = new System.Drawing.Size(46, 13);
-            this.labelWebsite.TabIndex = 5;
+            this.labelWebsite.TabIndex = 1;
            this.labelWebsite.Text = "Website";
            this.labelWebsite.UseMnemonic = false;
            this.labelWebsite.Click += new System.EventHandler(this.labelWebsite_Click);
@@ -129,7 +129,7 @@
            this.labelVersion.Margin = new System.Windows.Forms.Padding(3, 9, 3, 0);
            this.labelVersion.Name = "labelVersion";
            this.labelVersion.Size = new System.Drawing.Size(513, 13);
-            this.labelVersion.TabIndex = 5;
+            this.labelVersion.TabIndex = 1;
            this.labelVersion.Text = "Version";
            this.labelVersion.TextAlign = System.Drawing.ContentAlignment.TopRight;
            this.labelVersion.UseMnemonic = false;
@@ -140,7 +140,7 @@
            this.btnOpenConfig.Location = new System.Drawing.Point(385, 80);
            this.btnOpenConfig.Name = "btnOpenConfig";
            this.btnOpenConfig.Size = new System.Drawing.Size(68, 23);
-            this.btnOpenConfig.TabIndex = 6;
+            this.btnOpenConfig.TabIndex = 4;
            this.btnOpenConfig.Text = "Configure";
            this.btnOpenConfig.UseVisualStyleBackColor = true;
            this.btnOpenConfig.Click += new System.EventHandler(this.btnOpenConfig_Click);
--- a/Plugins/Controls/PluginListFlowLayout.Designer.cs
+++ b/Plugins/Controls/PluginListFlowLayout.Designer.cs
@@ -1,3 +0,0 @@
-namespace TweetDck.Plugins.Controls{
-    partial class PluginListFlowLayout{}
-}
--- a/Plugins/Controls/PluginListFlowLayout.cs
+++ b/Plugins/Controls/PluginListFlowLayout.cs
@@ -2,7 +2,7 @@
 using TweetDck.Core.Utils;

 namespace TweetDck.Plugins.Controls{
-    sealed partial class PluginListFlowLayout : FlowLayoutPanel{
+    sealed class PluginListFlowLayout : FlowLayoutPanel{
        public PluginListFlowLayout(){
            FlowDirection = FlowDirection.TopDown;
            WrapContents = false;
--- a/Program.cs
+++ b/Program.cs
@@ -20,8 +20,8 @@ namespace TweetDck{
        public const string BrandName = "TweetDuck";
        public const string Website = "https://tweetduck.chylex.com";

-        public const string VersionTag = "1.7";
-        public const string VersionFull = "1.7.0.0";
+        public const string VersionTag = "1.7.1";
+        public const string VersionFull = "1.7.1.0";

        public static readonly Version Version = new Version(VersionTag);
        public static readonly bool IsPortable = File.Exists("makeportable");
--- a/Resources/Plugins/.debug/browser.js
+++ b/Resources/Plugins/.debug/browser.js
@@ -18,30 +18,29 @@ enabled(){
      
      // ===================================
      // N key - simulate popup notification
+      // S key - simulate sound notification
      // ===================================
      
-      if (e.keyCode === 78){
+      if (e.keyCode === 78 || e.keyCode === 83){
        var col = TD.controller.columnManager.getAllOrdered()[0];
        
+        var prevPopup = col.model.getHasNotification();
+        var prevSound = col.model.getHasSound();
+        
+        col.model.setHasNotification(e.keyCode === 78);
+        col.model.setHasSound(e.keyCode === 83);
+        
        $.publish("/notifications/new",[{
          column: col,
          items: [
            col.updateArray[Math.floor(Math.random()*col.updateArray.length)]
          ]
        }]);
-      }
        
-      // ===================================
-      // S key - simulate sound notification
-      // ===================================
-      
-      else if (e.keyCode === 83){
-        if ($TDX.hasCustomNotificationSound){
-          $TD.onTweetSound();
-        }
-        else{
-          document.getElementById("update-sound").play();
-        }
+        setTimeout(function(){
+          col.model.setHasNotification(prevPopup);
+          col.model.setHasSound(prevSound);
+        }, 1);
      }
    }
  };
--- a/Resources/Plugins/edit-design/browser.js
+++ b/Resources/Plugins/edit-design/browser.js
@@ -36,7 +36,7 @@ enabled(){
  var loadConfigObject = obj => {
    this.tmpConfig = obj || {};
    
-    if (window.TD_APP_READY){
+    if (TD.ready){
      this.onAppReady();
    }
    
@@ -239,6 +239,9 @@ enabled(){
  this.reinjectAll = () => {
    this.resetDesign();
    
+    this.css.insert("#general_settings .cf { display: none !important }");
+    this.css.insert("#general_settings .divider-bar::after { display: inline-block; padding-top: 10px; line-height: 17px; content: 'Use the new | Edit layout & design | option in the Settings to modify TweetDeck theme, column width, font size, and other features.' }");
+    
    this.css.insert(".txt-base-smallest:not(.icon), .txt-base-largest:not(.icon) { font-size: "+this.config.fontSize+" !important }");
    this.css.insert(".avatar { border-radius: "+this.config.avatarRadius+"% !important }");
    
--- a/Resources/Plugins/emoji-keyboard/browser.js
+++ b/Resources/Plugins/emoji-keyboard/browser.js
@@ -58,6 +58,7 @@ enabled(){
    this.currentKeyboard = null;
    
    $(".emoji-keyboard-popup-btn").removeClass("is-selected");
+    $(".js-compose-text").first().focus();
  };
  
  var generateEmojiHTML = skinTone => {
@@ -84,9 +85,17 @@ enabled(){
    
    keyboard.addEventListener("click", function(e){
      if (e.target.tagName === "IMG"){
-        input.val(input.val()+e.target.getAttribute("alt"));
+        var val = input.val();
+        var inserted = e.target.getAttribute("alt");
+        var posStart = input[0].selectionStart;
+        var posEnd = input[0].selectionEnd;
+        
+        input.val(val.slice(0, posStart)+inserted+val.slice(posStart));
        input.trigger("change");
        input.focus();
+        
+        input[0].selectionStart = posStart+inserted.length;
+        input[0].selectionEnd = posEnd+inserted.length;
      }
      
      e.stopPropagation();
--- a/Resources/Scripts/code.js
+++ b/Resources/Scripts/code.js
@@ -19,6 +19,29 @@
  //
  var app = $(document.body).children(".js-app");
  
+  //
+  // Constant: Column types mapped to their titles.
+  //
+  const columnTypes = {
+    "col_home": "Home",
+    "col_timeline" : "Home",
+    "col_mentions": "Mentions",
+    "col_me": "Mentions",
+    "col_inbox": "Messages",
+    "col_messages": "Messages",
+    "col_interactions": "Notifications",
+    "col_followers": "Followers",
+    "col_activity": "Activity",
+    "col_favorites": "Likes",
+    "col_usertweets": "User",
+    "col_search": "Search",
+    "col_list": "List",
+    "col_customtimeline": "Timeline",
+    "col_dataminr": "Dataminr",
+    "col_livevideo": "Live video",
+    "col_scheduled": "Scheduled"
+  };
+  
  //
  // Function: Prepends code at the beginning of a function. If the prepended function returns true, execution of the original function is cancelled.
  //
@@ -59,7 +82,7 @@
  //
  var onNewTweet = function(column, tweet){
    if (column.model.getHasNotification()){
-      var html = $(tweet.render({
+      let html = $(tweet.render({
        withFooter: false,
        withTweetActions: false,
        withMediaPreview: true,
@@ -73,9 +96,8 @@
      html.find(".js-media").last().remove(); // and quoted tweets still show media previews, nice nice
      html.find(".js-quote-detail").removeClass("is-actionable");
      
-      var url = html.find("time").first().children("a").first().attr("href") || "";
-      
-      $TD.onTweetPopup(html.html(), url, tweet.text.length); // TODO column
+      let url = html.find("time").first().children("a").first().attr("href") || "";
+      $TD.onTweetPopup(columnTypes[column.getColumnType()] || "", html.html(), url, tweet.text.length);
    }
    
    if (column.model.getHasSound()){
@@ -626,9 +648,35 @@
  TD.services.TwitterMedia.SERVICES["youtube"] = TD.services.TwitterMedia.YOUTUBE_RE;
  
  //
-  // Block: Finish initialization and load plugins.
+  // Block: Fix DM reply input box not getting focused after opening a conversation.
  //
+  TD.components.ConversationDetailView.prototype.showChirp = appendToFunction(TD.components.ConversationDetailView.prototype.showChirp, function(){
+    setTimeout(function(){
+      $(".js-reply-tweetbox").first().focus();
+    }, 100);
+  });
+  
+  //
+  // Block: Disable TweetDeck metrics.
+  //
+  TD.metrics.inflate = function(){};
+  TD.metrics.inflateMetricTriple = function(){};
+  TD.metrics.log = function(){};
+  TD.metrics.makeKey = function(){};
+  TD.metrics.send = function(){};
+  
  onAppReady.push(function(){
+    let data = $._data(window);
+    delete data.events["metric"];
+    delete data.events["metricsFlush"];
+  });
+  
+  //
+  // Block: Register the TD.ready event, finish initialization, and load plugins.
+  //
+  $(document).one("TD.ready", function(){
+    onAppReady.forEach(func => func());
+    
    $TD.loadFontSizeClass(TD.settings.getFontSize());
    $TD.loadNotificationHeadContents(getNotificationHeadContents());
    
@@ -637,19 +685,7 @@
    }
  });
  
-  //
-  // Block: Observe the main app element and call the ready event whenever the contents are loaded.
-  //
-  new MutationObserver(function(){
-    if (window.TD_APP_READY && app.hasClass("is-hidden")){
-      window.TD_APP_READY = false;
-    }
-    else if (!window.TD_APP_READY && !app.hasClass("is-hidden")){
-      onAppReady.forEach(func => func());
-      window.TD_APP_READY = true;
-    }
-  }).observe(app[0], {
-    attributes: true,
-    attributeFilter: [ "class" ]
+  $(document).on("uiLoginFormImpression", function(){
+    location.href = $("a.btn", ".js-login-form").first().attr("href");
  });
 })($, $TD, $TDX, TD);
--- a/Resources/Scripts/plugins.browser.js
+++ b/Resources/Scripts/plugins.browser.js
@@ -40,7 +40,7 @@
    }
    
    runWhenReady(plugin){
-      if (window.TD_APP_READY){
+      if (TD.ready){
        plugin.obj.ready();
      }
      else{
--- a/Resources/Scripts/twitter.js
+++ b/Resources/Scripts/twitter.js
@@ -0,0 +1,34 @@
+(function(){
+  //
+  // Function: Inject custom CSS into the page.
+  //
+  var injectCSS = function(){
+    if (!document.head){
+      setTimeout(injectCSS, 25);
+      return;
+    }
+    
+    var style = document.createElement("style");
+    document.head.appendChild(style);
+
+    style.sheet.insertRule("body { overflow: hidden !important; }", 0); // remove scrollbar
+    style.sheet.insertRule(".topbar { display: none !important; }", 0); // hide top bar
+    style.sheet.insertRule(".page-canvas, .buttons, .btn, input { border-radius: 0 !important; }", 0); // sharpen borders
+    style.sheet.insertRule("input { padding: 5px 8px 4px !important; }", 0); // tweak input padding
+
+    style.sheet.insertRule("#doc { width: 100%; height: 100%; margin: 0; position: absolute; display: table; }", 0); // center everything
+    style.sheet.insertRule("#page-outer { display: table-cell; vertical-align: middle; }", 0); // center everything
+    style.sheet.insertRule("#page-container { padding: 0 20px !important; width: 100% !important; box-sizing: border-box !important; }", 0); // center everything
+    style.sheet.insertRule(".page-canvas { margin: 0 auto !important; }", 0); // center everything
+
+    if (location.pathname === "/logout"){
+      style.sheet.insertRule(".page-canvas { width: auto !important; max-width: 888px; }", 0); // fix min width
+      style.sheet.insertRule(".signout-wrapper { width: auto !important; }", 0); // fix min width
+      style.sheet.insertRule(".btn { margin: 0 4px !important; }", 0); // add margin around buttons
+      style.sheet.insertRule(".btn.cancel { border: 1px solid #bbc1c5 !important; }", 0); // add border to cancel button
+      style.sheet.insertRule(".aside p { display: none; }", 0); // hide text below the logout dialog
+    }
+  };
+  
+  setTimeout(injectCSS, 1);
+})();
--- a/TweetDck.csproj
+++ b/TweetDck.csproj
@@ -232,9 +232,6 @@
    <Compile Include="Plugins\Controls\PluginListFlowLayout.cs">
      <SubType>Component</SubType>
    </Compile>
-    <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" />
@@ -342,6 +339,7 @@
    <Content Include="Resources\Scripts\plugins.browser.js" />
    <Content Include="Resources\Scripts\plugins.js" />
    <Content Include="Resources\Scripts\plugins.notification.js" />
+    <Content Include="Resources\Scripts\twitter.js" />
    <Content Include="Resources\Scripts\update.js" />
  </ItemGroup>
  <ItemGroup>
Author	SHA1	Message	Date
chylex	4afac91bce	Release 1.7.1	2017-04-07 00:32:27 +02:00
chylex	6e6312f6d7	Fix occasional twitter.js crash due to it loading too early	2017-04-07 00:18:59 +02:00
chylex	df4c4e443d	Customize login and logout pages	2017-04-06 23:16:58 +02:00
chylex	ff40474f92	Fix DM reply input not getting focused after opening a conversation	2017-04-06 18:39:47 +02:00
chylex	aca06ee805	Add an option to display column name in the notification title	2017-04-06 18:11:52 +02:00
chylex	ba8e29a9f8	Make emoji keyboard bring focus into the input when closed	2017-04-06 18:03:44 +02:00
chylex	583da2bd9f	Remove an empty designer file for PluginListFlowLayout	2017-04-06 15:21:07 +02:00
chylex	0ea07016b4	Fix TabIndex, Margin, and Location of controls in forms and dialogs	2017-04-06 14:57:27 +02:00
chylex	616421db9a	Remove the 'Include Border In Screenshots' option	2017-04-06 14:29:22 +02:00
chylex	293ddacd19	Disable broken TweetDeck metrics	2017-04-06 14:07:48 +02:00
chylex	13945ec937	Minor code refactoring (remove TD_APP_READY, remove a TODO, fix formatting)	2017-04-06 13:40:26 +02:00
chylex	4ea6f336f8	Fix debug plugin to simulate notifications more reliably	2017-04-05 23:19:49 +02:00
chylex	58296aa266	Fix emoji keyboard to append emoji at caret instead of the end	2017-04-05 23:08:52 +02:00
chylex	742df9dff3	Make the default theme/column/font settings hidden if edit-design plugin is enabled	2017-04-05 01:06:52 +02:00