Skip to content

Commit 854fae9

Browse files
BeelinkBeelink
committed
v2.5.0
1 parent 0b44194 commit 854fae9

40 files changed

+442
-532
lines changed

‎.vs/QuickLibrary/v16/.suo‎

1 KB
Binary file not shown.

‎.vs/QuickLibrary/v16/Server/sqlite3/storage.ide‎

0 Bytes
Binary file not shown.

‎QuickLibrary/DownloadForm.Designer.cs‎

Lines changed: 25 additions & 53 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎QuickLibrary/DownloadForm.cs‎

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using System.Windows.Forms;
44
using System.Net;
55
using System.Diagnostics;
6-
using System.Drawing;
76
using System.IO;
87
using Microsoft.Win32;
98
using System.Collections.Generic;
@@ -14,31 +13,42 @@ public partial class DownloadForm : QlibFixedForm
1413
{
1514
private string fileName;
1615
private WebClient wc;
17-
private string url;
1816

19-
public DownloadForm(string url, bool darkMode)
17+
private string downloading;
18+
private string readyToInstall;
19+
private string failed;
20+
21+
public DownloadForm(string url, bool darkMode, string updating, string downloading, string readyToInstall, string failed, string install)
2022
{
2123
if (darkMode)
2224
{
23-
this.HandleCreated += new EventHandler(ThemeManager.formHandleCreated);
25+
HandleCreated += new EventHandler(ThemeMan.formHandleCreated);
2426
}
2527

26-
this.url = url;
2728
fileName = Path.Combine(GetDownloadFolderPath(), System.IO.Path.GetFileName(url));
29+
this.downloading = downloading;
30+
this.readyToInstall = readyToInstall;
31+
this.failed = failed;
2832

2933
InitializeComponent();
3034
(new DropShadow()).ApplyShadows(this);
31-
SetDraggableControls(new List<Control>() { titlePanel, titleLabel, statusLabel, logoPictureBox });
35+
SetDraggableControls(new List<Control>() { titlePanel, titleLabel, statusLabel });
3236

33-
if (darkMode)
34-
{
35-
cancelButton.BackColor = ThemeManager.DarkSecondColor;
36-
updateButton.BackColor = ThemeManager.DarkSecondColor;
37-
}
37+
titleLabel.Text = updating;
38+
statusLabel.Text = downloading;
39+
updateButton.Text = install;
40+
cancelButton.Text = NativeMan.GetMessageBoxText(NativeMan.DialogBoxCommandID.IDCANCEL);
41+
42+
infoTooltip.SetToolTip(closeBtn, NativeMan.GetMessageBoxText(NativeMan.DialogBoxCommandID.IDCLOSE) + " | Alt+F4");
3843

3944
DarkMode = darkMode;
4045
closeBtn.DarkMode = darkMode;
41-
manuallyLink.LinkColor = ThemeManager.AccentColor;
46+
progressBar1.DarkMode = darkMode;
47+
if (darkMode)
48+
{
49+
cancelButton.BackColor = ThemeMan.DarkSecondColor;
50+
updateButton.BackColor = ThemeMan.DarkSecondColor;
51+
}
4252

4353
wc = new WebClient();
4454

@@ -63,45 +73,34 @@ private string GetDownloadFolderPath()
6373
private void wc_DownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e)
6474
{
6575
progressBar1.Value = e.ProgressPercentage;
66-
statusLabel.Text = string.Format("Downloading... {0}% ({1} / {2})", e.ProgressPercentage, BytesToSize(e.BytesReceived), BytesToSize(e.TotalBytesToReceive));
76+
statusLabel.Text = string.Format(downloading + " {0}% ({1} / {2})", e.ProgressPercentage, BytesToSize(e.BytesReceived), BytesToSize(e.TotalBytesToReceive));
6777
}
6878

6979
private void wc_DownloadFileCompleted(object sender, AsyncCompletedEventArgs e)
7080
{
71-
if (e.Error != null)
72-
{
73-
statusLabel.Text = "Update failed!";
74-
}
75-
else if (e.Cancelled)
81+
if (e.Error != null || e.Cancelled)
7682
{
77-
statusLabel.Text = "Update cancelled!";
83+
statusLabel.Text = failed;
7884
}
7985
else
8086
{
8187
updateButton.Visible = true;
82-
statusLabel.Text = "Download finished!";
88+
statusLabel.Text = readyToInstall;
8389
}
8490
}
8591

8692
private void updateButton_Click(object sender, EventArgs e)
8793
{
8894
Process.Start(fileName);
89-
this.Close();
90-
this.Owner.Close();
95+
Close();
96+
Owner.Close();
9197
}
9298

9399
private void cancelButton_Click(object sender, EventArgs e)
94100
{
95101
wc.CancelAsync();
96102
}
97103

98-
private void manuallyLink_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
99-
{
100-
wc.CancelAsync();
101-
Process.Start(url);
102-
this.Close();
103-
}
104-
105104
private void DownloadForm_FormClosing(object sender, FormClosingEventArgs e)
106105
{
107106
wc.CancelAsync();
@@ -117,12 +116,12 @@ private string BytesToSize(double len)
117116
len = len / 1024;
118117
}
119118

120-
return String.Format("{0:0.##} {1}", len, sizes[order]);
119+
return String.Format("{0:0.#} {1}", len, sizes[order]);
121120
}
122121

123122
private void closeBtn_Click(object sender, EventArgs e)
124123
{
125-
this.Close();
124+
Close();
126125
}
127126
}
128127
}

‎QuickLibrary/DownloadForm.resx‎

Lines changed: 3 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -118,62 +118,6 @@
118118
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119119
</resheader>
120120
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
121-
<data name="logoPictureBox.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
122-
<value>
123-
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
171-
0uUnDDm+vMY3/WoAAAAASUVORK5CYII=
172-
</value>
173-
</data>
174-
<metadata name="browserTooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
175-
<value>17, 17</value>
176-
</metadata>
177121
<data name="closeBtn.DarkImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
178122
<value>
179123
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAIRJREFUOE/N
@@ -199,4 +143,7 @@
199143
gg==
200144
</value>
201145
</data>
146+
<metadata name="infoTooltip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
147+
<value>128, 17</value>
148+
</metadata>
202149
</root>

0 commit comments

Comments
 (0)