diff --git a/ShareX.HelpersLib/Links.cs b/ShareX.HelpersLib/Links.cs index 817b33789..9e256b2f3 100644 --- a/ShareX.HelpersLib/Links.cs +++ b/ShareX.HelpersLib/Links.cs @@ -27,23 +27,23 @@ namespace ShareX.HelpersLib { public static class Links { - public const string URL_WEBSITE = "https://getsharex.com"; - public const string URL_GITHUB = "https://github.com/ShareX/ShareX"; - public const string URL_ISSUES = URL_GITHUB + "/issues?q=is%3Aissue"; - public const string URL_CALLBACK = URL_WEBSITE + "/callback/"; - public const string URL_CHANGELOG = URL_WEBSITE + "/changelog"; - public const string URL_DONATE = URL_WEBSITE + "/donate"; - public const string URL_PRIVACY_POLICY = URL_WEBSITE + "/privacy-policy"; - public const string URL_IMAGE_EFFECTS = URL_WEBSITE + "/image-effects"; - public const string URL_ACTIONS = URL_WEBSITE + "/actions"; - public const string URL_JAEX = "https://github.com/Jaex"; - public const string URL_MCORED = "https://github.com/McoreD"; - public const string URL_STEAM = "http://store.steampowered.com/app/400040/"; - public const string URL_DISCORD = "https://discord.gg/ShareX"; - public const string URL_TWITTER = "https://twitter.com/ShareX"; - private const string URL_DOCS = URL_WEBSITE + "/docs"; - public const string URL_CUSTOM_UPLOADER = URL_DOCS + "/custom-uploader"; - public const string URL_REGION_CAPTURE = URL_DOCS + "/region-capture"; - public const string URL_CUSTOM_UPLOADERS = "https://github.com/ShareX/CustomUploaders"; + public const string Website = "https://getsharex.com"; + public const string GitHub = "https://github.com/ShareX/ShareX"; + public const string GitHubIssues = GitHub + "/issues?q=is%3Aissue"; + public const string Callback = Website + "/callback/"; + public const string Changelog = Website + "/changelog"; + public const string Donate = Website + "/donate"; + public const string PrivacyPolicy = Website + "/privacy-policy"; + public const string ImageEffects = Website + "/image-effects"; + public const string Actions = Website + "/actions"; + public const string Jaex = "https://github.com/Jaex"; + public const string McoreD = "https://github.com/McoreD"; + public const string Steam = "http://store.steampowered.com/app/400040/"; + public const string Discord = "https://discord.gg/ShareX"; + public const string Twitter = "https://twitter.com/ShareX"; + private const string Docs = Website + "/docs"; + public const string DocsCustomUploader = Docs + "/custom-uploader"; + public const string DocsRegionCapture = Docs + "/region-capture"; + public const string CustomUploaders = "https://github.com/ShareX/CustomUploaders"; } } \ No newline at end of file diff --git a/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.cs b/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.cs index 84fe765b5..dc5f38f0b 100644 --- a/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.cs +++ b/ShareX.HelpersLib/UpdateChecker/UpdateMessageBox.cs @@ -118,7 +118,7 @@ private void UpdateMessageBox_Shown(object sender, EventArgs e) private void lblViewChangelog_Click(object sender, EventArgs e) { - URLHelpers.OpenURL(Links.URL_CHANGELOG); + URLHelpers.OpenURL(Links.Changelog); } private void cbDontShow_CheckedChanged(object sender, EventArgs e) diff --git a/ShareX.ImageEffectsLib/Forms/ImageEffectsForm.cs b/ShareX.ImageEffectsLib/Forms/ImageEffectsForm.cs index d66cbb2d4..bddf9532d 100644 --- a/ShareX.ImageEffectsLib/Forms/ImageEffectsForm.cs +++ b/ShareX.ImageEffectsLib/Forms/ImageEffectsForm.cs @@ -753,7 +753,7 @@ private void btnPackager_Click(object sender, EventArgs e) private void btnImageEffects_Click(object sender, EventArgs e) { - URLHelpers.OpenURL(Links.URL_IMAGE_EFFECTS); + URLHelpers.OpenURL(Links.ImageEffects); } private void tsmiLoadImageFromFile_Click(object sender, EventArgs e) diff --git a/ShareX.IndexerLib/IndexerHtml.cs b/ShareX.IndexerLib/IndexerHtml.cs index 5f76fcb59..ad73628d6 100644 --- a/ShareX.IndexerLib/IndexerHtml.cs +++ b/ShareX.IndexerLib/IndexerHtml.cs @@ -160,7 +160,7 @@ private string GetFileNameRow(FileInfo fi) private string GetFooter() { - return $"Generated by ShareX Directory Indexer on {DateTime.UtcNow:yyyy-MM-dd 'at' HH:mm:ss 'UTC'}"; + return $"Generated by ShareX Directory Indexer on {DateTime.UtcNow:yyyy-MM-dd 'at' HH:mm:ss 'UTC'}"; } private string GetCssStyle() diff --git a/ShareX.IndexerLib/IndexerText.cs b/ShareX.IndexerLib/IndexerText.cs index e498f9230..42b67a98a 100644 --- a/ShareX.IndexerLib/IndexerText.cs +++ b/ShareX.IndexerLib/IndexerText.cs @@ -112,7 +112,7 @@ private string GetFileNameRow(FileInfo fi, int level) private string GetFooter() { - return $"Generated by ShareX Directory Indexer on {DateTime.UtcNow:yyyy-MM-dd 'at' HH:mm:ss 'UTC'}. Latest version can be downloaded from: {Links.URL_WEBSITE}"; + return $"Generated by ShareX Directory Indexer on {DateTime.UtcNow:yyyy-MM-dd 'at' HH:mm:ss 'UTC'}. Latest version can be downloaded from: {Links.Website}"; } } } \ No newline at end of file diff --git a/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs b/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs index e474737b5..400fe6059 100644 --- a/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs +++ b/ShareX.ScreenCaptureLib/Shapes/ShapeManagerMenu.cs @@ -1084,7 +1084,7 @@ internal void CreateToolbar() } } - URLHelpers.OpenURL(Links.URL_REGION_CAPTURE); + URLHelpers.OpenURL(Links.DocsRegionCapture); }; tsddbOptions.DropDownItems.Add(tsmiKeybinds); diff --git a/ShareX.UploadersLib/FileUploaders/Copy.cs b/ShareX.UploadersLib/FileUploaders/Copy.cs index 2ef953bb4..1354735d3 100644 --- a/ShareX.UploadersLib/FileUploaders/Copy.cs +++ b/ShareX.UploadersLib/FileUploaders/Copy.cs @@ -68,7 +68,7 @@ public Copy(OAuthInfo oauth, CopyAccountInfo accountInfo) : this(oauth) public string GetAuthorizationURL() { Dictionary args = new Dictionary(); - args.Add("oauth_callback", Links.URL_CALLBACK); + args.Add("oauth_callback", Links.Callback); return GetAuthorizationURL(URLRequestToken, URLAuthorize, AuthInfo, args); } diff --git a/ShareX.UploadersLib/FileUploaders/GfycatUploader.cs b/ShareX.UploadersLib/FileUploaders/GfycatUploader.cs index c725885e8..1ad1b5ec6 100644 --- a/ShareX.UploadersLib/FileUploaders/GfycatUploader.cs +++ b/ShareX.UploadersLib/FileUploaders/GfycatUploader.cs @@ -96,7 +96,7 @@ public string GetAuthorizationURL() args.Add("scope", "all"); args.Add("state", "ShareX"); args.Add("response_type", "code"); - args.Add("redirect_uri", Links.URL_CALLBACK); + args.Add("redirect_uri", Links.Callback); return URLHelpers.CreateQueryString(URL_AUTHORIZE, args); } @@ -108,7 +108,7 @@ public bool GetAccessToken(string code) client_id = AuthInfo.Client_ID, client_secret = AuthInfo.Client_Secret, grant_type = "authorization_code", - redirect_uri = Links.URL_CALLBACK, + redirect_uri = Links.Callback, code = code }); diff --git a/ShareX.UploadersLib/FileUploaders/OneDrive.cs b/ShareX.UploadersLib/FileUploaders/OneDrive.cs index ef7f0d022..16a32ce90 100644 --- a/ShareX.UploadersLib/FileUploaders/OneDrive.cs +++ b/ShareX.UploadersLib/FileUploaders/OneDrive.cs @@ -85,7 +85,7 @@ public string GetAuthorizationURL() args.Add("client_id", AuthInfo.Client_ID); args.Add("scope", "offline_access files.readwrite"); args.Add("response_type", "code"); - args.Add("redirect_uri", Links.URL_CALLBACK); + args.Add("redirect_uri", Links.Callback); if (AuthInfo.Proof != null) { args.Add("code_challenge", AuthInfo.Proof.CodeChallenge); @@ -99,7 +99,7 @@ public bool GetAccessToken(string code) { Dictionary args = new Dictionary(); args.Add("client_id", AuthInfo.Client_ID); - args.Add("redirect_uri", Links.URL_CALLBACK); + args.Add("redirect_uri", Links.Callback); args.Add("client_secret", AuthInfo.Client_Secret); args.Add("code", code); args.Add("grant_type", "authorization_code"); diff --git a/ShareX.UploadersLib/FileUploaders/Teknik.cs b/ShareX.UploadersLib/FileUploaders/Teknik.cs index 25b773cab..371f0f377 100644 --- a/ShareX.UploadersLib/FileUploaders/Teknik.cs +++ b/ShareX.UploadersLib/FileUploaders/Teknik.cs @@ -142,7 +142,7 @@ public bool GetAccessToken(string code) args.Add("client_id", AuthInfo.Client_ID); args.Add("client_secret", AuthInfo.Client_Secret); args.Add("grant_type", "authorization_code"); - args.Add("redirect_uri", Links.URL_CALLBACK); + args.Add("redirect_uri", Links.Callback); args.Add("code", code); string response = SendRequestURLEncoded(HttpMethod.POST, AuthUrl + "/connect/token", args); @@ -165,7 +165,7 @@ public string GetAuthorizationURL() { Dictionary args = new Dictionary(); args.Add("response_type", "code"); - args.Add("redirect_uri", Links.URL_CALLBACK); + args.Add("redirect_uri", Links.Callback); args.Add("scope", "openid teknik-api.write offline_access"); args.Add("client_id", AuthInfo.Client_ID); diff --git a/ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.cs b/ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.cs index c52b3379e..1af7f000a 100644 --- a/ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.cs +++ b/ShareX.UploadersLib/Forms/CustomUploaderSettingsForm.cs @@ -652,12 +652,12 @@ private async Task TestCustomUploader(CustomUploaderDestinationType type, int in break; case CustomUploaderDestinationType.URLShortener: CustomURLShortener urlShortener = new CustomURLShortener(item); - result = urlShortener.ShortenURL(Links.URL_WEBSITE); + result = urlShortener.ShortenURL(Links.Website); result.Errors.AddRange(urlShortener.Errors); break; case CustomUploaderDestinationType.URLSharingService: CustomURLSharer urlSharer = new CustomURLSharer(item); - result = urlSharer.ShareURL(Links.URL_WEBSITE); + result = urlSharer.ShareURL(Links.Website); result.Errors.AddRange(urlSharer.Errors); break; } @@ -885,12 +885,12 @@ private void eiCustomUploaders_ImportCompleted() private void tsmiCustomUploaderGuide_Click(object sender, EventArgs e) { - URLHelpers.OpenURL(Links.URL_CUSTOM_UPLOADER); + URLHelpers.OpenURL(Links.DocsCustomUploader); } private void tsmiCustomUploaderExamples_Click(object sender, EventArgs e) { - URLHelpers.OpenURL(Links.URL_CUSTOM_UPLOADERS); + URLHelpers.OpenURL(Links.CustomUploaders); } private void tsmiClearUploaders_Click(object sender, EventArgs e) diff --git a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs index 9d33b4987..f4608723a 100644 --- a/ShareX.UploadersLib/Forms/UploadersConfigForm.cs +++ b/ShareX.UploadersLib/Forms/UploadersConfigForm.cs @@ -496,7 +496,7 @@ private void LoadFileUploaderSettings() - Consumer Name: {1} - Public Key (without quotes): '{3}' -- You can now authenticate to Jira", Links.URL_WEBSITE, "ShareX", APIKeys.JiraConsumerKey, Jira.PublicKey); +- You can now authenticate to Jira", Links.Website, "ShareX", APIKeys.JiraConsumerKey, Jira.PublicKey); } catch (Exception e) { diff --git a/ShareX.UploadersLib/ImageUploaders/FlickrUploader.cs b/ShareX.UploadersLib/ImageUploaders/FlickrUploader.cs index bb0c180d0..481f2806e 100644 --- a/ShareX.UploadersLib/ImageUploaders/FlickrUploader.cs +++ b/ShareX.UploadersLib/ImageUploaders/FlickrUploader.cs @@ -73,7 +73,7 @@ public FlickrUploader(OAuthInfo oauth, FlickrSettings settings) public string GetAuthorizationURL() { Dictionary args = new Dictionary(); - args.Add("oauth_callback", Links.URL_CALLBACK); + args.Add("oauth_callback", Links.Callback); string url = GetAuthorizationURL("https://www.flickr.com/services/oauth/request_token", "https://www.flickr.com/services/oauth/authorize", AuthInfo, args); diff --git a/ShareX.UploadersLib/TextUploaders/GitHubGist.cs b/ShareX.UploadersLib/TextUploaders/GitHubGist.cs index 4ac26809b..2ea1e0540 100644 --- a/ShareX.UploadersLib/TextUploaders/GitHubGist.cs +++ b/ShareX.UploadersLib/TextUploaders/GitHubGist.cs @@ -78,7 +78,7 @@ public string GetAuthorizationURL() { Dictionary args = new Dictionary(); args.Add("client_id", AuthInfo.Client_ID); - args.Add("redirect_uri", Links.URL_CALLBACK); + args.Add("redirect_uri", Links.Callback); args.Add("scope", "gist"); return URLHelpers.CreateQueryString("https://github.com/login/oauth/authorize", args); diff --git a/ShareX.UploadersLib/URLShorteners/BitlyURLShortener.cs b/ShareX.UploadersLib/URLShorteners/BitlyURLShortener.cs index 0d30cad7c..d25eb13cb 100644 --- a/ShareX.UploadersLib/URLShorteners/BitlyURLShortener.cs +++ b/ShareX.UploadersLib/URLShorteners/BitlyURLShortener.cs @@ -80,7 +80,7 @@ public string GetAuthorizationURL() { Dictionary args = new Dictionary(); args.Add("client_id", AuthInfo.Client_ID); - args.Add("redirect_uri", Links.URL_CALLBACK); + args.Add("redirect_uri", Links.Callback); return URLHelpers.CreateQueryString("https://bitly.com/oauth/authorize", args); } @@ -91,7 +91,7 @@ public bool GetAccessToken(string code) args.Add("client_id", AuthInfo.Client_ID); args.Add("client_secret", AuthInfo.Client_Secret); args.Add("code", code); - args.Add("redirect_uri", Links.URL_CALLBACK); + args.Add("redirect_uri", Links.Callback); string response = SendRequestURLEncoded(HttpMethod.POST, URLAccessToken, args); diff --git a/ShareX/Forms/AboutForm.cs b/ShareX/Forms/AboutForm.cs index ccac61371..d4e772e97 100644 --- a/ShareX/Forms/AboutForm.cs +++ b/ShareX/Forms/AboutForm.cs @@ -64,15 +64,15 @@ public AboutForm() #endif rtbInfo.AppendLine(Resources.AboutForm_AboutForm_Links, FontStyle.Bold, 13); - rtbInfo.AppendLine($@"{Resources.AboutForm_AboutForm_Website}: {Links.URL_WEBSITE} -{Resources.AboutForm_AboutForm_Project_page}: {Links.URL_GITHUB} -{Resources.AboutForm_AboutForm_Changelog}: {Links.URL_CHANGELOG} -{Resources.AboutForm_AboutForm_Privacy_policy}: {Links.URL_PRIVACY_POLICY} + rtbInfo.AppendLine($@"{Resources.AboutForm_AboutForm_Website}: {Links.Website} +{Resources.AboutForm_AboutForm_Project_page}: {Links.GitHub} +{Resources.AboutForm_AboutForm_Changelog}: {Links.Changelog} +{Resources.AboutForm_AboutForm_Privacy_policy}: {Links.PrivacyPolicy} ", FontStyle.Regular); rtbInfo.AppendLine(Resources.AboutForm_AboutForm_Team, FontStyle.Bold, 13); - rtbInfo.AppendLine($@"Jaex: {Links.URL_JAEX} -McoreD (Michael Delpach): {Links.URL_MCORED} + rtbInfo.AppendLine($@"Jaex: {Links.Jaex} +McoreD: {Links.McoreD} ", FontStyle.Regular); rtbInfo.AppendLine(Resources.AboutForm_AboutForm_Translators, FontStyle.Bold, 13); diff --git a/ShareX/Forms/MainForm.cs b/ShareX/Forms/MainForm.cs index 4e9a332aa..f42a69771 100644 --- a/ShareX/Forms/MainForm.cs +++ b/ShareX/Forms/MainForm.cs @@ -1914,27 +1914,27 @@ private void tsmiTestFileUpload_Click(object sender, EventArgs e) private void tsmiTestURLShortener_Click(object sender, EventArgs e) { - UploadManager.ShortenURL(Links.URL_WEBSITE); + UploadManager.ShortenURL(Links.Website); } private void tsmiTestURLSharing_Click(object sender, EventArgs e) { - UploadManager.ShareURL(Links.URL_WEBSITE); + UploadManager.ShareURL(Links.Website); } private void tsbDonate_Click(object sender, EventArgs e) { - URLHelpers.OpenURL(Links.URL_DONATE); + URLHelpers.OpenURL(Links.Donate); } private void tsbTwitter_Click(object sender, EventArgs e) { - URLHelpers.OpenURL(Links.URL_TWITTER); + URLHelpers.OpenURL(Links.Twitter); } private void tsbDiscord_Click(object sender, EventArgs e) { - URLHelpers.OpenURL(Links.URL_DISCORD); + URLHelpers.OpenURL(Links.Discord); } private void tsbAbout_Click(object sender, EventArgs e) diff --git a/ShareX/Forms/TaskSettingsForm.cs b/ShareX/Forms/TaskSettingsForm.cs index 3ad4dcdb1..86a0522be 100644 --- a/ShareX/Forms/TaskSettingsForm.cs +++ b/ShareX/Forms/TaskSettingsForm.cs @@ -1647,7 +1647,7 @@ private void btnActionsRemove_Click(object sender, EventArgs e) private void btnActions_Click(object sender, EventArgs e) { - URLHelpers.OpenURL(Links.URL_ACTIONS); + URLHelpers.OpenURL(Links.Actions); } private void lvActions_SelectedIndexChanged(object sender, EventArgs e) diff --git a/ShareX/NewsManager.cs b/ShareX/NewsManager.cs index c924376fc..c0cfe7f4a 100644 --- a/ShareX/NewsManager.cs +++ b/ShareX/NewsManager.cs @@ -72,7 +72,7 @@ private List GetNews() wc.Headers.Add(HttpRequestHeader.UserAgent, ShareXResources.UserAgent); wc.Proxy = HelpersOptions.CurrentProxy.GetWebProxy(); - string url = URLHelpers.CombineURL(Links.URL_WEBSITE, "news.json"); + string url = URLHelpers.CombineURL(Links.Website, "news.json"); string response = wc.DownloadString(url); if (!string.IsNullOrEmpty(response)) diff --git a/ShareX/Program.cs b/ShareX/Program.cs index ba0402e1c..c29830cbd 100644 --- a/ShareX/Program.cs +++ b/ShareX/Program.cs @@ -625,7 +625,7 @@ private static void CurrentDomain_UnhandledException(object sender, UnhandledExc private static void OnError(Exception e) { - using (ErrorForm errorForm = new ErrorForm(e.Message, $"{e}\r\n\r\n{Title}", LogsFilePath, Links.URL_ISSUES)) + using (ErrorForm errorForm = new ErrorForm(e.Message, $"{e}\r\n\r\n{Title}", LogsFilePath, Links.GitHubIssues)) { errorForm.ShowDialog(); } diff --git a/ShareX/WorkerTask.cs b/ShareX/WorkerTask.cs index 4bbd1de88..42233230a 100644 --- a/ShareX/WorkerTask.cs +++ b/ShareX/WorkerTask.cs @@ -294,7 +294,7 @@ public void ShowErrorWindow() if (!string.IsNullOrEmpty(errors)) { - using (ErrorForm form = new ErrorForm(Resources.UploadInfoManager_ShowErrors_Upload_errors, errors, Program.LogsFilePath, Links.URL_ISSUES, false)) + using (ErrorForm form = new ErrorForm(Resources.UploadInfoManager_ShowErrors_Upload_errors, errors, Program.LogsFilePath, Links.GitHubIssues, false)) { form.ShowDialog(); }