From b01a995062eb8c0d036cbb8d91f3db1c4c63b14b Mon Sep 17 00:00:00 2001 From: Davide Giacometti Date: Tue, 12 Sep 2023 14:25:36 +0200 Subject: [PATCH] show run as administrator in title (#28516) --- .../EnvironmentVariablesXAML/App.xaml.cs | 2 ++ .../EnvironmentVariablesXAML/MainWindow.xaml | 3 +-- .../EnvironmentVariablesXAML/MainWindow.xaml.cs | 7 ++++--- .../EnvironmentVariables/Strings/en-us/Resources.resw | 5 +++++ 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/App.xaml.cs b/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/App.xaml.cs index 5157570f4e..e7d573f210 100644 --- a/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/App.xaml.cs +++ b/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/App.xaml.cs @@ -3,6 +3,7 @@ // See the LICENSE file in the project root for more information. using System; +using EnvironmentVariables.Helpers; using EnvironmentVariables.ViewModels; using ManagedCommon; using Microsoft.Extensions.DependencyInjection; @@ -42,6 +43,7 @@ namespace EnvironmentVariables Host = Microsoft.Extensions.Hosting.Host.CreateDefaultBuilder().UseContentRoot(AppContext.BaseDirectory).ConfigureServices((context, services) => { + services.AddSingleton(); services.AddTransient(); }).Build(); diff --git a/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/MainWindow.xaml b/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/MainWindow.xaml index c557f801f2..f452ec9530 100644 --- a/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/MainWindow.xaml +++ b/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/MainWindow.xaml @@ -41,8 +41,7 @@ x:Name="AppTitleTextBlock" Grid.Column="2" VerticalAlignment="Center" - Style="{StaticResource CaptionTextBlockStyle}" - Text="Environment Variables" /> + Style="{StaticResource CaptionTextBlockStyle}" /> diff --git a/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/MainWindow.xaml.cs b/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/MainWindow.xaml.cs index c9b4db11c7..8354160eac 100644 --- a/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/MainWindow.xaml.cs +++ b/src/modules/EnvironmentVariables/EnvironmentVariables/EnvironmentVariablesXAML/MainWindow.xaml.cs @@ -3,8 +3,6 @@ // See the LICENSE file in the project root for more information. using EnvironmentVariables.Helpers; -using Microsoft.UI.Xaml; -using Microsoft.UI.Xaml.Media; using WinUIEx; namespace EnvironmentVariables @@ -22,7 +20,10 @@ namespace EnvironmentVariables SetTitleBar(titleBar); AppWindow.SetIcon("Assets/EnvironmentVariables/EnvironmentVariables.ico"); - Title = ResourceLoaderInstance.ResourceLoader.GetString("WindowTitle"); + var loader = ResourceLoaderInstance.ResourceLoader; + var title = App.GetService().IsElevated ? loader.GetString("WindowAdminTitle") : loader.GetString("WindowTitle"); + Title = title; + AppTitleTextBlock.Text = title; } } } diff --git a/src/modules/EnvironmentVariables/EnvironmentVariables/Strings/en-us/Resources.resw b/src/modules/EnvironmentVariables/EnvironmentVariables/Strings/en-us/Resources.resw index f71308685f..45ff826ba3 100644 --- a/src/modules/EnvironmentVariables/EnvironmentVariables/Strings/en-us/Resources.resw +++ b/src/modules/EnvironmentVariables/EnvironmentVariables/Strings/en-us/Resources.resw @@ -140,6 +140,7 @@ Environment Variables + Title of the window when running as user Cancel @@ -165,4 +166,8 @@ Enabled + + Administrator: Environment Variables + Title of the window when running as administrator + \ No newline at end of file