diff --git a/ShareX/Forms/MainForm.Designer.cs b/ShareX/Forms/MainForm.Designer.cs index b3347b455..e1f1832c1 100644 --- a/ShareX/Forms/MainForm.Designer.cs +++ b/ShareX/Forms/MainForm.Designer.cs @@ -272,11 +272,11 @@ private void InitializeComponent() this.pbDiscordHide = new System.Windows.Forms.PictureBox(); 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.ucNews = new ShareX.NewsListControl(); ((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit(); this.scMain.Panel1.SuspendLayout(); this.scMain.Panel2.SuspendLayout(); @@ -2148,6 +2148,12 @@ private void InitializeComponent() this.btnCloseNews.UseVisualStyleBackColor = true; this.btnCloseNews.Click += new System.EventHandler(this.btnCloseNews_Click); // + // ucNews + // + this.ucNews.BackColor = System.Drawing.SystemColors.Window; + resources.ApplyResources(this.ucNews, "ucNews"); + this.ucNews.Name = "ucNews"; + // // flpCommunity // resources.ApplyResources(this.flpCommunity, "flpCommunity"); @@ -2177,12 +2183,6 @@ private void InitializeComponent() this.ucTaskView.ThumbnailSize = new System.Drawing.Size(200, 150); this.ucTaskView.ContextMenuRequested += new ShareX.TaskView.TaskViewMouseEventHandler(this.UcTaskView_ContextMenuRequested); // - // ucNews - // - this.ucNews.BackColor = System.Drawing.SystemColors.Window; - resources.ApplyResources(this.ucNews, "ucNews"); - this.ucNews.Name = "ucNews"; - // // MainForm // this.AllowDrop = true; diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index f3fb8604f..0d176c13a 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -597,7 +597,7 @@ private void UpdateContextMenu(WorkerTask task = null) tsmiStopUpload.Visible = tsmiOpen.Visible = tsmiCopy.Visible = tsmiShowErrors.Visible = tsmiShowResponse.Visible = tsmiSearchImage.Visible = tsmiShowQRCode.Visible = tsmiOCRImage.Visible = tsmiCombineImages.Visible = tsmiUploadSelectedFile.Visible = tsmiDownloadSelectedURL.Visible = tsmiEditSelectedFile.Visible = tsmiDeleteSelectedItem.Visible = tsmiDeleteSelectedFile.Visible = tsmiShortenSelectedURL.Visible = - tsmiShareSelectedURL.Visible = tsmiClearList.Visible = tssUploadInfo1.Visible = false; + tsmiShareSelectedURL.Visible = tsmiClearList.Visible = tssUploadInfo1.Visible = tsmiHideColumns.Visible = tsmiImagePreview.Visible = false; if (Program.Settings.TaskViewMode == TaskViewMode.ListView) { @@ -745,6 +745,8 @@ private void UpdateContextMenu(WorkerTask task = null) tsmiClearList.Visible = tssUploadInfo1.Visible = lvUploads.Items.Count > 0; + tsmiHideColumns.Visible = tsmiImagePreview.Visible = Program.Settings.TaskViewMode == TaskViewMode.ListView; + cmsTaskInfo.ResumeLayout(); Refresh(); } diff --git a/ShareX/Forms/MainForm.resx b/ShareX/Forms/MainForm.resx index eb23eef5b..3bdfd3ce9 100644 --- a/ShareX/Forms/MainForm.resx +++ b/ShareX/Forms/MainForm.resx @@ -1316,7 +1316,7 @@ 228, 22 - Clear list + Clear task list 225, 6 @@ -1334,34 +1334,34 @@ Hide columns - 130, 22 + 180, 22 Show - 130, 22 + 180, 22 Hide - 130, 22 + 180, 22 Automatic - 127, 6 + 177, 6 - 130, 22 + 180, 22 Side - 130, 22 + 180, 22 Bottom