CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-06-28 03:00:22 +12:00
Code Issues Packages Projects Releases Wiki Activity

If DevMode then show detailed progress text

Browse source
This commit is contained in:
Jaex 2023-12-13 04:34:01 +03:00
parent 3af89ed9aa
commit dbc7312ed7
6 changed files with 109 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ShareX/Controls/TaskThumbnailPanel.cs
View file

@ -399,6 +399,12 @@ public void UpdateProgress()
if (Task.Info != null)
{
Progress = (int)Task.Info.Progress.Percentage;
if (HelpersOptions.DevMode)
{
pbProgress.Text = string.Format("{0} / {1}", Task.Info.Progress.Position.ToSizeString(Program.Settings.BinaryUnits),
Task.Info.Progress.Length.ToSizeString(Program.Settings.BinaryUnits));
}
}
}

18
ShareX/Controls/TaskThumbnailPanel.resx
View file

@ -122,7 +122,7 @@
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="lblTitle.Font" type="System.Drawing.Font, System.Drawing">
<value>Arial, 11.25pt</value>
<value>Segoe UI, 9pt, style=Bold</value>
</data>
<data name="lblTitle.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
@ -138,7 +138,7 @@
<value>lblTitle</value>
</data>
<data name="&gt;&gt;lblTitle.Type" xml:space="preserve">
<value>ShareX.HelpersLib.BlackStyleLabel, ShareX.HelpersLib, Version=14.1.3.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.BlackStyleLabel, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lblTitle.Parent" xml:space="preserve">
<value>$this</value>
@ -169,7 +169,7 @@
<value>lblCombineVertical</value>
</data>
<data name="&gt;&gt;lblCombineVertical.Type" xml:space="preserve">
<value>ShareX.HelpersLib.BlackStyleLabel, ShareX.HelpersLib, Version=14.1.3.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.BlackStyleLabel, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lblCombineVertical.Parent" xml:space="preserve">
<value>pThumbnail</value>
@ -182,7 +182,7 @@
<value>Top</value>
</data>
<data name="lblError.Font" type="System.Drawing.Font, System.Drawing">
<value>Arial, 12pt</value>
<value>Segoe UI, 11.25pt, style=Bold</value>
</data>
<data name="lblError.Location" type="System.Drawing.Point, System.Drawing">
<value>96, 7</value>
@ -203,7 +203,7 @@
<value>lblError</value>
</data>
<data name="&gt;&gt;lblError.Type" xml:space="preserve">
<value>ShareX.HelpersLib.BlackStyleLabel, ShareX.HelpersLib, Version=14.1.3.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.BlackStyleLabel, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lblError.Parent" xml:space="preserve">
<value>pThumbnail</value>
@ -234,7 +234,7 @@
<value>lblCombineHorizontal</value>
</data>
<data name="&gt;&gt;lblCombineHorizontal.Type" xml:space="preserve">
<value>ShareX.HelpersLib.BlackStyleLabel, ShareX.HelpersLib, Version=14.1.3.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.BlackStyleLabel, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;lblCombineHorizontal.Parent" xml:space="preserve">
<value>pThumbnail</value>
@ -246,7 +246,7 @@
<value>Bottom, Left, Right</value>
</data>
<data name="pbProgress.Font" type="System.Drawing.Font, System.Drawing">
<value>Arial, 11.25pt</value>
<value>Segoe UI, 9pt, style=Bold</value>
</data>
<data name="pbProgress.Location" type="System.Drawing.Point, System.Drawing">
<value>7, 217</value>
@ -267,7 +267,7 @@
<value>pbProgress</value>
</data>
<data name="&gt;&gt;pbProgress.Type" xml:space="preserve">
<value>ShareX.HelpersLib.BlackStyleProgressBar, ShareX.HelpersLib, Version=14.1.3.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.HelpersLib.BlackStyleProgressBar, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;pbProgress.Parent" xml:space="preserve">
<value>pThumbnail</value>
@ -318,7 +318,7 @@
<value>pThumbnail</value>
</data>
<data name="&gt;&gt;pThumbnail.Type" xml:space="preserve">
<value>ShareX.TaskRoundedCornerPanel, ShareX, Version=14.1.3.0, Culture=neutral, PublicKeyToken=null</value>
<value>ShareX.TaskRoundedCornerPanel, ShareX, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;pThumbnail.Parent" xml:space="preserve">
<value>$this</value>

