From 0f90af3c7d7dd32fc3dff55b38bd18f76efdc9ef Mon Sep 17 00:00:00 2001 From: Clint Rutkas Date: Thu, 6 Aug 2020 10:09:50 -0700 Subject: [PATCH] URL audit (#5685) --- .../Views/ColorPickerPage.xaml | 2 +- .../Views/FancyZonesPage.xaml | 2 +- .../Views/GeneralPage.xaml | 8 ++++---- .../Views/ImageResizerPage.xaml | 2 +- .../Views/KeyboardManagerPage.xaml | 2 +- .../Views/PowerLauncherPage.xaml | 2 +- .../Views/PowerPreviewPage.xaml | 2 +- .../Views/PowerRenamePage.xaml | 2 +- .../Views/ShortcutGuidePage.xaml | 2 +- .../editor/FancyZonesEditor/Models/LayoutModel.cs | 2 +- .../Plugins/Microsoft.Plugin.Calculator/plugin.json | 4 ++-- .../launcher/Plugins/Microsoft.Plugin.Folder/plugin.json | 4 ++-- .../launcher/Plugins/Microsoft.Plugin.Indexer/plugin.json | 2 +- .../launcher/Plugins/Microsoft.Plugin.Program/plugin.json | 4 ++-- .../launcher/Plugins/Microsoft.Plugin.Shell/plugin.json | 4 ++-- .../Plugins/Microsoft.Plugin.WindowWalker/plugin.json | 2 +- .../PowerLauncher/Properties/Settings.Designer.cs | 2 +- .../launcher/PowerLauncher/ViewModel/MainViewModel.cs | 2 +- src/modules/launcher/Wox.Infrastructure/Wox.cs | 2 +- src/settings/main.cpp | 6 +++--- 20 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml index 283b998acb..c9b0be7576 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml +++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/ColorPickerPage.xaml @@ -116,7 +116,7 @@ - + diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml index 9f93f1ba55..5e8de3408e 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml +++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml @@ -315,7 +315,7 @@ - + diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml index 499e0c9ddb..fe1cc22910 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml +++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/GeneralPage.xaml @@ -116,7 +116,7 @@ Style="{StaticResource SettingsGroupTitleStyle}"/> - + @@ -165,15 +165,15 @@ - + - + - + diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml index ae242e8e1c..8439c5a67e 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml +++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/ImageResizerPage.xaml @@ -325,7 +325,7 @@ - + diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml index b9403a55e0..4d8fd8d4d6 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml +++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/KeyboardManagerPage.xaml @@ -347,7 +347,7 @@ - + diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml index 741bdd55cb..00acb9f1d5 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml +++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml @@ -187,7 +187,7 @@ - + diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerPreviewPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerPreviewPage.xaml index cc2c0ec9c2..93a0a645f8 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerPreviewPage.xaml +++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerPreviewPage.xaml @@ -91,7 +91,7 @@ - + diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml index 1c7bc1c64e..2dc9601ed1 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml +++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerRenamePage.xaml @@ -130,7 +130,7 @@ - + diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml index 613fa737bf..ab1fc75399 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml +++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml @@ -139,7 +139,7 @@ - + diff --git a/src/modules/fancyzones/editor/FancyZonesEditor/Models/LayoutModel.cs b/src/modules/fancyzones/editor/FancyZonesEditor/Models/LayoutModel.cs index 3311799816..b933759200 100644 --- a/src/modules/fancyzones/editor/FancyZonesEditor/Models/LayoutModel.cs +++ b/src/modules/fancyzones/editor/FancyZonesEditor/Models/LayoutModel.cs @@ -63,7 +63,7 @@ namespace FancyZonesEditor.Models public static void ShowExceptionMessageBox(string message, Exception exception = null) { - string fullMessage = ErrorMessageBoxMessage + "https://github.com/microsoft/PowerToys/issues \n" + message; + string fullMessage = ErrorMessageBoxMessage + "https://aka.ms/powerToysReportBug \n" + message; if (exception != null) { fullMessage += ": " + exception.Message; diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/plugin.json b/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/plugin.json index 8bdb2b4228..8a4629ef93 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/plugin.json +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Calculator/plugin.json @@ -2,11 +2,11 @@ "ID":"CEA0FDFC6D3B4085823D60DC76F28855", "ActionKeyword":"*", "Name":"Calculator", - "Description":"Provide mathematical calculations.(Try 5*3-2 in Wox)", + "Description":"Provide mathematical calculations.(Try 5*3-2 in PowerToys)", "Author":"cxfksword", "Version":"1.0.0", "Language":"csharp", - "Website":"http://www.wox.one/plugin", + "Website":"https://aka.ms/powertoys", "ExecuteFileName":"Microsoft.Plugin.Calculator.dll", "IcoPath":"Images\\calculator.dark.png" } \ No newline at end of file diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/plugin.json b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/plugin.json index 95bf5f0f9f..8d1bce3e96 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/plugin.json +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Folder/plugin.json @@ -2,11 +2,11 @@ "ID":"B4D3B69656E14D44865C8D818EAE47C4", "ActionKeyword":"*", "Name":"Folder", - "Description":"Open favorite folder from wox directly", + "Description":"Searcn and open folders", "Author":"qianlifeng", "Version":"1.0.0", "Language":"csharp", - "Website":"http://www.wox.one/plugin", + "Website":"https://aka.ms/powertoys", "ExecuteFileName":"Microsoft.Plugin.Folder.dll", "IcoPath":"Images\\folder.dark.png" } diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/plugin.json b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/plugin.json index 09195abc06..147e81d886 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/plugin.json +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Indexer/plugin.json @@ -6,7 +6,7 @@ "Author": "Microsoft", "Version": "1.0.0", "Language": "csharp", - "Website": "http://aka.ms/PowerToys", + "Website": "https://aka.ms/PowerToys", "ExecuteFileName": "Microsoft.Plugin.Indexer.dll", "IcoPath": "Images\\indexer.dark.png" } diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/plugin.json b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/plugin.json index de7a0640c5..97d23aa4a8 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Program/plugin.json +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Program/plugin.json @@ -2,11 +2,11 @@ "ID":"791FC278BA414111B8D1886DFE447410", "ActionKeyword":"*", "Name":"Program", - "Description":"Search programs in Wox", + "Description":"Search for programs", "Author":"qianlifeng", "Version":"1.0.0", "Language":"csharp", - "Website":"http://www.wox.one/plugin", + "Website":"https://aka.ms/PowerToys", "ExecuteFileName":"Microsoft.Plugin.Program.dll", "IcoPath":"Images\\app.dark.png" } diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/plugin.json b/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/plugin.json index 85069b35fd..36ca3fecb1 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/plugin.json +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.Shell/plugin.json @@ -2,11 +2,11 @@ "ID":"D409510CD0D2481F853690A07E6DC426", "ActionKeyword":">", "Name":"Shell", - "Description":"Provide executing commands from Wox. Commands should start with >", + "Description":"Provide executing commands. Commands should start with >", "Author":"qianlifeng", "Version":"1.0.0", "Language":"csharp", - "Website":"http://www.wox.one/plugin", + "Website":"https://aka.ms/powertoys", "ExecuteFileName":"Microsoft.Plugin.Shell.dll", "IcoPath":"Images\\shell.dark.png" } diff --git a/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/plugin.json b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/plugin.json index a82ce7b6b3..3293c76320 100644 --- a/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/plugin.json +++ b/src/modules/launcher/Plugins/Microsoft.Plugin.WindowWalker/plugin.json @@ -6,7 +6,7 @@ "Author":"betadele", "Version":"1.0.0", "Language":"csharp", - "Website":"http://www.windowwalker.com/", + "Website":"https://www.windowwalker.com/", "ExecuteFileName":"Microsoft.Plugin.WindowWalker.dll", "IcoPath":"Images\\windowwalker.dark.png" } \ No newline at end of file diff --git a/src/modules/launcher/PowerLauncher/Properties/Settings.Designer.cs b/src/modules/launcher/PowerLauncher/Properties/Settings.Designer.cs index 78a699cb3e..ca0c45d553 100644 --- a/src/modules/launcher/PowerLauncher/Properties/Settings.Designer.cs +++ b/src/modules/launcher/PowerLauncher/Properties/Settings.Designer.cs @@ -25,7 +25,7 @@ namespace PowerLauncher.Properties { [global::System.Configuration.ApplicationScopedSettingAttribute()] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] - [global::System.Configuration.DefaultSettingValueAttribute("https://github.com/Wox-launcher/Wox")] + [global::System.Configuration.DefaultSettingValueAttribute("https://aka.ms/powerToys")] public string GithubRepo { get { return ((string)(this["GithubRepo"])); diff --git a/src/modules/launcher/PowerLauncher/ViewModel/MainViewModel.cs b/src/modules/launcher/PowerLauncher/ViewModel/MainViewModel.cs index 701c51aa73..448aa75244 100644 --- a/src/modules/launcher/PowerLauncher/ViewModel/MainViewModel.cs +++ b/src/modules/launcher/PowerLauncher/ViewModel/MainViewModel.cs @@ -184,7 +184,7 @@ namespace PowerLauncher.ViewModel StartHelpCommand = new RelayCommand(_ => { - Process.Start("http://doc.wox.one/"); + Process.Start("https://aka.ms/PowerToys/"); }); OpenResultCommand = new RelayCommand(index => diff --git a/src/modules/launcher/Wox.Infrastructure/Wox.cs b/src/modules/launcher/Wox.Infrastructure/Wox.cs index ecf65f7aa1..2a0a161f70 100644 --- a/src/modules/launcher/Wox.Infrastructure/Wox.cs +++ b/src/modules/launcher/Wox.Infrastructure/Wox.cs @@ -38,7 +38,7 @@ namespace Wox.Infrastructure public static readonly string DataDirectory = DetermineDataDirectory(); public static readonly string PluginsDirectory = Path.Combine(DataDirectory, Plugins); public static readonly string PreinstalledDirectory = Path.Combine(ProgramDirectory, Plugins); - public const string Issue = "https://github.com/microsoft/PowerToys/issues"; + public const string Issue = "https://aka.ms/powerToysReportBug"; public static readonly string Version = FileVersionInfo.GetVersionInfo(Assembly.Location.NonNull()).ProductVersion; public static readonly int ThumbnailSize = 64; diff --git a/src/settings/main.cpp b/src/settings/main.cpp index 8c15e12b4f..78b401eff6 100644 --- a/src/settings/main.cpp +++ b/src/settings/main.cpp @@ -278,7 +278,7 @@ void initialize_webview(int nShowCmd) } else if (status == AsyncStatus::Error) { - MessageBox(NULL, L"Failed to create the WebView control.\nPlease report the bug to https://github.com/microsoft/PowerToys/issues", L"PowerToys Settings Error", MB_OK); + MessageBox(NULL, L"Failed to create the WebView control.\nPlease report the bug to https://aka.ms/powerToysReportBug", L"PowerToys Settings Error", MB_OK); Trace::SettingsInitError(Trace::SettingsInitErrorCause::WebViewInitAsyncError); exit(1); } @@ -514,7 +514,7 @@ int WINAPI WinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _ { if (!drop_elevated_privileges()) { - MessageBox(NULL, L"Failed to drop admin privileges.\nPlease report the bug to https://github.com/microsoft/PowerToys/issues", L"PowerToys Settings Error", MB_OK); + MessageBox(NULL, L"Failed to drop admin privileges.\nPlease report the bug to https://aka.ms/powerToysReportBug", L"PowerToys Settings Error", MB_OK); Trace::SettingsInitError(Trace::SettingsInitErrorCause::FailedToDropPrivileges); exit(1); } @@ -526,7 +526,7 @@ int WINAPI WinMain(_In_ HINSTANCE hInstance, _In_opt_ HINSTANCE hPrevInstance, _ g_main_wnd = create_main_window(hInstance); if (g_main_wnd == nullptr) { - MessageBox(NULL, L"Failed to create main window.\nPlease report the bug to https://github.com/microsoft/PowerToys/issues", L"PowerToys Settings Error", MB_OK); + MessageBox(NULL, L"Failed to create main window.\nPlease report the bug to https://aka.ms/powerToysReportBugF", L"PowerToys Settings Error", MB_OK); exit(1); } initialize_webview(nShowCmd);