CodeMirror/ShareX
1
0
Fork 0
mirror of https://github.com/ShareX/ShareX.git synced 2024-09-30 01:07:21 +13:00
Code Issues Projects Releases Packages Wiki Activity

When downloading ShareX update show ShareX logo in downloader form

Browse source
This commit is contained in:
Jaex 2017-11-01 18:48:29 +03:00
parent 5b519c9aae
commit 306485245c
8 changed files with 27 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ShareX.HelpersLib/Properties/Resources.Designer.cs generated
View file

@ -2953,16 +2953,6 @@ internal static string TextDestination_FileUploader {
}
}
/// <summary>
/// Looks up a localized resource of type System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap tick {
get {
object obj = ResourceManager.GetObject("tick", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Looks up a localized string similar to A newer version of {0} is available.
/// </summary>

3
ShareX.HelpersLib/Properties/Resources.resx
View file

@ -121,9 +121,6 @@
<data name="Loading" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Loading.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="tick" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Icon.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Crosshair" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\crosshair.cur;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>

BIN
ShareX.HelpersLib/Resources/Icon.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 15 KiB

1
ShareX.HelpersLib/ShareX.HelpersLib.csproj
View file

@ -1185,7 +1185,6 @@
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<None Include="Resources\Icon.png" />
</ItemGroup>
<ItemGroup>
<COMReference Include="IWshRuntimeLibrary">

21
ShareX.HelpersLib/UpdateChecker/DownloaderForm.Designer.cs generated
View file

@ -29,7 +29,7 @@ protected override void Dispose(bool disposing)
private void InitializeComponent()
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DownloaderForm));
this.pictureBox1 = new System.Windows.Forms.PictureBox();
this.pbImage = new System.Windows.Forms.PictureBox();
this.txtChangelog = new System.Windows.Forms.TextBox();
this.lblProgress = new ShareX.HelpersLib.BlackStyleLabel();
this.cbShowChangelog = new ShareX.HelpersLib.BlackStyleCheckBox();
@ -37,16 +37,15 @@ private void InitializeComponent()
this.lblFilename = new ShareX.HelpersLib.BlackStyleLabel();
this.btnAction = new ShareX.HelpersLib.BlackStyleButton();
this.pbProgress = new ShareX.HelpersLib.BlackStyleProgressBar();
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.pbImage)).BeginInit();
this.SuspendLayout();
//
// pictureBox1
// pbImage
//
this.pictureBox1.BackColor = System.Drawing.Color.Transparent;
this.pictureBox1.Image = global::ShareX.HelpersLib.Properties.Resources.tick;
resources.ApplyResources(this.pictureBox1, "pictureBox1");
this.pictureBox1.Name = "pictureBox1";
this.pictureBox1.TabStop = false;
this.pbImage.BackColor = System.Drawing.Color.Transparent;
resources.ApplyResources(this.pbImage, "pbImage");
this.pbImage.Name = "pbImage";
this.pbImage.TabStop = false;
//
// txtChangelog
//
@ -117,7 +116,7 @@ private void InitializeComponent()
this.Controls.Add(this.lblStatus);
this.Controls.Add(this.lblFilename);
this.Controls.Add(this.btnAction);
this.Controls.Add(this.pictureBox1);
this.Controls.Add(this.pbImage);
this.Controls.Add(this.pbProgress);
this.DoubleBuffered = true;
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
@ -125,7 +124,7 @@ private void InitializeComponent()
this.Name = "DownloaderForm";
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.UpdaterForm_FormClosing);
this.Shown += new System.EventHandler(this.DownloaderForm_Shown);
((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.pbImage)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@ -133,7 +132,7 @@ private void InitializeComponent()
#endregion
private System.Windows.Forms.PictureBox pictureBox1;
private System.Windows.Forms.PictureBox pbImage;
private BlackStyleProgressBar pbProgress;
private BlackStyleButton btnAction;
private BlackStyleLabel lblFilename;

5
ShareX.HelpersLib/UpdateChecker/DownloaderForm.cs
View file

@ -98,6 +98,11 @@ private void DownloaderForm_Shown(object sender, EventArgs e)
}
}
public void SetImage(Image img)
{
pbImage.Image = img;
}
private void btnAction_MouseClick(object sender, MouseEventArgs e)
{
if (e.Button == MouseButtons.Left)

22
ShareX.HelpersLib/UpdateChecker/DownloaderForm.resx
View file

@ -118,30 +118,30 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="pictureBox1.Location" type="System.Drawing.Point, System.Drawing">
<data name="pbImage.Location" type="System.Drawing.Point, System.Drawing">
<value>352, 8</value>
</data>
<data name="pictureBox1.Size" type="System.Drawing.Size, System.Drawing">
<data name="pbImage.Size" type="System.Drawing.Size, System.Drawing">
<value>128, 128</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="pictureBox1.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
<value>AutoSize</value>
<data name="pbImage.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
<value>Zoom</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="pictureBox1.TabIndex" type="System.Int32, mscorlib">
<data name="pbImage.TabIndex" type="System.Int32, mscorlib">
<value>1</value>
</data>
<data name="&gt;&gt;pictureBox1.Name" xml:space="preserve">
<value>pictureBox1</value>
<data name="&gt;&gt;pbImage.Name" xml:space="preserve">
<value>pbImage</value>
</data>
<data name="&gt;&gt;pictureBox1.Type" xml:space="preserve">
<data name="&gt;&gt;pbImage.Type" xml:space="preserve">
<value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;pictureBox1.Parent" xml:space="preserve">
<data name="&gt;&gt;pbImage.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;pictureBox1.ZOrder" xml:space="preserve">
<data name="&gt;&gt;pbImage.ZOrder" xml:space="preserve">
<value>6</value>
</data>
<data name="txtChangelog.Location" type="System.Drawing.Point, System.Drawing">
@ -349,6 +349,6 @@
<value>DownloaderForm</value>
</data>
<data name="&gt;&gt;$this.Type" xml:space="preserve">
<value>System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<value>ShareX.HelpersLib.BlackStyleForm, ShareX.HelpersLib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
</root>

1
ShareX.HelpersLib/UpdateChecker/UpdateChecker.cs
View file

@ -95,6 +95,7 @@ public void DownloadUpdate()
{
using (DownloaderForm updaterForm = new DownloaderForm(this))
{
updaterForm.SetImage(ShareXResources.Logo);
updaterForm.ShowDialog();
if (updaterForm.Status == DownloaderFormStatus.InstallStarted)