Added links to user docs inside About popup (#1887)

* added links into about section

* added resources and aka.ms links

* moved links to resources

* Move the feedback URI into the resources too!

src/cascadia/CascadiaPackage/Resources/en-US/Resources.resw

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
- <!--
- Microsoft ResX Schema
-
+ <!-- 
+ Microsoft ResX Schema 
+ 
  Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
+ 
+ The primary goals of this format is to allow a simple XML format 
+ that is mostly human readable. The generation and parsing of the 
+ various data types are done through the TypeConverter classes 
  associated with the data types.
-
+ 
  Example:
-
+ 
  ... ado.net/XML headers & schema ...
  <resheader name="resmimetype">text/microsoft-resx</resheader>
  <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
  <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
  <comment>This is a comment</comment>
  </data>
-
- There are any number of "resheader" rows that contain simple
+ 
+ There are any number of "resheader" rows that contain simple 
  name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
+ 
+ Each data row contains a name, and value. The row also contains a 
+ type or mimetype. Type corresponds to a .NET class that support 
+ text/value conversion through the TypeConverter architecture. 
+ Classes that don't support this are serialized and stored with the 
  mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
+ 
+ The mimetype is used for serialized objects, and tells the 
+ ResXResourceReader how to depersist the object. This is currently not 
  extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
+ 
+ Note - application/x-microsoft.net.object.binary.base64 is the format 
+ that the ResXResourceWriter will generate, however the reader can 
  read any of the formats listed below.
-
+ 
  mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
+ value : The object must be serialized with 
  : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
  : and then encoded with base64 encoding.
-
+ 
  mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
+ value : The object must be serialized with 
  : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
  : and then encoded with base64 encoding.
 
  mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
+ value : The object must be serialized into a byte array 
  : using a System.ComponentModel.TypeConverter
  : and then encoded with base64 encoding.
  -->
@@ -156,4 +156,28 @@
  <data name="AppShortNameDev" xml:space="preserve">
  <value>Terminal (Dev)</value>
  </data>
-</root>
+ <data name="DocumentationLabelText" xml:space="preserve">
+ <value>Documentation
+</value>
+ </data>
+ <data name="GettingStartedLabelText" xml:space="preserve">
+ <value>Getting Started
+</value>
+ </data>
+ <data name="ReleaseNotesLabelText" xml:space="preserve">
+ <value>Release Notes
+</value>
+ </data>
+ <data name="DocumentationUriValue" xml:space="preserve">
+ <value>https://aka.ms/terminal-documentation</value>
+ </data>
+ <data name="GettingStartedUriValue" xml:space="preserve">
+ <value>https://aka.ms/terminal-getting-started</value>
+ </data>
+ <data name="ReleaseNotesUriValue" xml:space="preserve">
+ <value>https://aka.ms/terminal-release-notes</value>
+ </data>
+ <data name="FeedbackUriValue" xml:space="preserve">
+ <value>https://aka.ms/terminal-feedback</value>
+ </data>
+</root>

src/cascadia/TerminalApp/App.cpp

@@ -179,32 +179,74 @@ namespace winrt::TerminalApp::implementation
 
  // Method Description:
  // - Show a dialog with "About" information. Displays the app's Display
- // Name, and the version.
+ // Name, version, getting started link, documentation link, and release
+ // Notes link.
  void App::_ShowAboutDialog()
  {
  auto resourceLoader = Windows::ApplicationModel::Resources::ResourceLoader::GetForCurrentView();
  const auto title = resourceLoader.GetString(L"AboutTitleText");
  const auto versionLabel = resourceLoader.GetString(L"VersionLabelText");
+ const auto gettingStartedLabel = resourceLoader.GetString(L"GettingStartedLabelText");
+ const auto documentationLabel = resourceLoader.GetString(L"DocumentationLabelText");
+ const auto releaseNotesLabel = resourceLoader.GetString(L"ReleaseNotesLabelText");
+ const auto gettingStartedUriValue = resourceLoader.GetString(L"GettingStartedUriValue");
+ const auto documentationUriValue = resourceLoader.GetString(L"DocumentationUriValue");
+ const auto releaseNotesUriValue = resourceLoader.GetString(L"ReleaseNotesUriValue");
  const auto package = winrt::Windows::ApplicationModel::Package::Current();
  const auto packageName = package.DisplayName();
  const auto version = package.Id().Version();
+ Windows::UI::Xaml::Media::SolidColorBrush blueBrush{ Windows::UI::ColorHelper::FromArgb(255, 0, 115, 207) };
+ winrt::Windows::UI::Xaml::Documents::Run about;
+ winrt::Windows::UI::Xaml::Documents::Run gettingStarted;
+ winrt::Windows::UI::Xaml::Documents::Run documentation;
+ winrt::Windows::UI::Xaml::Documents::Run releaseNotes;
+ winrt::Windows::UI::Xaml::Documents::Hyperlink gettingStartedLink;
+ winrt::Windows::UI::Xaml::Documents::Hyperlink documentationLink;
+ winrt::Windows::UI::Xaml::Documents::Hyperlink releaseNotesLink;
  std::wstringstream aboutTextStream;
 
+ gettingStarted.Text(gettingStartedLabel);
+ documentation.Text(documentationLabel);
+ releaseNotes.Text(releaseNotesLabel);
+
+ winrt::Windows::Foundation::Uri gettingStartedUri{ gettingStartedUriValue };
+ winrt::Windows::Foundation::Uri documentationUri{ documentationUriValue };
+ winrt::Windows::Foundation::Uri releaseNotesUri{ releaseNotesUriValue };
+
+ gettingStartedLink.NavigateUri(gettingStartedUri);
+ documentationLink.NavigateUri(documentationUri);
+ releaseNotesLink.NavigateUri(releaseNotesUri);
+
+ gettingStartedLink.Inlines().Append(gettingStarted);
+ documentationLink.Inlines().Append(documentation);
+ releaseNotesLink.Inlines().Append(releaseNotes);
+
  // Format our about text. It will look like the following:
  // <Display Name>
  // Version: <Major>.<Minor>.<Build>.<Revision>
+ // Getting Started
+ // Documentation
+ // Release Notes
 
  aboutTextStream << packageName.c_str() << L"\n";
 
  aboutTextStream << versionLabel.c_str() << L" ";
- aboutTextStream << version.Major << L"." << version.Minor << L"." << version.Build << L"." << version.Revision;
+ aboutTextStream << version.Major << L"." << version.Minor << L"." << version.Build << L"." << version.Revision << L"\n";
 
  winrt::hstring aboutText{ aboutTextStream.str() };
+ about.Text(aboutText);
 
  const auto buttonText = resourceLoader.GetString(L"Ok");
 
+ gettingStartedLink.Foreground(blueBrush);
+ documentationLink.Foreground(blueBrush);
+ releaseNotesLink.Foreground(blueBrush);
+
  Controls::TextBlock aboutTextBlock;
- aboutTextBlock.Text(aboutText);
+ aboutTextBlock.Inlines().Append(about);
+ aboutTextBlock.Inlines().Append(gettingStartedLink);
+ aboutTextBlock.Inlines().Append(documentationLink);
+ aboutTextBlock.Inlines().Append(releaseNotesLink);
  aboutTextBlock.IsTextSelectionEnabled(true);
 
  _ShowDialog(winrt::box_value(title), aboutTextBlock, buttonText);
@@ -409,7 +451,9 @@ namespace winrt::TerminalApp::implementation
  void App::_FeedbackButtonOnClick(const IInspectable&,
  const RoutedEventArgs&)
  {
- winrt::Windows::System::Launcher::LaunchUriAsync({ L"https:/microsoft/Terminal/issues" });
+ const auto feedbackUriValue = Windows::ApplicationModel::Resources::ResourceLoader::GetForCurrentView().GetString(L"FeedbackUriValue");
+
+ winrt::Windows::System::Launcher::LaunchUriAsync({ feedbackUriValue });
  }
 
  Windows::UI::Xaml::Controls::Border App::GetDragBar() noexcept

src/cascadia/TerminalApp/pch.h

@@ -36,6 +36,7 @@
 #include <winrt/Windows.ui.xaml.media.h>
 #include <winrt/Windows.ui.xaml.input.h>
 #include <winrt/Windows.UI.Xaml.Hosting.h>
+#include <winrt/Windows.UI.Xaml.Documents.h>
 #include <winrt/Microsoft.Toolkit.Win32.UI.XamlHost.h>
 
 #include <windows.ui.xaml.media.dxinterop.h>