Added settings under experimental

Author: gave92

src/Files.App/Data/Contracts/IGeneralSettingsService.cs

@@ -270,6 +270,11 @@ public interface IGeneralSettingsService : IBaseSettingsService, INotifyProperty
 		/// </summary>
 		bool ShowSystemTrayIcon { get; set; }
 
+		/// <summary>
+		/// Gets or sets a value indicating whether to enable terminal integration.
+		/// </summary>
+		bool IsTerminalIntegrationEnabled { get; set; }
+
 		/// <summary>
 		/// Gets or sets a value indicating the default option to resolve conflicts.
 		/// </summary>

src/Files.App/Services/Settings/GeneralSettingsService.cs

@@ -333,6 +333,12 @@ public bool ShowSystemTrayIcon
 			set => Set(value);
 		}
 
+		public bool IsTerminalIntegrationEnabled
+		{
+			get => Get(false);
+			set => Set(value);
+		}
+
 		public FileNameConflictResolveOptionType ConflictsResolveOption
 		{
 			get => (FileNameConflictResolveOptionType)Get((long)FileNameConflictResolveOptionType.GenerateNewName);

src/Files.App/Strings/en-US/Resources.resw

@@ -4332,4 +4332,7 @@
   <data name="FailedToOpenLogFile" xml:space="preserve">
     <value>Unable to open the log file</value>
   </data>
+  <data name="SettingsTerminalIntegration" xml:space="preserve">
+    <value>Enable Terminal integration</value>
+  </data>
 </root>

src/Files.App/UserControls/StatusBar.xaml

@@ -305,5 +305,41 @@
 			</Button.Flyout>
 		</Button>
 
+		<StackPanel
+			x:Name="TerminalPanel"
+			Grid.Column="3"
+			VerticalAlignment="Center"
+			x:Load="{x:Bind MainPageViewModel.IsTerminalIntegrationEnabled, Mode=OneWay}"
+			Orientation="Horizontal"
+			Spacing="4">
+
+			<Button
+				x:Name="SyncFolderUp"
+				Height="24"
+				Padding="8,0,8,0"
+				VerticalAlignment="Center"
+				x:Load="{x:Bind MainPageViewModel.IsTerminalViewOpen, Mode=OneWay}"
+				Background="Transparent"
+				BorderBrush="Transparent"
+				Command="{x:Bind MainPageViewModel.TerminalSyncUpCommand}">
+				<Button.Content>
+					<FontIcon FontSize="12" Glyph="&#xE110;" />
+				</Button.Content>
+			</Button>
+
+			<Button
+				x:Name="SyncFolderDown"
+				Height="24"
+				Padding="8,0,8,0"
+				VerticalAlignment="Center"
+				x:Load="{x:Bind MainPageViewModel.IsTerminalViewOpen, Mode=OneWay}"
+				Background="Transparent"
+				BorderBrush="Transparent"
+				Command="{x:Bind MainPageViewModel.TerminalSyncDownCommand}">
+				<Button.Content>
+					<FontIcon FontSize="12" Glyph="&#xE74B;" />
+				</Button.Content>
+			</Button>
+
 	</Grid>
 </UserControl>

src/Files.App/UserControls/TerminalView.xaml.cs

@@ -1,10 +1,8 @@
 using CommunityToolkit.WinUI;
-using CommunityToolkit.WinUI.Helpers;
 using Files.App.Utils.Terminal;
 using Files.App.Utils.Terminal.ConPTY;
 using Microsoft.Extensions.Logging;
 using Microsoft.UI.Xaml.Controls;
-using Microsoft.UI.Xaml.Media;
 using Microsoft.Web.WebView2.Core;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
@@ -197,7 +195,7 @@ private Task<TerminalSize> CreateXtermViewAsync(TerminalOptions options, Termina
 			var serializedKeyBindings = JsonConvert.SerializeObject(keyBindings, serializerSettings);
 			return ExecuteScriptAsync(
 					$"createTerminal('{serializedOptions}', '{serializedTheme}', '{serializedKeyBindings}')")
-				.ContinueWith(t => JsonConvert.DeserializeObject<TerminalSize>(t.Result));
+				.ContinueWith(t => JsonConvert.DeserializeObject<TerminalSize>(t.Result)!);
 		}
 
 		private void WebViewControl_NavigationStarting(WebView2 sender, CoreWebView2NavigationStartingEventArgs args)
@@ -445,20 +443,6 @@ private async void TerminalView_ActualThemeChanged(Microsoft.UI.Xaml.FrameworkEl
 			serializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver();
 			var profile = _mainPageModel.TerminalSelectedProfile;
 			var theme = new DefaultValueProvider().GetPreInstalledThemes().First(x => x.Id == profile.TerminalThemeId);
-			var backgroundColor = ActualTheme switch
-			{
-				Microsoft.UI.Xaml.ElementTheme.Dark => "#000000",
-				_ => "#FFFFFF"
-			};
-			var foregroundColor = ActualTheme switch
-			{
-				Microsoft.UI.Xaml.ElementTheme.Dark => "#FFFFFF",
-				_ => "#000000"
-			};
-			theme.Colors.Background = backgroundColor;
-			theme.Colors.Foreground = foregroundColor;
-			theme.Colors.CursorAccent = backgroundColor;
-			theme.Colors.Cursor = foregroundColor;
 
 			WebViewControl.CoreWebView2.Profile.PreferredColorScheme = (ActualTheme == Microsoft.UI.Xaml.ElementTheme.Dark) ? CoreWebView2PreferredColorScheme.Dark : CoreWebView2PreferredColorScheme.Light;
 

src/Files.App/ViewModels/MainPageViewModel.cs

@@ -27,6 +27,7 @@ public sealed partial class MainPageViewModel : ObservableObject
 		private INetworkService NetworkService { get; } = Ioc.Default.GetRequiredService<INetworkService>();
 		private IUserSettingsService UserSettingsService { get; } = Ioc.Default.GetRequiredService<IUserSettingsService>();
 		private IResourcesService ResourcesService { get; } = Ioc.Default.GetRequiredService<IResourcesService>();
+		private IGeneralSettingsService GeneralSettingsService { get; } = Ioc.Default.GetRequiredService<IGeneralSettingsService>();
 		private DrivesViewModel DrivesViewModel { get; } = Ioc.Default.GetRequiredService<DrivesViewModel>();
 		public ShelfViewModel ShelfViewModel { get; } = Ioc.Default.GetRequiredService<ShelfViewModel>();
 
@@ -422,6 +423,8 @@ private async void ExecuteNavigateToNumberedTabKeyboardAcceleratorCommand(Keyboa
 
 		public List<ShellProfile> TerminalProfiles => new DefaultValueProvider().GetPreinstalledShellProfiles().ToList();
 
+		public bool IsTerminalIntegrationEnabled => GeneralSettingsService.IsTerminalIntegrationEnabled;
+
 		private bool _isTerminalViewOpen;
 		public bool IsTerminalViewOpen
 		{
@@ -433,7 +436,11 @@ public bool IsTerminalViewOpen
 		public ShellProfile TerminalSelectedProfile
 		{
 			get => _terminalSelectedProfile;
-			set => SetProperty(ref _terminalSelectedProfile, value);
+			set
+			{
+				if (value is not null)
+					SetProperty(ref _terminalSelectedProfile, value);
+			}
 		}
 	}
 }

src/Files.App/ViewModels/Settings/AdvancedViewModel.cs

@@ -356,6 +356,20 @@ public bool ShowFlattenOptions
 			}
 		}
 
