mirror of
https://github.com/ShareX/ShareX.git
synced 2024-09-30 01:07:21 +13:00
Append "Dev" to dev build version
This commit is contained in:
parent
6a8ce7abb0
commit
50cfd920d0
4 changed files with 10 additions and 11 deletions
|
@ -81,7 +81,7 @@ private void CheckUpdate()
|
|||
UpdateChecker updateChecker = CreateUpdateChecker();
|
||||
updateChecker.CheckUpdate();
|
||||
|
||||
if (UpdateMessageBox.Start(updateChecker, firstUpdateCheck, Links.Changelog) == DialogResult.No)
|
||||
if (UpdateMessageBox.Start(updateChecker, firstUpdateCheck) == DialogResult.No)
|
||||
{
|
||||
AutoUpdateEnabled = false;
|
||||
}
|
||||
|
|
|
@ -112,7 +112,7 @@ private void UpdateControls()
|
|||
|
||||
private void llblUpdateAvailable_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
|
||||
{
|
||||
UpdateMessageBox.Start(updateChecker, true, Links.Changelog);
|
||||
UpdateMessageBox.Start(updateChecker);
|
||||
}
|
||||
}
|
||||
}
|
|
@ -35,14 +35,12 @@ public partial class UpdateMessageBox : Form
|
|||
public static bool IsOpen { get; private set; }
|
||||
|
||||
public bool ActivateWindow { get; private set; }
|
||||
public string ChangelogURL { get; private set; }
|
||||
|
||||
protected override bool ShowWithoutActivation => !ActivateWindow;
|
||||
|
||||
public UpdateMessageBox(UpdateChecker updateChecker, bool activateWindow = true, string changelogURL = null)
|
||||
public UpdateMessageBox(UpdateChecker updateChecker, bool activateWindow = true, bool devBuild = false)
|
||||
{
|
||||
ActivateWindow = activateWindow;
|
||||
ChangelogURL = changelogURL;
|
||||
|
||||
InitializeComponent();
|
||||
ShareXResources.ApplyTheme(this);
|
||||
|
@ -75,14 +73,15 @@ public UpdateMessageBox(UpdateChecker updateChecker, bool activateWindow = true,
|
|||
sbText.Append(Resources.UpdateMessageBox_UpdateMessageBox_LatestVersion);
|
||||
sbText.Append(": ");
|
||||
sbText.Append(updateChecker.LatestVersion);
|
||||
if (devBuild) sbText.Append(" Dev");
|
||||
if (updateChecker is GitHubUpdateChecker githubUpdateChecker && githubUpdateChecker.IsPreRelease) sbText.Append(" (Pre-release)");
|
||||
|
||||
lblText.Text = sbText.ToString();
|
||||
|
||||
lblViewChangelog.Visible = !string.IsNullOrEmpty(ChangelogURL);
|
||||
lblViewChangelog.Visible = !devBuild;
|
||||
}
|
||||
|
||||
public static DialogResult Start(UpdateChecker updateChecker, bool activateWindow = true, string changelogURL = null)
|
||||
public static DialogResult Start(UpdateChecker updateChecker, bool activateWindow = true, bool devBuild = false)
|
||||
{
|
||||
DialogResult result = DialogResult.None;
|
||||
|
||||
|
@ -92,7 +91,7 @@ public static DialogResult Start(UpdateChecker updateChecker, bool activateWindo
|
|||
|
||||
try
|
||||
{
|
||||
using (UpdateMessageBox messageBox = new UpdateMessageBox(updateChecker, activateWindow, changelogURL))
|
||||
using (UpdateMessageBox messageBox = new UpdateMessageBox(updateChecker, activateWindow, devBuild))
|
||||
{
|
||||
result = messageBox.ShowDialog();
|
||||
}
|
||||
|
@ -129,7 +128,7 @@ private void UpdateMessageBox_FormClosing(object sender, FormClosingEventArgs e)
|
|||
|
||||
private void lblViewChangelog_Click(object sender, EventArgs e)
|
||||
{
|
||||
URLHelpers.OpenURL(ChangelogURL);
|
||||
URLHelpers.OpenURL(Links.Changelog);
|
||||
}
|
||||
|
||||
private void btnYes_MouseClick(object sender, MouseEventArgs e)
|
||||
|
|
|
@ -1873,7 +1873,7 @@ public static async Task DownloadDevBuild()
|
|||
|
||||
await updateChecker.CheckUpdateAsync();
|
||||
|
||||
UpdateMessageBox.Start(updateChecker);
|
||||
UpdateMessageBox.Start(updateChecker, true, true);
|
||||
}
|
||||
|
||||
public static async Task DownloadAppVeyorBuild()
|
||||
|
@ -1887,7 +1887,7 @@ public static async Task DownloadAppVeyorBuild()
|
|||
|
||||
await updateChecker.CheckUpdateAsync();
|
||||
|
||||
UpdateMessageBox.Start(updateChecker);
|
||||
UpdateMessageBox.Start(updateChecker, true, true);
|
||||
}
|
||||
|
||||
public static Image CreateQRCode(string text, int width, int height)
|
||||
|
|
Loading…
Reference in a new issue