From 791f9fb6935e4f28cf2ff540b9a7ccbde098395b Mon Sep 17 00:00:00 2001 From: Jaex Date: Tue, 14 May 2019 23:42:10 +0300 Subject: [PATCH] Move news panel to front --- ShareX/Forms/MainForm.Designer.cs | 22 +- ShareX/Forms/MainForm.resx | 658 ++++++++++++++---------------- 2 files changed, 310 insertions(+), 370 deletions(-) diff --git a/ShareX/Forms/MainForm.Designer.cs b/ShareX/Forms/MainForm.Designer.cs index 3c18333d7..02f9d8865 100644 --- a/ShareX/Forms/MainForm.Designer.cs +++ b/ShareX/Forms/MainForm.Designer.cs @@ -275,10 +275,10 @@ private void InitializeComponent() this.btnCloseNews = new System.Windows.Forms.Button(); this.ucNews = new ShareX.NewsListControl(); this.pThumbnailView = new System.Windows.Forms.Panel(); + this.lblThumbnailViewTip = new System.Windows.Forms.Label(); this.ucTaskView = new ShareX.TaskView(); this.flpCommunity = new System.Windows.Forms.FlowLayoutPanel(); this.flpDiscord = new System.Windows.Forms.FlowLayoutPanel(); - this.lblThumbnailViewTip = new System.Windows.Forms.Label(); ((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit(); this.scMain.Panel1.SuspendLayout(); this.scMain.Panel2.SuspendLayout(); @@ -2171,6 +2171,15 @@ private void InitializeComponent() resources.ApplyResources(this.pThumbnailView, "pThumbnailView"); this.pThumbnailView.Name = "pThumbnailView"; // + // lblThumbnailViewTip + // + this.lblThumbnailViewTip.BackColor = System.Drawing.Color.Transparent; + resources.ApplyResources(this.lblThumbnailViewTip, "lblThumbnailViewTip"); + this.lblThumbnailViewTip.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(228)))), ((int)(((byte)(228)))), ((int)(((byte)(228))))); + this.lblThumbnailViewTip.Name = "lblThumbnailViewTip"; + this.lblThumbnailViewTip.UseMnemonic = false; + this.lblThumbnailViewTip.MouseUp += new System.Windows.Forms.MouseEventHandler(this.LblThumbnailViewTip_MouseUp); + // // ucTaskView // resources.ApplyResources(this.ucTaskView, "ucTaskView"); @@ -2194,26 +2203,17 @@ private void InitializeComponent() this.flpDiscord.Controls.Add(this.pbDiscordHide); this.flpDiscord.Name = "flpDiscord"; // - // lblThumbnailViewTip - // - this.lblThumbnailViewTip.BackColor = System.Drawing.Color.Transparent; - resources.ApplyResources(this.lblThumbnailViewTip, "lblThumbnailViewTip"); - this.lblThumbnailViewTip.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(228)))), ((int)(((byte)(228)))), ((int)(((byte)(228))))); - this.lblThumbnailViewTip.Name = "lblThumbnailViewTip"; - this.lblThumbnailViewTip.UseMnemonic = false; - this.lblThumbnailViewTip.MouseUp += new System.Windows.Forms.MouseEventHandler(this.LblThumbnailViewTip_MouseUp); - // // MainForm // this.AllowDrop = true; resources.ApplyResources(this, "$this"); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.BackColor = System.Drawing.SystemColors.Window; + this.Controls.Add(this.pNews); this.Controls.Add(this.pThumbnailView); this.Controls.Add(this.flpCommunity); this.Controls.Add(this.scMain); this.Controls.Add(this.tsMain); - this.Controls.Add(this.pNews); this.DoubleBuffered = true; this.Name = "MainForm"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.MainForm_FormClosing); diff --git a/ShareX/Forms/MainForm.resx b/ShareX/Forms/MainForm.resx index 9bd456e97..c60247c2c 100644 --- a/ShareX/Forms/MainForm.resx +++ b/ShareX/Forms/MainForm.resx @@ -159,6 +159,45 @@ 0 + + Filename + + + 150 + + + Status + + + Progress + + + 125 + + + Speed + + + 75 + + + Elapsed + + + 45 + + + Remaining + + + 45 + + + URL + + + 145 + Fill @@ -253,101 +292,11 @@ $this - 4 - - - Filename - - - 150 - - - Status - - - Progress - - - 125 - - - Speed - - - 75 - - - Elapsed - - - 45 - - - Remaining - - - 45 - - - URL - - - 145 + 5 True - - pbSupportUsOpen - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - flpSupportUs - - - 0 - - - pbSupportUsHide - - - System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - flpSupportUs - - - 1 - - - 3, 54 - - - 215, 45 - - - 3 - - - False - - - False - - - flpSupportUs - - - System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - flpCommunity - - - 0 - NoControl @@ -408,6 +357,33 @@ 1 + + 3, 54 + + + 215, 45 + + + 3 + + + False + + + False + + + flpSupportUs + + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + flpCommunity + + + 0 + 17, 17 @@ -417,42 +393,6 @@ Left - - 0, 0 - - - 6, 6, 6, 6 - - - 160, 429 - - - 1 - - - tsMain - - - ShareX.HelpersLib.ToolStripBorderRight, ShareX.HelpersLib, Version=12.4.2.0, Culture=neutral, PublicKeyToken=null - - - $this - - - 5 - - - MiddleLeft - - - Magenta - - - 147, 20 - - - Capture - 191, 22 @@ -534,28 +474,6 @@ Show cursor - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAI4SURBVDhPpZHvaxJxHMfvD7CMHoqPm4igCDLxgYHN - o84fCOqT1SSEarL1pAfd9qAHgwqEJgvGKscY5IOspAKpIAnBqEHqGdvKnTd1O+dZ7Mc5fGKPPt3nmIey - 9aQevO4+fD/v9+u+cAQA/Bfyw+v1Ej6fj/D7/UQgEDgVDAaHJfwS4SNwHsYdZjCLnZMEuqvhcGRheflF - oVyuN/f2ugjOeIY7zPxNoLs2Pj6VZZgG12rB7uEhxJ+vwdsvImQZEQqcIL2ZxvVIZAqzAwKPx3P68tjY - ZLZYbHzb2oJf7bYsoO+9gvTnNiQzBzCX/AmvP9UgVyo1roRCk9hRBBRF2ebi8VShWoWKIMhlZGL6Kbxb - acu8yYlw++EGfChuwsLSUgo7ioAkydGP+fw2Cvpxjd6FRGZHIZrg4M6jPKysrm5jRxE4HI6JAsd1e8Xe - DeyeaeUGSCq7CxdvvIcfPN/FjiKw2+03mWpVFvTKFosFaJoGvfMx6MgEDJHP4ByZhKFLL4FtNrvYUQQ2 - my2UYxi+X7BZr4PVapXfPTiJAstCqVzmsaMIpK+dj83Pp/EPtERxQNKbEdyt8Tw8WVxMY0cRmM3mMxdG - Ruiv6+vCzv7+QKmfprT7XqkITqeTxo4iMJlMhMFgMFIuVxQDB53OsTKecbWa4Ha7o5jFzoBAr9cTWq3W - bDQaZx7MzmbKLCuInc7vtsSGJI3FYhkpN4MZzJ4o0Gg0hFqtPqtSqSiJWxL3j8CZwh1mjgn+HSD+ABVB - iM3ORgOyAAAAAElFTkSuQmCC - - - - 191, 22 - - - Screenshot delay - 126, 22 @@ -592,17 +510,39 @@ 5 seconds - + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAI4SURBVDhPpZHvaxJxHMfvD7CMHoqPm4igCDLxgYHN + o84fCOqT1SSEarL1pAfd9qAHgwqEJgvGKscY5IOspAKpIAnBqEHqGdvKnTd1O+dZ7Mc5fGKPPt3nmIey + 9aQevO4+fD/v9+u+cAQA/Bfyw+v1Ej6fj/D7/UQgEDgVDAaHJfwS4SNwHsYdZjCLnZMEuqvhcGRheflF + oVyuN/f2ugjOeIY7zPxNoLs2Pj6VZZgG12rB7uEhxJ+vwdsvImQZEQqcIL2ZxvVIZAqzAwKPx3P68tjY + ZLZYbHzb2oJf7bYsoO+9gvTnNiQzBzCX/AmvP9UgVyo1roRCk9hRBBRF2ebi8VShWoWKIMhlZGL6Kbxb + acu8yYlw++EGfChuwsLSUgo7ioAkydGP+fw2Cvpxjd6FRGZHIZrg4M6jPKysrm5jRxE4HI6JAsd1e8Xe + DeyeaeUGSCq7CxdvvIcfPN/FjiKw2+03mWpVFvTKFosFaJoGvfMx6MgEDJHP4ByZhKFLL4FtNrvYUQQ2 + my2UYxi+X7BZr4PVapXfPTiJAstCqVzmsaMIpK+dj83Pp/EPtERxQNKbEdyt8Tw8WVxMY0cRmM3mMxdG + Ruiv6+vCzv7+QKmfprT7XqkITqeTxo4iMJlMhMFgMFIuVxQDB53OsTKecbWa4Ha7o5jFzoBAr9cTWq3W + bDQaZx7MzmbKLCuInc7vtsSGJI3FYhkpN4MZzJ4o0Gg0hFqtPqtSqSiJWxL3j8CZwh1mjgn+HSD+ABVB + iM3ORgOyAAAAAElFTkSuQmCC + + + + 191, 22 + + + Screenshot delay + + MiddleLeft - + Magenta - + 147, 20 - - Upload + + Capture 203, 22 @@ -646,6 +586,18 @@ Shorten URL... + + MiddleLeft + + + Magenta + + + 147, 20 + + + Upload + BottomLeft @@ -658,18 +610,6 @@ Workflows - - MiddleLeft - - - Magenta - - - 147, 20 - - - Tools - 184, 22 @@ -754,6 +694,18 @@ Monitor test... + + MiddleLeft + + + Magenta + + + 147, 20 + + + Tools + 147, 6 @@ -781,18 +733,6 @@ After upload tasks - - MiddleLeft - - - Magenta - - - 147, 20 - - - Destinations - 219, 22 @@ -838,6 +778,18 @@ Custom uploader settings... + + MiddleLeft + + + Magenta + + + 147, 20 + + + Destinations + MiddleLeft @@ -925,18 +877,6 @@ News - - MiddleLeft - - - Magenta - - - 147, 20 - - - Debug - 172, 22 @@ -973,6 +913,18 @@ Test URL sharing + + MiddleLeft + + + Magenta + + + 147, 20 + + + Debug + MiddleLeft @@ -997,18 +949,33 @@ About... + + 0, 0 + + + 6, 6, 6, 6 + + + 160, 429 + + + 1 + + + tsMain + + + ShareX.HelpersLib.ToolStripBorderRight, ShareX.HelpersLib, Version=12.4.2.0, Culture=neutral, PublicKeyToken=null + + + $this + + + 6 + 286, 17 - - 229, 472 - - - cmsTaskInfo - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - 228, 22 @@ -1021,12 +988,6 @@ Stop upload - - 228, 22 - - - Open - Enter @@ -1081,11 +1042,11 @@ Thumbnail file - + 228, 22 - - Copy + + Open Ctrl+C @@ -1258,6 +1219,12 @@ False + + 228, 22 + + + Copy + Ctrl+U @@ -1366,12 +1333,6 @@ Hide columns - - 228, 22 - - - Image preview - 130, 22 @@ -1405,36 +1366,33 @@ Bottom + + 228, 22 + + + Image preview + 228, 22 Switch to thumbnail view + + 229, 472 + + + cmsTaskInfo + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + 105, 17 190, 17 - - 193, 484 - - - cmsTray - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ShareX - - - 192, 22 - - - Capture - 191, 22 @@ -1516,28 +1474,6 @@ Show cursor - - - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m - dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAI4SURBVDhPpZHvaxJxHMfvD7CMHoqPm4igCDLxgYHN - o84fCOqT1SSEarL1pAfd9qAHgwqEJgvGKscY5IOspAKpIAnBqEHqGdvKnTd1O+dZ7Mc5fGKPPt3nmIey - 9aQevO4+fD/v9+u+cAQA/Bfyw+v1Ej6fj/D7/UQgEDgVDAaHJfwS4SNwHsYdZjCLnZMEuqvhcGRheflF - oVyuN/f2ugjOeIY7zPxNoLs2Pj6VZZgG12rB7uEhxJ+vwdsvImQZEQqcIL2ZxvVIZAqzAwKPx3P68tjY - ZLZYbHzb2oJf7bYsoO+9gvTnNiQzBzCX/AmvP9UgVyo1roRCk9hRBBRF2ebi8VShWoWKIMhlZGL6Kbxb - acu8yYlw++EGfChuwsLSUgo7ioAkydGP+fw2Cvpxjd6FRGZHIZrg4M6jPKysrm5jRxE4HI6JAsd1e8Xe - DeyeaeUGSCq7CxdvvIcfPN/FjiKw2+03mWpVFvTKFosFaJoGvfMx6MgEDJHP4ByZhKFLL4FtNrvYUQQ2 - my2UYxi+X7BZr4PVapXfPTiJAstCqVzmsaMIpK+dj83Pp/EPtERxQNKbEdyt8Tw8WVxMY0cRmM3mMxdG - Ruiv6+vCzv7+QKmfprT7XqkITqeTxo4iMJlMhMFgMFIuVxQDB53OsTKecbWa4Ha7o5jFzoBAr9cTWq3W - bDQaZx7MzmbKLCuInc7vtsSGJI3FYhkpN4MZzJ4o0Gg0hFqtPqtSqSiJWxL3j8CZwh1mjgn+HSD+ABVB - iM3ORgOyAAAAAElFTkSuQmCC - - - - 191, 22 - - - Screenshot delay - 126, 22 @@ -1574,11 +1510,33 @@ 5 seconds - + + + iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m + dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAI4SURBVDhPpZHvaxJxHMfvD7CMHoqPm4igCDLxgYHN + o84fCOqT1SSEarL1pAfd9qAHgwqEJgvGKscY5IOspAKpIAnBqEHqGdvKnTd1O+dZ7Mc5fGKPPt3nmIey + 9aQevO4+fD/v9+u+cAQA/Bfyw+v1Ej6fj/D7/UQgEDgVDAaHJfwS4SNwHsYdZjCLnZMEuqvhcGRheflF + oVyuN/f2ugjOeIY7zPxNoLs2Pj6VZZgG12rB7uEhxJ+vwdsvImQZEQqcIL2ZxvVIZAqzAwKPx3P68tjY + ZLZYbHzb2oJf7bYsoO+9gvTnNiQzBzCX/AmvP9UgVyo1roRCk9hRBBRF2ebi8VShWoWKIMhlZGL6Kbxb + acu8yYlw++EGfChuwsLSUgo7ioAkydGP+fw2Cvpxjd6FRGZHIZrg4M6jPKysrm5jRxE4HI6JAsd1e8Xe + DeyeaeUGSCq7CxdvvIcfPN/FjiKw2+03mWpVFvTKFosFaJoGvfMx6MgEDJHP4ByZhKFLL4FtNrvYUQQ2 + my2UYxi+X7BZr4PVapXfPTiJAstCqVzmsaMIpK+dj83Pp/EPtERxQNKbEdyt8Tw8WVxMY0cRmM3mMxdG + Ruiv6+vCzv7+QKmfprT7XqkITqeTxo4iMJlMhMFgMFIuVxQDB53OsTKecbWa4Ha7o5jFzoBAr9cTWq3W + bDQaZx7MzmbKLCuInc7vtsSGJI3FYhkpN4MZzJ4o0Gg0hFqtPqtSqSiJWxL3j8CZwh1mjgn+HSD+ABVB + iM3ORgOyAAAAAElFTkSuQmCC + + + + 191, 22 + + + Screenshot delay + + 192, 22 - - Upload + + Capture 203, 22 @@ -1622,18 +1580,18 @@ Shorten URL... + + 192, 22 + + + Upload + 192, 22 Workflows - - 192, 22 - - - Tools - 184, 22 @@ -1718,6 +1676,12 @@ Monitor test... + + 192, 22 + + + Tools + 189, 6 @@ -1733,12 +1697,6 @@ After upload tasks - - 192, 22 - - - Destinations - 219, 22 @@ -1784,6 +1742,12 @@ Custom uploader settings... + + 192, 22 + + + Destinations + 192, 22 @@ -1829,12 +1793,6 @@ Image history... - - 192, 22 - - - Debug - 172, 22 @@ -1871,6 +1829,12 @@ Test URL sharing + + 192, 22 + + + Debug + 192, 22 @@ -1913,6 +1877,18 @@ Exit + + 193, 484 + + + cmsTray + + + System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + ShareX + 405, 17 @@ -1976,57 +1952,6 @@ 1 - - btnCloseNews - - - System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - pNews - - - 0 - - - ucNews - - - ShareX.NewsListControl, ShareX, Version=12.4.2.0, Culture=neutral, PublicKeyToken=null - - - pNews - - - 1 - - - Fill - - - 0, 0 - - - 834, 429 - - - 5 - - - False - - - pNews - - - System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 6 - Bottom, Right @@ -2034,7 +1959,7 @@ NoControl - 720, 400 + 560, 400 91, 23 @@ -2064,7 +1989,7 @@ 0, 0 - 834, 429 + 674, 429 6 @@ -2081,6 +2006,33 @@ 1 + + Fill + + + 160, 0 + + + 674, 429 + + + 5 + + + False + + + pNews + + + System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 0 + Fill @@ -2163,7 +2115,7 @@ $this - 2 + 3 Bottom, Right @@ -2174,6 +2126,24 @@ GrowAndShrink + + True + + + 3, 3 + + + 215, 45 + + + 4 + + + False + + + False + flpDiscord @@ -2208,38 +2178,8 @@ $this - 3 - - - True - - - 3, 3 - - - 215, 45 - - 4 - - False - - - False - - - flpDiscord - - - System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - flpCommunity - - - 1 - True