+		public bool IsTerminalIntegrationEnabled
+		{
+			get => UserSettingsService.GeneralSettingsService.IsTerminalIntegrationEnabled;
+			set
+			{
+				if (value != UserSettingsService.GeneralSettingsService.IsTerminalIntegrationEnabled)
+				{
+					UserSettingsService.GeneralSettingsService.IsTerminalIntegrationEnabled = value;
+
+					OnPropertyChanged();
+				}
+			}
+		}
+
 		public async Task OpenFilesOnWindowsStartupAsync()
 		{
 			var stateMode = await ReadState();

src/Files.App/Views/Settings/AdvancedPage.xaml

@@ -168,6 +168,21 @@
 				</wctcontrols:SettingsCard.HeaderIcon>
 				<ToggleSwitch AutomationProperties.Name="{helpers:ResourceString Name=ShowFlattenOptions}" IsOn="{x:Bind ViewModel.ShowFlattenOptions, Mode=TwoWay}" />
 			</wctcontrols:SettingsCard>
-		</StackPanel>
+
+            <!--  Enable terminal integration  -->
+            <local:SettingsBlockControl
+		x:Name="TerminalIntegrationSettingsBlockControl"
+		Title="{helpers:ResourceString Name=SettingsTerminalIntegration}"
+		HorizontalAlignment="Stretch">
+                <local:SettingsBlockControl.Icon>
+                    <FontIcon Glyph="&#xE756;" />
+                </local:SettingsBlockControl.Icon>
+                <ToggleSwitch
+			AutomationProperties.Name="{helpers:ResourceString Name=SettingsTerminalIntegration}"
+			IsOn="{x:Bind ViewModel.IsTerminalIntegrationEnabled, Mode=TwoWay}"
+			Style="{StaticResource RightAlignedToggleSwitchStyle}" />
+            </local:SettingsBlockControl>
+        </StackPanel>
+        </StackPanel>
 	</Grid>
 </Page>