From cd5d1ab724345cb6955300cbbc95a9fda8934afa Mon Sep 17 00:00:00 2001 From: Jaex Date: Tue, 14 May 2019 02:46:53 +0300 Subject: [PATCH] Added switch task view mode button to context menu --- ShareX/Forms/MainForm.Designer.cs | 49 +- ShareX/Forms/MainForm.cs | 38 ++ ShareX/Forms/MainForm.resx | 722 +++++++++++++----------- ShareX/Properties/Resources.Designer.cs | 12 +- ShareX/Properties/Resources.resx | 3 + ShareX/Resources/application-list.png | Bin 0 -> 495 bytes ShareX/ShareX.csproj | 3 + 7 files changed, 469 insertions(+), 358 deletions(-) create mode 100644 ShareX/Resources/application-list.png diff --git a/ShareX/Forms/MainForm.Designer.cs b/ShareX/Forms/MainForm.Designer.cs index e1f1832c1..01d7b8c9e 100644 --- a/ShareX/Forms/MainForm.Designer.cs +++ b/ShareX/Forms/MainForm.Designer.cs @@ -185,6 +185,7 @@ private void InitializeComponent() this.tssImagePreview = new System.Windows.Forms.ToolStripSeparator(); this.tsmiImagePreviewSide = new System.Windows.Forms.ToolStripMenuItem(); this.tsmiImagePreviewBottom = new System.Windows.Forms.ToolStripMenuItem(); + this.tsmiSwitchTaskViewMode = new System.Windows.Forms.ToolStripMenuItem(); this.niTray = new System.Windows.Forms.NotifyIcon(this.components); this.cmsTray = new System.Windows.Forms.ContextMenuStrip(this.components); this.tsmiTrayCapture = new System.Windows.Forms.ToolStripMenuItem(); @@ -273,10 +274,10 @@ private void InitializeComponent() this.pNews = new System.Windows.Forms.Panel(); this.btnCloseNews = new System.Windows.Forms.Button(); this.ucNews = new ShareX.NewsListControl(); - this.flpCommunity = new System.Windows.Forms.FlowLayoutPanel(); - this.flpDiscord = new System.Windows.Forms.FlowLayoutPanel(); this.pThumbnailView = new System.Windows.Forms.Panel(); this.ucTaskView = new ShareX.TaskView(); + this.flpCommunity = new System.Windows.Forms.FlowLayoutPanel(); + this.flpDiscord = new System.Windows.Forms.FlowLayoutPanel(); ((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit(); this.scMain.Panel1.SuspendLayout(); this.scMain.Panel2.SuspendLayout(); @@ -290,9 +291,9 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.pbDiscordOpen)).BeginInit(); ((System.ComponentModel.ISupportInitialize)(this.pbDiscordHide)).BeginInit(); this.pNews.SuspendLayout(); + this.pThumbnailView.SuspendLayout(); this.flpCommunity.SuspendLayout(); this.flpDiscord.SuspendLayout(); - this.pThumbnailView.SuspendLayout(); this.SuspendLayout(); // // scMain @@ -1029,7 +1030,8 @@ private void InitializeComponent() this.tssUploadInfo1, this.tsmiHideMenu, this.tsmiHideColumns, - this.tsmiImagePreview}); + this.tsmiImagePreview, + this.tsmiSwitchTaskViewMode}); this.cmsTaskInfo.Name = "cmsHistory"; resources.ApplyResources(this.cmsTaskInfo, "cmsTaskInfo"); this.cmsTaskInfo.Closing += new System.Windows.Forms.ToolStripDropDownClosingEventHandler(this.cmsTaskInfo_Closing); @@ -1480,6 +1482,12 @@ private void InitializeComponent() this.tsmiImagePreviewBottom.Tag = "Location"; this.tsmiImagePreviewBottom.Click += new System.EventHandler(this.tsmiImagePreviewBottom_Click); // + // tsmiSwitchTaskViewMode + // + this.tsmiSwitchTaskViewMode.Name = "tsmiSwitchTaskViewMode"; + resources.ApplyResources(this.tsmiSwitchTaskViewMode, "tsmiSwitchTaskViewMode"); + this.tsmiSwitchTaskViewMode.Click += new System.EventHandler(this.TsmiSwitchTaskViewMode_Click); + // // niTray // this.niTray.ContextMenuStrip = this.cmsTray; @@ -2154,6 +2162,20 @@ private void InitializeComponent() resources.ApplyResources(this.ucNews, "ucNews"); this.ucNews.Name = "ucNews"; // + // pThumbnailView + // + this.pThumbnailView.Controls.Add(this.ucTaskView); + resources.ApplyResources(this.pThumbnailView, "pThumbnailView"); + this.pThumbnailView.Name = "pThumbnailView"; + // + // ucTaskView + // + resources.ApplyResources(this.ucTaskView, "ucTaskView"); + this.ucTaskView.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(47)))), ((int)(((byte)(56))))); + this.ucTaskView.Name = "ucTaskView"; + this.ucTaskView.ThumbnailSize = new System.Drawing.Size(200, 150); + this.ucTaskView.ContextMenuRequested += new ShareX.TaskView.TaskViewMouseEventHandler(this.UcTaskView_ContextMenuRequested); + // // flpCommunity // resources.ApplyResources(this.flpCommunity, "flpCommunity"); @@ -2169,28 +2191,14 @@ private void InitializeComponent() this.flpDiscord.Controls.Add(this.pbDiscordHide); this.flpDiscord.Name = "flpDiscord"; // - // pThumbnailView - // - this.pThumbnailView.Controls.Add(this.ucTaskView); - resources.ApplyResources(this.pThumbnailView, "pThumbnailView"); - this.pThumbnailView.Name = "pThumbnailView"; - // - // ucTaskView - // - resources.ApplyResources(this.ucTaskView, "ucTaskView"); - this.ucTaskView.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(47)))), ((int)(((byte)(56))))); - this.ucTaskView.Name = "ucTaskView"; - this.ucTaskView.ThumbnailSize = new System.Drawing.Size(200, 150); - this.ucTaskView.ContextMenuRequested += new ShareX.TaskView.TaskViewMouseEventHandler(this.UcTaskView_ContextMenuRequested); - // // 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.pThumbnailView); 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); @@ -2220,11 +2228,11 @@ private void InitializeComponent() ((System.ComponentModel.ISupportInitialize)(this.pbDiscordOpen)).EndInit(); ((System.ComponentModel.ISupportInitialize)(this.pbDiscordHide)).EndInit(); this.pNews.ResumeLayout(false); + this.pThumbnailView.ResumeLayout(false); this.flpCommunity.ResumeLayout(false); this.flpCommunity.PerformLayout(); this.flpDiscord.ResumeLayout(false); this.flpDiscord.PerformLayout(); - this.pThumbnailView.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); @@ -2479,5 +2487,6 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem tsmiTrayCustomUploaderSettings; private System.Windows.Forms.Panel pThumbnailView; private TaskView ucTaskView; + private System.Windows.Forms.ToolStripMenuItem tsmiSwitchTaskViewMode; } } \ No newline at end of file diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index ba5fe1b88..e1beabcd3 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -290,6 +290,7 @@ public void UpdateControls() UpdateToggleHotkeyButton(); AfterTaskSettingsJobs(); AfterApplicationSettingsJobs(); + UpdateTaskViewMode(); InitHotkeys(); @@ -751,6 +752,26 @@ private void UpdateContextMenu(WorkerTask task = null) Refresh(); } + private void UpdateTaskViewMode() + { + if (Program.Settings.TaskViewMode == TaskViewMode.ListView) + { + tsmiSwitchTaskViewMode.Text = "Switch to thumbnail view"; + tsmiSwitchTaskViewMode.Image = Resources.application_icon_large; + scMain.Visible = true; + pThumbnailView.Visible = false; + scMain.Focus(); + } + else + { + tsmiSwitchTaskViewMode.Text = "Switch to list view"; + tsmiSwitchTaskViewMode.Image = Resources.application_list; + pThumbnailView.Visible = true; + scMain.Visible = false; + pThumbnailView.Focus(); + } + } + private void CleanCustomClipboardFormats() { tssCopy6.Visible = false; @@ -2273,6 +2294,23 @@ private void tsmiImagePreviewShow_Click(object sender, EventArgs e) UpdateContextMenu(); } + private void TsmiSwitchTaskViewMode_Click(object sender, EventArgs e) + { + tsMain.SendToBack(); + + if (Program.Settings.TaskViewMode == TaskViewMode.ListView) + { + Program.Settings.TaskViewMode = TaskViewMode.ThumbnailView; + } + else + { + Program.Settings.TaskViewMode = TaskViewMode.ListView; + } + + UpdateTaskViewMode(); + UpdateContextMenu(); + } + private void tsmiImagePreviewHide_Click(object sender, EventArgs e) { Program.Settings.ImagePreview = ImagePreviewVisibility.Hide; diff --git a/ShareX/Forms/MainForm.resx b/ShareX/Forms/MainForm.resx index 3bdfd3ce9..b80547805 100644 --- a/ShareX/Forms/MainForm.resx +++ b/ShareX/Forms/MainForm.resx @@ -159,45 +159,6 @@ 0 - - Filename - - - 150 - - - Status - - - Progress - - - 125 - - - Speed - - - 75 - - - Elapsed - - - 45 - - - Remaining - - - 45 - - - URL - - - 145 - Fill @@ -294,9 +255,99 @@ 5 + + Filename + + + 150 + + + Status + + + Progress + + + 125 + + + Speed + + + 75 + + + Elapsed + + + 45 + + + Remaining + + + 45 + + + URL + + + 145 + 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 @@ -357,33 +408,6 @@ 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 @@ -393,6 +417,42 @@ 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 + + + 6 + + + MiddleLeft + + + Magenta + + + 147, 20 + + + Capture + 191, 22 @@ -474,6 +534,28 @@ 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 @@ -510,39 +592,17 @@ 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 - - Capture + + Upload 203, 22 @@ -586,18 +646,6 @@ Shorten URL... - - MiddleLeft - - - Magenta - - - 147, 20 - - - Upload - BottomLeft @@ -610,6 +658,18 @@ Workflows + + MiddleLeft + + + Magenta + + + 147, 20 + + + Tools + 184, 22 @@ -694,18 +754,6 @@ Monitor test... - - MiddleLeft - - - Magenta - - - 147, 20 - - - Tools - 147, 6 @@ -733,6 +781,18 @@ After upload tasks + + MiddleLeft + + + Magenta + + + 147, 20 + + + Destinations + 219, 22 @@ -778,18 +838,6 @@ Custom uploader settings... - - MiddleLeft - - - Magenta - - - 147, 20 - - - Destinations - MiddleLeft @@ -877,6 +925,18 @@ News + + MiddleLeft + + + Magenta + + + 147, 20 + + + Debug + 172, 22 @@ -913,18 +973,6 @@ Test URL sharing - - MiddleLeft - - - Magenta - - - 147, 20 - - - Debug - MiddleLeft @@ -949,33 +997,18 @@ 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 @@ -988,6 +1021,12 @@ Stop upload + + 228, 22 + + + Open + Enter @@ -1042,11 +1081,11 @@ Thumbnail file - + 228, 22 - - Open + + Copy Ctrl+C @@ -1219,12 +1258,6 @@ False - - 228, 22 - - - Copy - Ctrl+U @@ -1333,53 +1366,50 @@ Hide columns - - 180, 22 - - - Show - - - 180, 22 - - - Hide - - - 180, 22 - - - Automatic - - - 177, 6 - - - 180, 22 - - - Side - - - 180, 22 - - - Bottom - 228, 22 Image preview - - 229, 450 + + 130, 22 - - cmsTaskInfo + + Show - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 130, 22 + + + Hide + + + 130, 22 + + + Automatic + + + 127, 6 + + + 130, 22 + + + Side + + + 130, 22 + + + Bottom + + + 228, 22 + + + Switch to thumbnail view 105, 17 @@ -1387,6 +1417,24 @@ 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 @@ -1468,6 +1516,28 @@ 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 @@ -1504,33 +1574,11 @@ 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 - - Capture + + Upload 203, 22 @@ -1574,18 +1622,18 @@ Shorten URL... - - 192, 22 - - - Upload - 192, 22 Workflows + + 192, 22 + + + Tools + 184, 22 @@ -1670,12 +1718,6 @@ Monitor test... - - 192, 22 - - - Tools - 189, 6 @@ -1691,6 +1733,12 @@ After upload tasks + + 192, 22 + + + Destinations + 219, 22 @@ -1736,12 +1784,6 @@ Custom uploader settings... - - 192, 22 - - - Destinations - 192, 22 @@ -1787,6 +1829,12 @@ Image history... + + 192, 22 + + + Debug + 172, 22 @@ -1823,12 +1871,6 @@ Test URL sharing - - 192, 22 - - - Debug - 192, 22 @@ -1871,18 +1913,6 @@ Exit - - 193, 484 - - - cmsTray - - - System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - ShareX - 405, 17 @@ -2025,71 +2055,8 @@ $this - 3 - - - Bottom, Right - - - True - - - GrowAndShrink - - - 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 - - BottomUp - - - 608, 322 - - - 221, 102 - - - 6 - - - flpCommunity - - - System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - 4 - True @@ -2141,6 +2108,81 @@ 2 + + Bottom, Right + + + True + + + GrowAndShrink + + + flpDiscord + + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + flpCommunity + + + 1 + + + BottomUp + + + 608, 322 + + + 221, 102 + + + 6 + + + flpCommunity + + + System.Windows.Forms.FlowLayoutPanel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + $this + + + 4 + + + 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 @@ -3035,6 +3077,12 @@ System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + tsmiSwitchTaskViewMode + + + System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + niTray diff --git a/ShareX/Properties/Resources.Designer.cs b/ShareX/Properties/Resources.Designer.cs index 3bbd39411..33c74a284 100644 --- a/ShareX/Properties/Resources.Designer.cs +++ b/ShareX/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace ShareX.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class Resources { @@ -411,6 +411,16 @@ public static System.Drawing.Bitmap application_icon_large { } } + /// + /// Looks up a localized resource of type System.Drawing.Bitmap. + /// + public static System.Drawing.Bitmap application_list { + get { + object obj = ResourceManager.GetObject("application_list", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Looks up a localized resource of type System.Drawing.Bitmap. /// diff --git a/ShareX/Properties/Resources.resx b/ShareX/Properties/Resources.resx index 32a8d53a9..e5e6bbac8 100644 --- a/ShareX/Properties/Resources.resx +++ b/ShareX/Properties/Resources.resx @@ -1003,4 +1003,7 @@ Would you like to restart ShareX? ShareX - Optical character recognition + + ..\Resources\application-list.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/ShareX/Resources/application-list.png b/ShareX/Resources/application-list.png new file mode 100644 index 0000000000000000000000000000000000000000..52ffff9e07ac5290b61d79defc3ac2cd7b220914 GIT binary patch literal 495 zcmVQ4w799@MFZ7!j~#|eTVbdY&L^!N)(Gl9oJLD-aolNh>ma^$E;K;m$6tZ<2W|hwu6u$CGBl+ zT^Br)0booh2(bf$!Qj1Ke|i*nVSh9lW%~WTx=cV(g>`#GrqO8Z3Qg18d_KQX{${hu z1lnYzc=BREr|=2wb{j&Wkbh}796}@#fp|QwFfYa!MN|TuY`va;sLa`HcIAt7J}=HW zeRE&n?WzjLcMs5NwbYCAnoK4T3`W8Dc!8FZ3I`OfL0+xFnz=+?-jc2#`vpR=!FO7kfZl-$AWbgHovk z-EJ2Wi3C`dwbYC8c&xG;hT)B{5S{}ZB8}{n%Vl+t%jMLn>-yRr5Jz#N(dY%v!Qm!@ lgfYI@wtpjsE$df+0RSNr>Ne-y1{VMT002ovPDHLkV1gzw*6;uT literal 0 HcmV?d00001 diff --git a/ShareX/ShareX.csproj b/ShareX/ShareX.csproj index aa80bb71c..ccefa8e84 100644 --- a/ShareX/ShareX.csproj +++ b/ShareX/ShareX.csproj @@ -1592,6 +1592,9 @@ + + +