45
ShareX/Forms/MainForm.Designer.cs generated
View file

@ -284,7 +284,6 @@ private void InitializeComponent()
this.tsmiTrayShow = new System.Windows.Forms.ToolStripMenuItem();
this.tsmiTrayExit = new System.Windows.Forms.ToolStripMenuItem();
this.timerTraySingleClick = new System.Windows.Forms.Timer(this.components);
this.pThumbnailView = new System.Windows.Forms.Panel();
this.ucTaskThumbnailView = new ShareX.TaskThumbnailView();
this.ttMain = new System.Windows.Forms.ToolTip(this.components);
this.pToolbars = new System.Windows.Forms.Panel();
@ -292,6 +291,8 @@ private void InitializeComponent()
this.cHotkeyStatus = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.cHotkey = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.cDescription = new System.Windows.Forms.DataGridViewTextBoxColumn();
this.pMain = new System.Windows.Forms.Panel();
this.pHotkeys = new System.Windows.Forms.Panel();
((System.ComponentModel.ISupportInitialize)(this.scMain)).BeginInit();
this.scMain.Panel1.SuspendLayout();
this.scMain.Panel2.SuspendLayout();
@ -299,9 +300,10 @@ private void InitializeComponent()
this.tsMain.SuspendLayout();
this.cmsTaskInfo.SuspendLayout();
this.cmsTray.SuspendLayout();
this.pThumbnailView.SuspendLayout();
this.pToolbars.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.dgvHotkeys)).BeginInit();
this.pMain.SuspendLayout();
this.pHotkeys.SuspendLayout();
this.SuspendLayout();
//
// scMain
@ -378,7 +380,6 @@ private void InitializeComponent()
//
// pbPreview
//
this.pbPreview.BackColor = System.Drawing.SystemColors.Window;
this.pbPreview.Cursor = System.Windows.Forms.Cursors.Hand;
resources.ApplyResources(this.pbPreview, "pbPreview");
this.pbPreview.DrawCheckeredBackground = true;
@ -2207,17 +2208,9 @@ private void InitializeComponent()
//
this.timerTraySingleClick.Tick += new System.EventHandler(this.timerTraySingleClick_Tick);
//
// pThumbnailView
//
this.pThumbnailView.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(47)))), ((int)(((byte)(56)))));
this.pThumbnailView.Controls.Add(this.ucTaskThumbnailView);
resources.ApplyResources(this.pThumbnailView, "pThumbnailView");
this.pThumbnailView.Name = "pThumbnailView";
//
// ucTaskThumbnailView
//
resources.ApplyResources(this.ucTaskThumbnailView, "ucTaskThumbnailView");
this.ucTaskThumbnailView.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(42)))), ((int)(((byte)(47)))), ((int)(((byte)(56)))));
this.ucTaskThumbnailView.ClickAction = ShareX.ThumbnailViewClickAction.Default;
this.ucTaskThumbnailView.Name = "ucTaskThumbnailView";
this.ucTaskThumbnailView.ThumbnailSize = new System.Drawing.Size(200, 150);
@ -2247,7 +2240,6 @@ private void InitializeComponent()
this.dgvHotkeys.AllowUserToDeleteRows = false;
this.dgvHotkeys.AllowUserToResizeColumns = false;
this.dgvHotkeys.AllowUserToResizeRows = false;
resources.ApplyResources(this.dgvHotkeys, "dgvHotkeys");
this.dgvHotkeys.AutoSizeRowsMode = System.Windows.Forms.DataGridViewAutoSizeRowsMode.AllCells;
this.dgvHotkeys.BorderStyle = System.Windows.Forms.BorderStyle.None;
this.dgvHotkeys.ColumnHeadersBorderStyle = System.Windows.Forms.DataGridViewHeaderBorderStyle.Single;
@ -2274,6 +2266,7 @@ private void InitializeComponent()
dataGridViewCellStyle3.SelectionForeColor = System.Drawing.SystemColors.HighlightText;
dataGridViewCellStyle3.WrapMode = System.Windows.Forms.DataGridViewTriState.False;
this.dgvHotkeys.DefaultCellStyle = dataGridViewCellStyle3;
resources.ApplyResources(this.dgvHotkeys, "dgvHotkeys");
this.dgvHotkeys.MultiSelect = false;
this.dgvHotkeys.Name = "dgvHotkeys";
this.dgvHotkeys.ReadOnly = true;
@ -2305,15 +2298,27 @@ private void InitializeComponent()
this.cDescription.ReadOnly = true;
this.cDescription.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.NotSortable;
//
// pMain
//
this.pMain.Controls.Add(this.pHotkeys);
this.pMain.Controls.Add(this.ucTaskThumbnailView);
this.pMain.Controls.Add(this.scMain);
resources.ApplyResources(this.pMain, "pMain");
this.pMain.Name = "pMain";
//
// pHotkeys
//
this.pHotkeys.Controls.Add(this.dgvHotkeys);
resources.ApplyResources(this.pHotkeys, "pHotkeys");
this.pHotkeys.Name = "pHotkeys";
//
// 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.dgvHotkeys);
this.Controls.Add(this.pThumbnailView);
this.Controls.Add(this.scMain);
this.Controls.Add(this.pMain);
this.Controls.Add(this.pToolbars);
this.DoubleBuffered = true;
this.Name = "MainForm";
@ -2333,10 +2338,11 @@ private void InitializeComponent()
this.tsMain.PerformLayout();
this.cmsTaskInfo.ResumeLayout(false);
this.cmsTray.ResumeLayout(false);
this.pThumbnailView.ResumeLayout(false);
this.pToolbars.ResumeLayout(false);
this.pToolbars.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.dgvHotkeys)).EndInit();
this.pMain.ResumeLayout(false);
this.pHotkeys.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
@ -2552,7 +2558,6 @@ private void InitializeComponent()
private System.Windows.Forms.ToolStripMenuItem tsmiTrayScreenshotDelay5;
private System.Windows.Forms.ToolStripMenuItem tsmiCustomUploaderSettings;
private System.Windows.Forms.ToolStripMenuItem tsmiTrayCustomUploaderSettings;
private System.Windows.Forms.Panel pThumbnailView;
private TaskThumbnailView ucTaskThumbnailView;
private System.Windows.Forms.ToolStripMenuItem tsmiSwitchTaskViewMode;
private System.Windows.Forms.ToolTip ttMain;
@ -2597,10 +2602,12 @@ private void InitializeComponent()
private System.Windows.Forms.ToolStripMenuItem tsmiImageBeautifier;
private System.Windows.Forms.ToolStripMenuItem tsmiTrayImageBeautifier;
private System.Windows.Forms.ToolStripMenuItem tsmiBeautifyImage;
internal System.Windows.Forms.DataGridView dgvHotkeys;
internal HelpersLib.MyListView lvUploads;
private System.Windows.Forms.DataGridViewTextBoxColumn cHotkeyStatus;
private System.Windows.Forms.DataGridViewTextBoxColumn cHotkey;
private System.Windows.Forms.DataGridViewTextBoxColumn cDescription;
private System.Windows.Forms.Panel pMain;
private System.Windows.Forms.DataGridView dgvHotkeys;
internal System.Windows.Forms.Panel pHotkeys;
private HelpersLib.MyListView lvUploads;
}
}

