Skip to content

Commit

Permalink
add cancellation support
Browse files Browse the repository at this point in the history
Replaced DPProgressCombo with an actual UserConrtol ProgressCombo.
  • Loading branch information
siblount committed Jan 13, 2024
1 parent 82567f2 commit f49485d
Show file tree
Hide file tree
Showing 10 changed files with 573 additions and 456 deletions.
102 changes: 102 additions & 0 deletions src/DAZ_Installer.UI/ProgressCombo.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

104 changes: 104 additions & 0 deletions src/DAZ_Installer.UI/ProgressCombo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;

namespace DAZ_Installer.UI
{
public partial class ProgressCombo : UserControl
{
[Browsable(false), EditorBrowsable(EditorBrowsableState.Never), DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
public CancellationTokenSource CancellationTokenSource { get; set; } = new();
public bool IsMarquee => progressBar.Style == ProgressBarStyle.Marquee;

public ProgressCombo()
{
InitializeComponent();
progressBarLbl.Visible = progressBar.Visible = cancelBtn.Visible = false;
}

public void EndProgress()
{
if (InvokeRequired)
{
BeginInvoke(EndProgress);
return;
}
cancelBtn.Visible = false;
}

public void StartProgress()
{
if (InvokeRequired)
{
BeginInvoke(StartProgress);
return;
}
progressBarLbl.Visible = progressBar.Visible = cancelBtn.Visible = true;
}

public void SetProgress(int value)
{
if (InvokeRequired)
{
BeginInvoke(SetProgress, value);
return;
}
progressBar.Value = value;
}

/// <summary>
/// Changes the process bar style to either <see cref="ProgressBarStyle.Marquee"/> or <see cref="ProgressBarStyle.Blocks"/>".
/// It automatically checks if Invoke is required.
/// </summary>
/// <param name="marqueue">Whether to set the progress bar style to Marqueue or not.</param>
public void ChangeProgressBarStyle(bool marqueue)
{
if (InvokeRequired)
{
BeginInvoke(ChangeProgressBarStyle, marqueue);
return;
}
progressBar.SuspendLayout();
if (marqueue)
{
progressBar.Value = 10;
progressBar.Style = ProgressBarStyle.Marquee;
}
else
{
progressBar.Value = 50;
progressBar.Style = ProgressBarStyle.Blocks;
}
progressBar.ResumeLayout();

}

/// <summary>
/// Sets the text of the progress bar label and the main process label. Automatically checks if Invoke is required.
/// </summary>
/// <param name="text">The text to set it to.</param>
public void SetText(string text)
{
if (InvokeRequired)
{
BeginInvoke(SetText, text);
return;
}
SuspendLayout();
progressBarLbl.Text = mainProcLbl.Text = text;
ResumeLayout();
}

private void cancelBtn_Click(object sender, EventArgs e)
{
CancellationTokenSource.Cancel();
CancellationTokenSource = new();
}
}
}
120 changes: 120 additions & 0 deletions src/DAZ_Installer.UI/ProgressCombo.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>
1 change: 1 addition & 0 deletions src/DAZ_Installer.Windows/DAZ_Installer.Windows.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<TargetFramework>net6.0-windows</TargetFramework>
<Nullable>enable</Nullable>
<UseWindowsForms>true</UseWindowsForms>
<ForceDesignerDpiUnaware>true</ForceDesignerDpiUnaware>
<ImplicitUsings>disable</ImplicitUsings>
</PropertyGroup>

Expand Down
Loading

0 comments on commit f49485d

Please sign in to comment.