CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-09-29 17:02:05 +13:00
Code Issues Projects Releases Packages Wiki Activity

Only add or update task panel if view mode is thumbnail

Browse source
This commit is contained in:
Jaex 2019-05-13 02:03:15 +03:00
parent 0bf55a6763
commit 91a41524a5
1 changed files with 62 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

103
ShareX/TaskManager.cs
View file

@ -74,7 +74,11 @@ public static void Start(WorkerTask task)
}
CreateListViewItem(task);
TaskView.AddTaskPanel(task);
if (Program.Settings.TaskViewMode == TaskViewMode.ThumbnailView)
{
TaskView.AddTaskPanel(task);
}
if (task.Status != TaskStatus.History)
{
@ -162,19 +166,6 @@ private static ListViewItem FindListViewItem(WorkerTask task)
return null;
}
private static void ChangeListViewItemStatus(WorkerTask task)
{
if (ListViewControl != null)
{
ListViewItem lvi = FindListViewItem(task);
if (lvi != null)
{
lvi.SubItems[1].Text = task.Info.Status;
}
}
}
private static void CreateListViewItem(WorkerTask task)
{
if (ListViewControl != null)
@ -230,6 +221,19 @@ private static void CreateListViewItem(WorkerTask task)
}
}
private static void ChangeListViewItemStatus(WorkerTask task)
{
if (ListViewControl != null)
{
ListViewItem lvi = FindListViewItem(task);
if (lvi != null)
{
lvi.SubItems[1].Text = task.Info.Status;
}
}
}
private static void task_StatusChanged(WorkerTask task)
{
DebugHelper.WriteLine("Task status: " + task.Status);
@ -254,45 +258,54 @@ private static void task_UploadStarted(WorkerTask task)
lvi.ImageIndex = 0;
}
TaskView.UpdateFilename(task);
TaskView.UpdateThumbnail(task);
TaskView.UpdateProgressVisible(task, true);
if (Program.Settings.TaskViewMode == TaskViewMode.ThumbnailView)
{
TaskView.UpdateFilename(task);
TaskView.UpdateThumbnail(task);
TaskView.UpdateProgressVisible(task, true);
}
}
private static void task_UploadProgressChanged(WorkerTask task)
{
if (task.Status == TaskStatus.Working && ListViewControl != null)
if (task.Status == TaskStatus.Working)
{
TaskInfo info = task.Info;
ListViewItem lvi = FindListViewItem(task);
if (lvi != null)
if (ListViewControl != null)
{
lvi.SubItems[1].Text = string.Format("{0:0.0}%", info.Progress.Percentage);
TaskInfo info = task.Info;
if (info.Progress.CustomProgressText != null)
{
lvi.SubItems[2].Text = info.Progress.CustomProgressText;
lvi.SubItems[3].Text = "";
}
else
{
lvi.SubItems[2].Text = string.Format("{0} / {1}", info.Progress.Position.ToSizeString(Program.Settings.BinaryUnits), info.Progress.Length.ToSizeString(Program.Settings.BinaryUnits));
ListViewItem lvi = FindListViewItem(task);
if (info.Progress.Speed > 0)
if (lvi != null)
{
lvi.SubItems[1].Text = string.Format("{0:0.0}%", info.Progress.Percentage);
if (info.Progress.CustomProgressText != null)
{
lvi.SubItems[3].Text = ((long)info.Progress.Speed).ToSizeString(Program.Settings.BinaryUnits) + "/s";
lvi.SubItems[2].Text = info.Progress.CustomProgressText;
lvi.SubItems[3].Text = "";
}
}
else
{
lvi.SubItems[2].Text = string.Format("{0} / {1}", info.Progress.Position.ToSizeString(Program.Settings.BinaryUnits), info.Progress.Length.ToSizeString(Program.Settings.BinaryUnits));
lvi.SubItems[4].Text = Helpers.ProperTimeSpan(info.Progress.Elapsed);
lvi.SubItems[5].Text = Helpers.ProperTimeSpan(info.Progress.Remaining);
if (info.Progress.Speed > 0)
{
lvi.SubItems[3].Text = ((long)info.Progress.Speed).ToSizeString(Program.Settings.BinaryUnits) + "/s";
}
}
lvi.SubItems[4].Text = Helpers.ProperTimeSpan(info.Progress.Elapsed);
lvi.SubItems[5].Text = Helpers.ProperTimeSpan(info.Progress.Remaining);
}
}
if (Program.Settings.TaskViewMode == TaskViewMode.ThumbnailView)
{
TaskView.UpdateProgress(task);
}
UpdateProgressUI();
TaskView.UpdateProgress(task);
}
}
@ -317,7 +330,10 @@ private static void task_UploadCompleted(WorkerTask task)
}
}
TaskView.UpdateProgressVisible(task, false);
if (Program.Settings.TaskViewMode == TaskViewMode.ThumbnailView)
{
TaskView.UpdateProgressVisible(task, false);
}
}
private static void task_TaskCompleted(WorkerTask task)
@ -326,7 +342,7 @@ private static void task_TaskCompleted(WorkerTask task)
{
task.KeepImage = false;
if (ListViewControl != null && task != null)
if (task != null)
{
if (task.RequestSettingUpdate)
{
@ -477,6 +493,11 @@ private static void task_TaskCompleted(WorkerTask task)
ListViewControl.SelectSingle(lvi);
}
}
if (Program.Settings.TaskViewMode == TaskViewMode.ThumbnailView)
{
TaskView.UpdateProgressVisible(task, false);
}
}
}
}