14
ShareX/Forms/MainForm.cs
View file

@ -750,16 +750,16 @@ private void UpdateTaskViewMode()
tsmiSwitchTaskViewMode.Text = Resources.SwitchToThumbnailView;
tsmiSwitchTaskViewMode.Image = Resources.application_icon_large;
scMain.Visible = true;
pThumbnailView.Visible = false;
ucTaskThumbnailView.Visible = false;
scMain.Focus();
}
else
{
tsmiSwitchTaskViewMode.Text = Resources.SwitchToListView;
tsmiSwitchTaskViewMode.Image = Resources.application_list;
pThumbnailView.Visible = true;
ucTaskThumbnailView.Visible = true;
scMain.Visible = false;
pThumbnailView.Focus();
ucTaskThumbnailView.Focus();
}
}
@ -786,6 +786,7 @@ public void UpdateTheme()
if (ShareXResources.UseCustomTheme)
{
BackColor = ShareXResources.Theme.BackgroundColor;
tsMain.Font = ShareXResources.Theme.MenuFont;
tsMain.Renderer = new ToolStripDarkRenderer();
tsMain.DrawCustomBorder = false;
@ -795,15 +796,14 @@ public void UpdateTheme()
ttMain.ForeColor = ShareXResources.Theme.TextColor;
lvUploads.BackColor = ShareXResources.Theme.BackgroundColor;
lvUploads.ForeColor = ShareXResources.Theme.TextColor;
scMain.BackColor = ShareXResources.Theme.BackgroundColor;
scMain.SplitterColor = ShareXResources.Theme.BackgroundColor;
scMain.SplitterLineColor = ShareXResources.Theme.BorderColor;
pThumbnailView.BackColor = ShareXResources.Theme.BackgroundColor;
ShareXResources.ApplyCustomThemeToControl(dgvHotkeys);
dgvHotkeys.BackgroundColor = ShareXResources.Theme.BackgroundColor;
}
else
{
BackColor = SystemColors.Window;
tsMain.Renderer = new ToolStripCustomRenderer();
tsMain.DrawCustomBorder = true;
cmsTray.Renderer = new ToolStripCustomRenderer();
@ -814,10 +814,8 @@ public void UpdateTheme()
ttMain.ForeColor = SystemColors.ControlText;
lvUploads.BackColor = SystemColors.Window;
lvUploads.ForeColor = SystemColors.ControlText;
scMain.BackColor = SystemColors.Window;
scMain.SplitterColor = Color.White;
scMain.SplitterLineColor = ProfessionalColors.SeparatorDark;
pThumbnailView.BackColor = SystemColors.Window;
dgvHotkeys.BackgroundColor = SystemColors.Window;
}
@ -1072,8 +1070,6 @@ private void UpdateMainWindowLayout()
{
tsMain.Visible = Program.Settings.ShowMenu;
dgvHotkeys.Location = new Point(tsMain.Width + 16, 16);
ucTaskThumbnailView.TitleVisible = Program.Settings.ShowThumbnailTitle;
ucTaskThumbnailView.TitleLocation = Program.Settings.ThumbnailTitleLocation;
ucTaskThumbnailView.ThumbnailSize = Program.Settings.ThumbnailSize;

97
ShareX/Forms/MainForm.resx
View file

@ -123,7 +123,7 @@
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="scMain.Location" type="System.Drawing.Point, System.Drawing">
<value>165, 0</value>
<value>0, 0</value>
</data>
<data name="chFilename.Text" xml:space="preserve">
<value>Filename</value>
@ -256,10 +256,10 @@
<value>ShareX.HelpersLib.SplitContainerCustomSplitter, ShareX.HelpersLib, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;scMain.Parent" xml:space="preserve">
<value>$this</value>
<value>pMain</value>
</data>
<data name="&gt;&gt;scMain.ZOrder" xml:space="preserve">
<value>4</value>
<value>2</value>
</data>
<metadata name="tsMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
@ -1843,34 +1843,10 @@
<value>ShareX.TaskThumbnailView, ShareX, Version=15.0.1.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;ucTaskThumbnailView.Parent" xml:space="preserve">
<value>pThumbnailView</value>
<value>pMain</value>
</data>
<data name="&gt;&gt;ucTaskThumbnailView.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="pThumbnailView.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="pThumbnailView.Location" type="System.Drawing.Point, System.Drawing">
<value>165, 0</value>
</data>
<data name="pThumbnailView.Size" type="System.Drawing.Size, System.Drawing">
<value>679, 471</value>
</data>
<data name="pThumbnailView.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
</data>
<data name="&gt;&gt;pThumbnailView.Name" xml:space="preserve">
<value>pThumbnailView</value>
</data>
<data name="&gt;&gt;pThumbnailView.Type" xml:space="preserve">
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;pThumbnailView.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;pThumbnailView.ZOrder" xml:space="preserve">
<value>3</value>
<value>1</value>
</data>
<metadata name="ttMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>567, 17</value>
@ -1900,10 +1876,7 @@
<value>$this</value>
</data>
<data name="&gt;&gt;pToolbars.ZOrder" xml:space="preserve">
<value>5</value>
</data>
<data name="dgvHotkeys.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
<value>Top, Bottom, Left, Right</value>
<value>3</value>
</data>
<metadata name="cHotkeyStatus.UserAddedColumn" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>
@ -1932,8 +1905,11 @@
<data name="cDescription.Width" type="System.Int32, mscorlib">
<value>111</value>
</data>
<data name="dgvHotkeys.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="dgvHotkeys.Location" type="System.Drawing.Point, System.Drawing">
<value>181, 16</value>
<value>16, 16</value>
</data>
<data name="dgvHotkeys.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms">
<value>None</value>
@ -1951,9 +1927,60 @@
<value>System.Windows.Forms.DataGridView, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;dgvHotkeys.Parent" xml:space="preserve">
<value>$this</value>
<value>pHotkeys</value>
</data>
<data name="&gt;&gt;dgvHotkeys.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="pHotkeys.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="pHotkeys.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
</data>
<data name="pHotkeys.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
<value>16, 16, 0, 0</value>
</data>
<data name="pHotkeys.Size" type="System.Drawing.Size, System.Drawing">
<value>679, 471</value>
</data>
<data name="pHotkeys.TabIndex" type="System.Int32, mscorlib">
<value>4</value>
</data>
<data name="&gt;&gt;pHotkeys.Name" xml:space="preserve">
<value>pHotkeys</value>
</data>
<data name="&gt;&gt;pHotkeys.Type" xml:space="preserve">
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;pHotkeys.Parent" xml:space="preserve">
<value>pMain</value>
</data>
<data name="&gt;&gt;pHotkeys.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="pMain.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
<value>Fill</value>
</data>
<data name="pMain.Location" type="System.Drawing.Point, System.Drawing">
<value>165, 0</value>
</data>
<data name="pMain.Size" type="System.Drawing.Size, System.Drawing">
<value>679, 471</value>
</data>
<data name="pMain.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
</data>
<data name="&gt;&gt;pMain.Name" xml:space="preserve">
<value>pMain</value>
</data>
<data name="&gt;&gt;pMain.Type" xml:space="preserve">
<value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;pMain.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;pMain.ZOrder" xml:space="preserve">
<value>2</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">

5
ShareX/TaskManager.cs
View file

@ -131,10 +131,7 @@ public static void StopAllTasks()
public static void UpdateMainFormTip()
{
bool showHotkeys = Program.Settings.ShowMainWindowTip && Tasks.Count == 0;
Program.MainForm.dgvHotkeys.Visible = showHotkeys;
Program.MainForm.lvUploads.Visible = !showHotkeys;
Program.MainForm.pHotkeys.Visible = Program.Settings.ShowMainWindowTip && Tasks.Count == 0;
}
private static void Task_StatusChanged(WorkerTask task)