mirror of
https://github.com/ShareX/ShareX.git
synced 2024-09-29 17:02:05 +13:00
Rename controls
This commit is contained in:
parent
9875e3bc29
commit
02b51ab23f
11 changed files with 62 additions and 62 deletions
|
@ -1,6 +1,6 @@
|
|||
namespace ShareX
|
||||
{
|
||||
partial class TaskPanel
|
||||
partial class TaskThumbnailPanel
|
||||
{
|
||||
/// <summary>
|
||||
/// Required designer variable.
|
|
@ -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;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
namespace ShareX
|
||||
{
|
||||
partial class TaskView
|
||||
partial class TaskThumbnailView
|
||||
{
|
||||
/// <summary>
|
||||
/// Required designer variable.
|
|
@ -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<TaskPanel> TaskPanels { get; private set; }
|
||||
public List<TaskThumbnailPanel> 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<TaskPanel>();
|
||||
Panels = new List<TaskThumbnailPanel>();
|
||||
|
||||
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);
|
||||
}
|
||||
}
|
||||
}
|
18
ShareX/Forms/MainForm.Designer.cs
generated
18
ShareX/Forms/MainForm.Designer.cs
generated
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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<ListViewItem>().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 });
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -2031,7 +2031,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>pNews.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name="lblThumbnailViewTip.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Fill</value>
|
||||
|
@ -2066,31 +2066,31 @@
|
|||
<data name=">>lblThumbnailViewTip.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="ucTaskView.AutoScroll" type="System.Boolean, mscorlib">
|
||||
<data name="ucTaskThumbnailView.AutoScroll" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name="ucTaskView.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<data name="ucTaskThumbnailView.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Fill</value>
|
||||
</data>
|
||||
<data name="ucTaskView.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<data name="ucTaskThumbnailView.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>0, 0</value>
|
||||
</data>
|
||||
<data name="ucTaskView.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<data name="ucTaskThumbnailView.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>674, 429</value>
|
||||
</data>
|
||||
<data name="ucTaskView.TabIndex" type="System.Int32, mscorlib">
|
||||
<data name="ucTaskThumbnailView.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name=">>ucTaskView.Name" xml:space="preserve">
|
||||
<value>ucTaskView</value>
|
||||
<data name=">>ucTaskThumbnailView.Name" xml:space="preserve">
|
||||
<value>ucTaskThumbnailView</value>
|
||||
</data>
|
||||
<data name=">>ucTaskView.Type" xml:space="preserve">
|
||||
<value>ShareX.TaskView, ShareX, Version=13.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
<data name=">>ucTaskThumbnailView.Type" xml:space="preserve">
|
||||
<value>ShareX.TaskThumbnailView, ShareX, Version=13.0.0.0, Culture=neutral, PublicKeyToken=null</value>
|
||||
</data>
|
||||
<data name=">>ucTaskView.Parent" xml:space="preserve">
|
||||
<data name=">>ucTaskThumbnailView.Parent" xml:space="preserve">
|
||||
<value>pThumbnailView</value>
|
||||
</data>
|
||||
<data name=">>ucTaskView.ZOrder" xml:space="preserve">
|
||||
<data name=">>ucTaskThumbnailView.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
</data>
|
||||
<data name="pThumbnailView.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
|
@ -2178,7 +2178,7 @@
|
|||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>flpCommunity.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
<value>3</value>
|
||||
</data>
|
||||
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||
<value>True</value>
|
||||
|
|
|
@ -161,20 +161,20 @@
|
|||
<Compile Include="Controls\NewsListControl.Designer.cs">
|
||||
<DependentUpon>NewsListControl.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Controls\TaskPanel.cs">
|
||||
<Compile Include="Controls\TaskThumbnailPanel.cs">
|
||||
<SubType>UserControl</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Controls\TaskPanel.Designer.cs">
|
||||
<DependentUpon>TaskPanel.cs</DependentUpon>
|
||||
<Compile Include="Controls\TaskThumbnailPanel.Designer.cs">
|
||||
<DependentUpon>TaskThumbnailPanel.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Controls\TaskRoundedCornerPanel.cs">
|
||||
<SubType>Component</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Controls\TaskView.cs">
|
||||
<Compile Include="Controls\TaskThumbnailView.cs">
|
||||
<SubType>UserControl</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Controls\TaskView.Designer.cs">
|
||||
<DependentUpon>TaskView.cs</DependentUpon>
|
||||
<Compile Include="Controls\TaskThumbnailView.Designer.cs">
|
||||
<DependentUpon>TaskThumbnailView.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="EasterEggAboutAnimation.cs" />
|
||||
<Compile Include="EasterEggBounce.cs" />
|
||||
|
@ -405,11 +405,11 @@
|
|||
<EmbeddedResource Include="Controls\NewsListControl.resx">
|
||||
<DependentUpon>NewsListControl.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Controls\TaskPanel.resx">
|
||||
<DependentUpon>TaskPanel.cs</DependentUpon>
|
||||
<EmbeddedResource Include="Controls\TaskThumbnailPanel.resx">
|
||||
<DependentUpon>TaskThumbnailPanel.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Controls\TaskView.resx">
|
||||
<DependentUpon>TaskView.cs</DependentUpon>
|
||||
<EmbeddedResource Include="Controls\TaskThumbnailView.resx">
|
||||
<DependentUpon>TaskThumbnailView.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Forms\AboutForm.de.resx">
|
||||
<DependentUpon>AboutForm.cs</DependentUpon>
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
|
|
Loading…
Reference in a new issue