From 2eb2536898ea609e450696976142292bec641e66 Mon Sep 17 00:00:00 2001 From: Jaex Date: Wed, 21 Sep 2022 02:40:03 +0300 Subject: [PATCH] Use update message box for dev build install button --- .../UpdateChecker/GitHubUpdateManager.cs | 8 ++++---- ShareX.HelpersLib/UpdateChecker/UpdateChecker.cs | 4 ++-- ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.cs | 2 +- ShareX/Forms/ApplicationSettingsForm.cs | 6 +----- ShareX/Properties/Resources.Designer.cs | 11 ----------- ShareX/Properties/Resources.de.resx | 3 --- ShareX/Properties/Resources.es-MX.resx | 3 --- ShareX/Properties/Resources.fr.resx | 3 --- ShareX/Properties/Resources.ja-JP.resx | 3 --- ShareX/Properties/Resources.pl.resx | 3 --- ShareX/Properties/Resources.pt-PT.resx | 3 --- ShareX/Properties/Resources.resx | 5 ----- ShareX/Properties/Resources.ro.resx | 3 --- ShareX/Properties/Resources.ru.resx | 3 --- ShareX/Properties/Resources.tr.resx | 3 --- ShareX/Properties/Resources.uk.resx | 3 --- ShareX/Properties/Resources.vi-VN.resx | 3 --- ShareX/Properties/Resources.zh-CN.resx | 3 --- ShareX/Properties/Resources.zh-TW.resx | 3 --- ShareX/TaskHelpers.cs | 9 +++------ 20 files changed, 11 insertions(+), 73 deletions(-) diff --git a/ShareX.HelpersLib/UpdateChecker/GitHubUpdateManager.cs b/ShareX.HelpersLib/UpdateChecker/GitHubUpdateManager.cs index 85a7c3df3..d5a177bd9 100644 --- a/ShareX.HelpersLib/UpdateChecker/GitHubUpdateManager.cs +++ b/ShareX.HelpersLib/UpdateChecker/GitHubUpdateManager.cs @@ -36,7 +36,7 @@ public class GitHubUpdateManager : IDisposable public TimeSpan UpdateReCheckInterval { get; private set; } = TimeSpan.FromHours(24); // If "No" button pressed in update message box then this interval will be used public string GitHubOwner { get; set; } public string GitHubRepo { get; set; } - public bool IsBeta { get; set; } // If current build is beta and latest stable release is same version as current build then it will be downloaded + public bool IsDev { get; set; } // If current build is dev and latest stable release is same version as current build then it will be downloaded public bool IsPortable { get; set; } // If current build is portable then download URL will be opened in browser instead of downloading it public bool CheckPreReleaseUpdates { get; set; } @@ -50,9 +50,9 @@ public GitHubUpdateManager(string owner, string repo) GitHubRepo = repo; } - public GitHubUpdateManager(string owner, string repo, bool beta, bool portable) : this(owner, repo) + public GitHubUpdateManager(string owner, string repo, bool dev, bool portable) : this(owner, repo) { - IsBeta = beta; + IsDev = dev; IsPortable = portable; } @@ -94,7 +94,7 @@ public GitHubUpdateChecker CreateUpdateChecker() { return new GitHubUpdateChecker(GitHubOwner, GitHubRepo) { - IsBeta = IsBeta, + IsDev = IsDev, IsPortable = IsPortable, IncludePreRelease = CheckPreReleaseUpdates }; diff --git a/ShareX.HelpersLib/UpdateChecker/UpdateChecker.cs b/ShareX.HelpersLib/UpdateChecker/UpdateChecker.cs index 1e98627fa..91265788d 100644 --- a/ShareX.HelpersLib/UpdateChecker/UpdateChecker.cs +++ b/ShareX.HelpersLib/UpdateChecker/UpdateChecker.cs @@ -39,7 +39,7 @@ public abstract class UpdateChecker public Version CurrentVersion { get; set; } public Version LatestVersion { get; set; } public ReleaseChannelType ReleaseType { get; set; } - public bool IsBeta { get; set; } + public bool IsDev { get; set; } public bool IsPortable { get; set; } private string fileName; @@ -71,7 +71,7 @@ public void RefreshStatus() } if (Status != UpdateStatus.UpdateCheckFailed && CurrentVersion != null && LatestVersion != null && !string.IsNullOrEmpty(DownloadURL) && - (ForceUpdate || Helpers.CompareVersion(CurrentVersion, LatestVersion) < 0 || (IsBeta && Helpers.CompareVersion(CurrentVersion, LatestVersion) == 0))) + (ForceUpdate || Helpers.CompareVersion(CurrentVersion, LatestVersion) < 0 || (IsDev && Helpers.CompareVersion(CurrentVersion, LatestVersion) == 0))) { Status = UpdateStatus.UpdateAvailable; } diff --git a/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.cs b/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.cs index dc5f38f0b..e8af327fd 100644 --- a/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.cs +++ b/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.cs @@ -69,7 +69,7 @@ public UpdateMessageBox(bool activateWindow, UpdateChecker updateChecker) sbText.Append(Resources.UpdateMessageBox_UpdateMessageBox_CurrentVersion); sbText.Append(": "); sbText.Append(updateChecker.CurrentVersion); - if (updateChecker.IsBeta) sbText.Append(" Beta"); + if (updateChecker.IsDev) sbText.Append(" Dev"); sbText.AppendLine(); sbText.Append(Resources.UpdateMessageBox_UpdateMessageBox_LatestVersion); sbText.Append(": "); diff --git a/ShareX/Forms/ApplicationSettingsForm.cs b/ShareX/Forms/ApplicationSettingsForm.cs index 1252e1756..63dff42df 100644 --- a/ShareX/Forms/ApplicationSettingsForm.cs +++ b/ShareX/Forms/ApplicationSettingsForm.cs @@ -452,11 +452,7 @@ private async void btnCheckDevBuild_Click(object sender, EventArgs e) { btnCheckDevBuild.Enabled = false; - if (MessageBox.Show(Resources.ApplicationSettingsForm_btnCheckDevBuild_Click_DevBuilds_Warning, "ShareX", - MessageBoxButtons.YesNo, MessageBoxIcon.Information) == DialogResult.Yes) - { - await TaskHelpers.DownloadDevBuild(); - } + await TaskHelpers.DownloadDevBuild(); if (!IsDisposed) { diff --git a/ShareX/Properties/Resources.Designer.cs b/ShareX/Properties/Resources.Designer.cs index eb2ca2c4f..3b7887e33 100644 --- a/ShareX/Properties/Resources.Designer.cs +++ b/ShareX/Properties/Resources.Designer.cs @@ -584,17 +584,6 @@ public static string ApplicationSettingsForm_btnBrowsePersonalFolderPath_Click_C } } - /// - /// Looks up a localized string similar to Development builds are for testing bug fixes and trying out new features early. Sometimes they can be less stable. - /// - ///Do you wish to continue?. - /// - public static string ApplicationSettingsForm_btnCheckDevBuild_Click_DevBuilds_Warning { - get { - return ResourceManager.GetString("ApplicationSettingsForm_btnCheckDevBuild_Click_DevBuilds_Warning", resourceCulture); - } - } - /// /// Looks up a localized string similar to Would you like to reset ShareX settings?. /// diff --git a/ShareX/Properties/Resources.de.resx b/ShareX/Properties/Resources.de.resx index e5615fde5..d4f01a142 100644 --- a/ShareX/Properties/Resources.de.resx +++ b/ShareX/Properties/Resources.de.resx @@ -404,9 +404,6 @@ Mittlere Maustaste um die Aktionsleiste zu schließen Mit ShareX bearbeiten - - Entwicklungs-Versionen können instabil sein und sind nur für Testzwecke geeignet. Möchten Sie diese trotzdem installieren? - Möchten Sie die ShareX-Einstellungen zurücksetzen? diff --git a/ShareX/Properties/Resources.es-MX.resx b/ShareX/Properties/Resources.es-MX.resx index ed9c5b281..8b91a9086 100644 --- a/ShareX/Properties/Resources.es-MX.resx +++ b/ShareX/Properties/Resources.es-MX.resx @@ -463,9 +463,6 @@ Clic medio para cerrar Editar con ShareX - - Las versiones de desarrollo no son estables y solo deben usarse para realizar pruebas. ¿Desea instalar? - ¿Desea restablecer la configuración de ShareX? diff --git a/ShareX/Properties/Resources.fr.resx b/ShareX/Properties/Resources.fr.resx index b7d8f60da..c58e875bf 100644 --- a/ShareX/Properties/Resources.fr.resx +++ b/ShareX/Properties/Resources.fr.resx @@ -465,9 +465,6 @@ Clique de la molette pour fermer Raccourcir URL - - Les versions de développement peuvent être instables et doivent être utilisées uniquement à des fins de test. Voulez-vous installer ? - Modifier avec ShareX diff --git a/ShareX/Properties/Resources.ja-JP.resx b/ShareX/Properties/Resources.ja-JP.resx index 6d729dd06..c8baae4e6 100644 --- a/ShareX/Properties/Resources.ja-JP.resx +++ b/ShareX/Properties/Resources.ja-JP.resx @@ -450,9 +450,6 @@ ShareX を再起動しますか？ ShareXの設定をリセットしますか？ - - 開発中のバージョンは不安定なことがあります、またテスト目的にしか使えません。開発中バージョンをインストールしますか？ - ペルシア語 diff --git a/ShareX/Properties/Resources.pl.resx b/ShareX/Properties/Resources.pl.resx index a60890951..e761d5870 100644 --- a/ShareX/Properties/Resources.pl.resx +++ b/ShareX/Properties/Resources.pl.resx @@ -242,9 +242,6 @@ Kliknij prawym przyciskiem myszy, aby otworzyć menu Czy chcesz zresetować ustawienia ShareX? - - Kompilacje deweloperskie mogą być niestabilne i muszą być używane tylko do celów testowych. Czy chcesz je zainstalować? - ShareX musi zostać ponownie uruchomiony, aby zmiany języka zostały zastosowane. diff --git a/ShareX/Properties/Resources.pt-PT.resx b/ShareX/Properties/Resources.pt-PT.resx index f8aa3a812..1aa0b690f 100644 --- a/ShareX/Properties/Resources.pt-PT.resx +++ b/ShareX/Properties/Resources.pt-PT.resx @@ -164,9 +164,6 @@ Botão do meio (scroll) para fechar Escolher caminho da pasta raiz do ShareX - - Versões de programador são instáveis e são usadas apenas para testes. Deseja continuar com a instalação? - Deseja repor as definições do ShareX? diff --git a/ShareX/Properties/Resources.resx b/ShareX/Properties/Resources.resx index b38ded930..7a3def175 100644 --- a/ShareX/Properties/Resources.resx +++ b/ShareX/Properties/Resources.resx @@ -196,11 +196,6 @@ ..\Resources\application-terminal.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - Development builds are for testing bug fixes and trying out new features early. Sometimes they can be less stable. - -Do you wish to continue? - ..\Resources\globe.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a diff --git a/ShareX/Properties/Resources.ro.resx b/ShareX/Properties/Resources.ro.resx index 0eafe1ffd..4ad597cbf 100644 --- a/ShareX/Properties/Resources.ro.resx +++ b/ShareX/Properties/Resources.ro.resx @@ -233,9 +233,6 @@ Clic în mijloc pentru a închide Alegeți calea folderului personal ShareX - - Versiunile de dezvoltare pot fi instabile și trebuie utilizate numai în scopuri de testare. Doriți să o instalați? - Doriți să resetați setările ShareX? diff --git a/ShareX/Properties/Resources.ru.resx b/ShareX/Properties/Resources.ru.resx index b5052384b..f35a18858 100644 --- a/ShareX/Properties/Resources.ru.resx +++ b/ShareX/Properties/Resources.ru.resx @@ -466,9 +466,6 @@ Редактировать в ShareX - - Dev сборки могут быть нестабильными и должны использоваться только для тестирования. Хотите установить? - Хотите сбросить настройки ShareX? diff --git a/ShareX/Properties/Resources.tr.resx b/ShareX/Properties/Resources.tr.resx index 90c51c823..c937a62c4 100644 --- a/ShareX/Properties/Resources.tr.resx +++ b/ShareX/Properties/Resources.tr.resx @@ -471,9 +471,6 @@ Devam etmek istediğinizden emin misiniz? Sağ fare tuşu menüyü açmak için Orta fare tuşu kapatmak için - - Geliştirici sürümleri kararsız olabilir bu yüzden deneme amaçlı kullanılmalıdır. İndirmek istediğine emin misin? - {0} ayarları yanlış veya eksik. Lütfen "Hedef ayarları" penceresinden ayar yapınız. diff --git a/ShareX/Properties/Resources.uk.resx b/ShareX/Properties/Resources.uk.resx index 614dbd727..6356eb030 100644 --- a/ShareX/Properties/Resources.uk.resx +++ b/ShareX/Properties/Resources.uk.resx @@ -178,9 +178,6 @@ Затримка для знімка: {0}с - - Dev-збірки можуть бути нестабільними та повинні використовуватись лише для тестування. Хочете встановити? - Назва не може бути порожньою. diff --git a/ShareX/Properties/Resources.vi-VN.resx b/ShareX/Properties/Resources.vi-VN.resx index a16248694..2b1104d7d 100644 --- a/ShareX/Properties/Resources.vi-VN.resx +++ b/ShareX/Properties/Resources.vi-VN.resx @@ -376,9 +376,6 @@ Nhấn "Không" để hủy tiến trình tải lên hiện tại và tắt ch Tiếp tục - - Bản phát hành cho lập trình viên có thể không ổn định và chỉ được dùng cho mục đích kiểm thử. Bạn có muốn cài đặt nó không? - Tiếng Hà Lan diff --git a/ShareX/Properties/Resources.zh-CN.resx b/ShareX/Properties/Resources.zh-CN.resx index 0f0ea784e..7bf5a7b8e 100644 --- a/ShareX/Properties/Resources.zh-CN.resx +++ b/ShareX/Properties/Resources.zh-CN.resx @@ -465,9 +465,6 @@ 使用ShareX编辑 - - 开发版可能不稳定，仅用于测试目的。要安装吗？ - 要重置 ShareX 设置项吗？ diff --git a/ShareX/Properties/Resources.zh-TW.resx b/ShareX/Properties/Resources.zh-TW.resx index 38be2dd9c..1181ae428 100644 --- a/ShareX/Properties/Resources.zh-TW.resx +++ b/ShareX/Properties/Resources.zh-TW.resx @@ -456,9 +456,6 @@ 分隔符 - - 開發版可能不穩定，僅供測試用途。要安裝嗎？ - 要重設 ShareX 設定嗎？ diff --git a/ShareX/TaskHelpers.cs b/ShareX/TaskHelpers.cs index 692a8ccae..080a2a9e7 100644 --- a/ShareX/TaskHelpers.cs +++ b/ShareX/TaskHelpers.cs @@ -1867,23 +1867,20 @@ public static async Task DownloadDevBuild() { GitHubUpdateChecker updateChecker = new GitHubUpdateChecker("ShareX", "DevBuilds") { - IsBeta = true, + IsDev = true, IsPortable = Program.Portable }; await updateChecker.CheckUpdateAsync(); - if (updateChecker.Status == UpdateStatus.UpdateAvailable) - { - updateChecker.DownloadUpdate(); - } + UpdateMessageBox.Start(updateChecker); } public static async Task DownloadAppVeyorBuild() { AppVeyorUpdateChecker updateChecker = new AppVeyorUpdateChecker() { - IsBeta = true, + IsDev = true, IsPortable = Program.Portable, Branch = "develop" };