mirror of
https://github.com/ShareX/ShareX.git
synced 2024-10-01 09:47:22 +13:00
Removed picture box from downloader form
This commit is contained in:
parent
096058fbb6
commit
7474257570
4 changed files with 10 additions and 53 deletions
|
@ -29,7 +29,6 @@ protected override void Dispose(bool disposing)
|
||||||
private void InitializeComponent()
|
private void InitializeComponent()
|
||||||
{
|
{
|
||||||
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DownloaderForm));
|
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DownloaderForm));
|
||||||
this.pbImage = new System.Windows.Forms.PictureBox();
|
|
||||||
this.txtChangelog = new System.Windows.Forms.TextBox();
|
this.txtChangelog = new System.Windows.Forms.TextBox();
|
||||||
this.lblProgress = new ShareX.HelpersLib.BlackStyleLabel();
|
this.lblProgress = new ShareX.HelpersLib.BlackStyleLabel();
|
||||||
this.cbShowChangelog = new ShareX.HelpersLib.BlackStyleCheckBox();
|
this.cbShowChangelog = new ShareX.HelpersLib.BlackStyleCheckBox();
|
||||||
|
@ -37,16 +36,8 @@ private void InitializeComponent()
|
||||||
this.lblFilename = new ShareX.HelpersLib.BlackStyleLabel();
|
this.lblFilename = new ShareX.HelpersLib.BlackStyleLabel();
|
||||||
this.btnAction = new ShareX.HelpersLib.BlackStyleButton();
|
this.btnAction = new ShareX.HelpersLib.BlackStyleButton();
|
||||||
this.pbProgress = new ShareX.HelpersLib.BlackStyleProgressBar();
|
this.pbProgress = new ShareX.HelpersLib.BlackStyleProgressBar();
|
||||||
((System.ComponentModel.ISupportInitialize)(this.pbImage)).BeginInit();
|
|
||||||
this.SuspendLayout();
|
this.SuspendLayout();
|
||||||
//
|
//
|
||||||
// pbImage
|
|
||||||
//
|
|
||||||
this.pbImage.BackColor = System.Drawing.Color.Transparent;
|
|
||||||
resources.ApplyResources(this.pbImage, "pbImage");
|
|
||||||
this.pbImage.Name = "pbImage";
|
|
||||||
this.pbImage.TabStop = false;
|
|
||||||
//
|
|
||||||
// txtChangelog
|
// txtChangelog
|
||||||
//
|
//
|
||||||
this.txtChangelog.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70)))));
|
this.txtChangelog.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70)))));
|
||||||
|
@ -110,13 +101,12 @@ private void InitializeComponent()
|
||||||
resources.ApplyResources(this, "$this");
|
resources.ApplyResources(this, "$this");
|
||||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||||
this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70)))));
|
this.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(70)))), ((int)(((byte)(70)))), ((int)(((byte)(70)))));
|
||||||
|
this.Controls.Add(this.cbShowChangelog);
|
||||||
this.Controls.Add(this.txtChangelog);
|
this.Controls.Add(this.txtChangelog);
|
||||||
this.Controls.Add(this.lblProgress);
|
this.Controls.Add(this.lblProgress);
|
||||||
this.Controls.Add(this.cbShowChangelog);
|
|
||||||
this.Controls.Add(this.lblStatus);
|
this.Controls.Add(this.lblStatus);
|
||||||
this.Controls.Add(this.lblFilename);
|
this.Controls.Add(this.lblFilename);
|
||||||
this.Controls.Add(this.btnAction);
|
this.Controls.Add(this.btnAction);
|
||||||
this.Controls.Add(this.pbImage);
|
|
||||||
this.Controls.Add(this.pbProgress);
|
this.Controls.Add(this.pbProgress);
|
||||||
this.DoubleBuffered = true;
|
this.DoubleBuffered = true;
|
||||||
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
|
this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
|
||||||
|
@ -124,15 +114,12 @@ private void InitializeComponent()
|
||||||
this.Name = "DownloaderForm";
|
this.Name = "DownloaderForm";
|
||||||
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.UpdaterForm_FormClosing);
|
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.UpdaterForm_FormClosing);
|
||||||
this.Shown += new System.EventHandler(this.DownloaderForm_Shown);
|
this.Shown += new System.EventHandler(this.DownloaderForm_Shown);
|
||||||
((System.ComponentModel.ISupportInitialize)(this.pbImage)).EndInit();
|
|
||||||
this.ResumeLayout(false);
|
this.ResumeLayout(false);
|
||||||
this.PerformLayout();
|
this.PerformLayout();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
private System.Windows.Forms.PictureBox pbImage;
|
|
||||||
private BlackStyleProgressBar pbProgress;
|
private BlackStyleProgressBar pbProgress;
|
||||||
private BlackStyleButton btnAction;
|
private BlackStyleButton btnAction;
|
||||||
private BlackStyleLabel lblFilename;
|
private BlackStyleLabel lblFilename;
|
||||||
|
|
|
@ -97,11 +97,6 @@ private void DownloaderForm_Shown(object sender, EventArgs e)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetImage(Image img)
|
|
||||||
{
|
|
||||||
pbImage.Image = img;
|
|
||||||
}
|
|
||||||
|
|
||||||
private void btnAction_MouseClick(object sender, MouseEventArgs e)
|
private void btnAction_MouseClick(object sender, MouseEventArgs e)
|
||||||
{
|
{
|
||||||
if (e.Button == MouseButtons.Left)
|
if (e.Button == MouseButtons.Left)
|
||||||
|
|
|
@ -118,38 +118,14 @@
|
||||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||||
</resheader>
|
</resheader>
|
||||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||||
<data name="pbImage.Location" type="System.Drawing.Point, System.Drawing">
|
|
||||||
<value>352, 8</value>
|
|
||||||
</data>
|
|
||||||
<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="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="pbImage.TabIndex" type="System.Int32, mscorlib">
|
|
||||||
<value>1</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>pbImage.Name" xml:space="preserve">
|
|
||||||
<value>pbImage</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>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=">>pbImage.Parent" xml:space="preserve">
|
|
||||||
<value>$this</value>
|
|
||||||
</data>
|
|
||||||
<data name=">>pbImage.ZOrder" xml:space="preserve">
|
|
||||||
<value>6</value>
|
|
||||||
</data>
|
|
||||||
<data name="txtChangelog.Location" type="System.Drawing.Point, System.Drawing">
|
<data name="txtChangelog.Location" type="System.Drawing.Point, System.Drawing">
|
||||||
<value>8, 208</value>
|
<value>8, 208</value>
|
||||||
</data>
|
</data>
|
||||||
|
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||||
<data name="txtChangelog.Multiline" type="System.Boolean, mscorlib">
|
<data name="txtChangelog.Multiline" type="System.Boolean, mscorlib">
|
||||||
<value>True</value>
|
<value>True</value>
|
||||||
</data>
|
</data>
|
||||||
|
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||||
<data name="txtChangelog.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms">
|
<data name="txtChangelog.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms">
|
||||||
<value>Both</value>
|
<value>Both</value>
|
||||||
</data>
|
</data>
|
||||||
|
@ -169,7 +145,7 @@
|
||||||
<value>$this</value>
|
<value>$this</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>txtChangelog.ZOrder" xml:space="preserve">
|
<data name=">>txtChangelog.ZOrder" xml:space="preserve">
|
||||||
<value>0</value>
|
<value>1</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="lblProgress.Font" type="System.Drawing.Font, System.Drawing">
|
<data name="lblProgress.Font" type="System.Drawing.Font, System.Drawing">
|
||||||
<value>Arial, 12pt</value>
|
<value>Arial, 12pt</value>
|
||||||
|
@ -178,7 +154,7 @@
|
||||||
<value>8, 72</value>
|
<value>8, 72</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="lblProgress.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="lblProgress.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>328, 78</value>
|
<value>336, 78</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="lblProgress.TabIndex" type="System.Int32, mscorlib">
|
<data name="lblProgress.TabIndex" type="System.Int32, mscorlib">
|
||||||
<value>12</value>
|
<value>12</value>
|
||||||
|
@ -196,7 +172,7 @@
|
||||||
<value>$this</value>
|
<value>$this</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>lblProgress.ZOrder" xml:space="preserve">
|
<data name=">>lblProgress.ZOrder" xml:space="preserve">
|
||||||
<value>1</value>
|
<value>2</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="cbShowChangelog.Font" type="System.Drawing.Font, System.Drawing">
|
<data name="cbShowChangelog.Font" type="System.Drawing.Font, System.Drawing">
|
||||||
<value>Arial, 8pt</value>
|
<value>Arial, 8pt</value>
|
||||||
|
@ -226,7 +202,7 @@
|
||||||
<value>$this</value>
|
<value>$this</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>cbShowChangelog.ZOrder" xml:space="preserve">
|
<data name=">>cbShowChangelog.ZOrder" xml:space="preserve">
|
||||||
<value>2</value>
|
<value>0</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="lblStatus.Font" type="System.Drawing.Font, System.Drawing">
|
<data name="lblStatus.Font" type="System.Drawing.Font, System.Drawing">
|
||||||
<value>Arial, 12pt</value>
|
<value>Arial, 12pt</value>
|
||||||
|
@ -235,7 +211,7 @@
|
||||||
<value>8, 40</value>
|
<value>8, 40</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="lblStatus.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="lblStatus.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>328, 24</value>
|
<value>472, 24</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="lblStatus.TabIndex" type="System.Int32, mscorlib">
|
<data name="lblStatus.TabIndex" type="System.Int32, mscorlib">
|
||||||
<value>11</value>
|
<value>11</value>
|
||||||
|
@ -262,7 +238,7 @@
|
||||||
<value>8, 8</value>
|
<value>8, 8</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="lblFilename.Size" type="System.Drawing.Size, System.Drawing">
|
<data name="lblFilename.Size" type="System.Drawing.Size, System.Drawing">
|
||||||
<value>328, 24</value>
|
<value>472, 24</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="lblFilename.TabIndex" type="System.Int32, mscorlib">
|
<data name="lblFilename.TabIndex" type="System.Int32, mscorlib">
|
||||||
<value>10</value>
|
<value>10</value>
|
||||||
|
@ -328,7 +304,7 @@
|
||||||
<value>$this</value>
|
<value>$this</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>pbProgress.ZOrder" xml:space="preserve">
|
<data name=">>pbProgress.ZOrder" xml:space="preserve">
|
||||||
<value>7</value>
|
<value>6</value>
|
||||||
</data>
|
</data>
|
||||||
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
|
||||||
<value>True</value>
|
<value>True</value>
|
||||||
|
|
|
@ -95,7 +95,6 @@ public void DownloadUpdate()
|
||||||
{
|
{
|
||||||
using (DownloaderForm updaterForm = new DownloaderForm(this))
|
using (DownloaderForm updaterForm = new DownloaderForm(this))
|
||||||
{
|
{
|
||||||
updaterForm.SetImage(ShareXResources.Logo);
|
|
||||||
updaterForm.ShowDialog();
|
updaterForm.ShowDialog();
|
||||||
|
|
||||||
if (updaterForm.Status == DownloaderFormStatus.InstallStarted)
|
if (updaterForm.Status == DownloaderFormStatus.InstallStarted)
|
||||||
|
|
Loading…
Reference in a new issue