diff --git a/ShareX/Controls/TaskPanel.Designer.cs b/ShareX/Controls/TaskThumbnailPanel.Designer.cs similarity index 99% rename from ShareX/Controls/TaskPanel.Designer.cs rename to ShareX/Controls/TaskThumbnailPanel.Designer.cs index 076cb3fbe..ae4cf4284 100644 --- a/ShareX/Controls/TaskPanel.Designer.cs +++ b/ShareX/Controls/TaskThumbnailPanel.Designer.cs @@ -1,6 +1,6 @@ namespace ShareX { - partial class TaskPanel + partial class TaskThumbnailPanel { /// /// Required designer variable. diff --git a/ShareX/Controls/TaskPanel.cs b/ShareX/Controls/TaskThumbnailPanel.cs similarity index 98% rename from ShareX/Controls/TaskPanel.cs rename to ShareX/Controls/TaskThumbnailPanel.cs index ecd9185e8..99c4aa1f6 100644 --- a/ShareX/Controls/TaskPanel.cs +++ b/ShareX/Controls/TaskThumbnailPanel.cs @@ -32,7 +32,7 @@ You should have received a copy of the GNU General Public License namespace ShareX { - public partial class TaskPanel : UserControl + public partial class TaskThumbnailPanel : UserControl { public new event MouseEventHandler MouseDown { @@ -135,7 +135,7 @@ public bool ProgressVisible private Rectangle dragBoxFromMouseDown; - public TaskPanel(WorkerTask task) + public TaskThumbnailPanel(WorkerTask task) { Task = task; diff --git a/ShareX/Controls/TaskPanel.resx b/ShareX/Controls/TaskThumbnailPanel.resx similarity index 100% rename from ShareX/Controls/TaskPanel.resx rename to ShareX/Controls/TaskThumbnailPanel.resx diff --git a/ShareX/Controls/TaskView.Designer.cs b/ShareX/Controls/TaskThumbnailView.Designer.cs similarity index 98% rename from ShareX/Controls/TaskView.Designer.cs rename to ShareX/Controls/TaskThumbnailView.Designer.cs index d7444765a..19058ad41 100644 --- a/ShareX/Controls/TaskView.Designer.cs +++ b/ShareX/Controls/TaskThumbnailView.Designer.cs @@ -1,6 +1,6 @@ namespace ShareX { - partial class TaskView + partial class TaskThumbnailView { /// /// Required designer variable. diff --git a/ShareX/Controls/TaskView.cs b/ShareX/Controls/TaskThumbnailView.cs similarity index 78% rename from ShareX/Controls/TaskView.cs rename to ShareX/Controls/TaskThumbnailView.cs index e8c7c5afa..1ca639857 100644 --- a/ShareX/Controls/TaskView.cs +++ b/ShareX/Controls/TaskThumbnailView.cs @@ -31,18 +31,18 @@ You should have received a copy of the GNU General Public License namespace ShareX { - public partial class TaskView : UserControl + public partial class TaskThumbnailView : UserControl { - public List TaskPanels { get; private set; } + public List Panels { get; private set; } + public TaskThumbnailPanel SelectedPanel { get; private set; } public Size ThumbnailSize { get; set; } = new Size(200, 150); - public TaskPanel SelectedTaskPanel { get; private set; } public delegate void TaskViewMouseEventHandler(object sender, MouseEventArgs e, WorkerTask task); public event TaskViewMouseEventHandler ContextMenuRequested; - public TaskView() + public TaskThumbnailView() { - TaskPanels = new List(); + Panels = new List(); InitializeComponent(); UpdateTheme(); @@ -64,35 +64,35 @@ public void UpdateTheme() BackColor = SystemColors.Window; } - foreach (TaskPanel panel in TaskPanels) + foreach (TaskThumbnailPanel panel in Panels) { panel.UpdateTheme(); } } - public TaskPanel FindPanel(WorkerTask task) + public TaskThumbnailPanel FindPanel(WorkerTask task) { - return TaskPanels.FirstOrDefault(x => x.Task == task); + return Panels.FirstOrDefault(x => x.Task == task); } public void AddTaskPanel(WorkerTask task) { - TaskPanel panel = new TaskPanel(task); + TaskThumbnailPanel panel = new TaskThumbnailPanel(task); panel.ChangeThumbnailSize(ThumbnailSize); - panel.MouseDown += (sender, e) => SelectedTaskPanel = panel; + panel.MouseDown += (sender, e) => SelectedPanel = panel; panel.MouseUp += Panel_MouseUp; - TaskPanels.Add(panel); + Panels.Add(panel); flpMain.Controls.Add(panel); flpMain.Controls.SetChildIndex(panel, 0); } public void RemoveTaskPanel(WorkerTask task) { - TaskPanel panel = FindPanel(task); + TaskThumbnailPanel panel = FindPanel(task); if (panel != null) { - TaskPanels.Remove(panel); + Panels.Remove(panel); flpMain.Controls.Remove(panel); panel.Dispose(); } @@ -108,14 +108,14 @@ protected void OnContextMenuRequested(object sender, MouseEventArgs e, WorkerTas private void FlpMain_MouseDown(object sender, MouseEventArgs e) { - SelectedTaskPanel = null; + SelectedPanel = null; } private void Panel_MouseUp(object sender, MouseEventArgs e) { if (e.Button == MouseButtons.Right) { - OnContextMenuRequested(sender, e, SelectedTaskPanel?.Task); + OnContextMenuRequested(sender, e, SelectedPanel?.Task); } } } diff --git a/ShareX/Controls/TaskView.resx b/ShareX/Controls/TaskThumbnailView.resx similarity index 100% rename from ShareX/Controls/TaskView.resx rename to ShareX/Controls/TaskThumbnailView.resx diff --git a/ShareX/Forms/MainForm.Designer.cs b/ShareX/Forms/MainForm.Designer.cs index 7934e66ac..f6aecf6a5 100644 --- a/ShareX/Forms/MainForm.Designer.cs +++ b/ShareX/Forms/MainForm.Designer.cs @@ -276,7 +276,7 @@ private void InitializeComponent() 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.ucTaskThumbnailView = new ShareX.TaskThumbnailView(); this.flpCommunity = new System.Windows.Forms.FlowLayoutPanel(); this.flpDiscord = new System.Windows.Forms.FlowLayoutPanel(); ((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit(); @@ -2172,7 +2172,7 @@ private void InitializeComponent() // this.pThumbnailView.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(47)))), ((int)(((byte)(56))))); this.pThumbnailView.Controls.Add(this.lblThumbnailViewTip); - this.pThumbnailView.Controls.Add(this.ucTaskView); + this.pThumbnailView.Controls.Add(this.ucTaskThumbnailView); resources.ApplyResources(this.pThumbnailView, "pThumbnailView"); this.pThumbnailView.Name = "pThumbnailView"; // @@ -2185,13 +2185,13 @@ private void InitializeComponent() this.lblThumbnailViewTip.UseMnemonic = false; this.lblThumbnailViewTip.MouseUp += new System.Windows.Forms.MouseEventHandler(this.LblThumbnailViewTip_MouseUp); // - // ucTaskView + // ucTaskThumbnailView // - 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); + resources.ApplyResources(this.ucTaskThumbnailView, "ucTaskThumbnailView"); + this.ucTaskThumbnailView.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(47)))), ((int)(((byte)(56))))); + this.ucTaskThumbnailView.Name = "ucTaskThumbnailView"; + this.ucTaskThumbnailView.ThumbnailSize = new System.Drawing.Size(200, 150); + this.ucTaskThumbnailView.ContextMenuRequested += new ShareX.TaskThumbnailView.TaskViewMouseEventHandler(this.UcTaskView_ContextMenuRequested); // // flpCommunity // @@ -2503,7 +2503,7 @@ private void InitializeComponent() private System.Windows.Forms.ToolStripMenuItem tsmiCustomUploaderSettings; private System.Windows.Forms.ToolStripMenuItem tsmiTrayCustomUploaderSettings; private System.Windows.Forms.Panel pThumbnailView; - private TaskView ucTaskView; + private TaskThumbnailView ucTaskThumbnailView; private System.Windows.Forms.ToolStripMenuItem tsmiSwitchTaskViewMode; public System.Windows.Forms.Label lblThumbnailViewTip; } diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index f25cb4f0c..af93431bb 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -167,7 +167,7 @@ private void InitializeControls() lvUploads.SmallImageList = il; TaskManager.ListViewControl = lvUploads; - TaskManager.TaskView = ucTaskView; + TaskManager.TaskThumbnailView = ucTaskThumbnailView; uim = new UploadInfoManager(lvUploads); // Required for BackColor Transparent to work @@ -798,7 +798,7 @@ private void UpdateTheme() } pbPreview.UpdateCheckers(true); - ucTaskView.UpdateTheme(); + ucTaskThumbnailView.UpdateTheme(); ucNews.UpdateTheme(); } @@ -1040,9 +1040,9 @@ private void RemoveSelectedItems() { RemoveTasks(lvUploads.SelectedItems.Cast().Select(x => x.Tag as WorkerTask)); } - else if (Program.Settings.TaskViewMode == TaskViewMode.ThumbnailView && ucTaskView.SelectedTaskPanel != null) + else if (Program.Settings.TaskViewMode == TaskViewMode.ThumbnailView && ucTaskThumbnailView.SelectedPanel != null) { - RemoveTasks(new WorkerTask[] { ucTaskView.SelectedTaskPanel.Task }); + RemoveTasks(new WorkerTask[] { ucTaskThumbnailView.SelectedPanel.Task }); } } diff --git a/ShareX/Forms/MainForm.resx b/ShareX/Forms/MainForm.resx index 75f240615..0879786b1 100644 --- a/ShareX/Forms/MainForm.resx +++ b/ShareX/Forms/MainForm.resx @@ -2031,7 +2031,7 @@ $this - 0 + 2 Fill @@ -2066,31 +2066,31 @@ 0 - + True - + Fill - + 0, 0 - + 674, 429 - + 0 - - ucTaskView + + ucTaskThumbnailView - - ShareX.TaskView, ShareX, Version=13.0.0.0, Culture=neutral, PublicKeyToken=null + + ShareX.TaskThumbnailView, ShareX, Version=13.0.0.0, Culture=neutral, PublicKeyToken=null - + pThumbnailView - + 1 @@ -2178,7 +2178,7 @@ $this - 1 + 3 True diff --git a/ShareX/ShareX.csproj b/ShareX/ShareX.csproj index 4cb327ed0..fc3b25acb 100644 --- a/ShareX/ShareX.csproj +++ b/ShareX/ShareX.csproj @@ -161,20 +161,20 @@ NewsListControl.cs - + UserControl - - TaskPanel.cs + + TaskThumbnailPanel.cs Component - + UserControl - - TaskView.cs + + TaskThumbnailView.cs @@ -405,11 +405,11 @@ NewsListControl.cs - - TaskPanel.cs + + TaskThumbnailPanel.cs - - TaskView.cs + + TaskThumbnailView.cs AboutForm.cs diff --git a/ShareX/TaskManager.cs b/ShareX/TaskManager.cs index fbb09c2cc..fbcf743fc 100644 --- a/ShareX/TaskManager.cs +++ b/ShareX/TaskManager.cs @@ -40,7 +40,7 @@ public static class TaskManager { public static MyListView ListViewControl { get; set; } - public static TaskView TaskView { get; set; } + public static TaskThumbnailView TaskThumbnailView { get; set; } public static bool IsBusy { @@ -77,7 +77,7 @@ public static void Start(WorkerTask task) if (Program.Settings.TaskViewMode == TaskViewMode.ThumbnailView) { - TaskView.AddTaskPanel(task); + TaskThumbnailView.AddTaskPanel(task); } if (task.Status != TaskStatus.History) @@ -102,7 +102,7 @@ public static void Remove(WorkerTask task) ListViewControl.Items.Remove(lvi); } - TaskView.RemoveTaskPanel(task); + TaskThumbnailView.RemoveTaskPanel(task); task.Dispose(); } @@ -251,7 +251,7 @@ private static void task_UploadStarted(WorkerTask task) lvi.ImageIndex = 0; } - TaskPanel panel = TaskView.FindPanel(task); + TaskThumbnailPanel panel = TaskThumbnailView.FindPanel(task); if (panel != null) { @@ -293,7 +293,7 @@ private static void task_UploadProgressChanged(WorkerTask task) lvi.SubItems[5].Text = Helpers.ProperTimeSpan(info.Progress.Remaining); } - TaskPanel panel = TaskView.FindPanel(task); + TaskThumbnailPanel panel = TaskThumbnailView.FindPanel(task); if (panel != null) { @@ -325,7 +325,7 @@ private static void task_UploadCompleted(WorkerTask task) } } - TaskPanel panel = TaskView.FindPanel(task); + TaskThumbnailPanel panel = TaskThumbnailView.FindPanel(task); if (panel != null) { @@ -350,7 +350,7 @@ private static void task_TaskCompleted(WorkerTask task) if (info != null && info.Result != null) { - TaskPanel panel = TaskView.FindPanel(task); + TaskThumbnailPanel panel = TaskThumbnailView.FindPanel(task); if (panel != null) {