Restore functionalities

Author: Marco Gavelli

src/Files.App/Files.App.csproj

@@ -38,15 +38,6 @@
         <DefineConstants>$(DefineConstants);DISABLE_XAML_GENERATED_MAIN</DefineConstants>
     </PropertyGroup>
 
-    <ItemGroup>
-      <Compile Remove="Terminal\**" />
-      <Content Remove="Terminal\**" />
-      <EmbeddedResource Remove="Terminal\**" />
-      <None Remove="Terminal\**" />
-      <Page Remove="Terminal\**" />
-      <PRIResource Remove="Terminal\**" />
-    </ItemGroup>
-  
     <ItemGroup>
         <Manifest Include="app.manifest" />
         <Content Update="Assets\Resources\**">
@@ -69,6 +60,10 @@
         <Content Include="7zArm64.dll">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
+		<Content Include="Utils\Terminal\UI\bundle.js" />
+		<Content Include="Utils\Terminal\UI\index.html" />
+		<Content Include="Utils\Terminal\UI\style.css" />
+		<Content Include="Utils\Terminal\UI\xterm.css" />
     </ItemGroup>
 
     <ItemGroup>

src/Files.App/UserControls/FilePreviews/HtmlPreview.xaml

@@ -21,7 +21,7 @@
 			HorizontalAlignment="Stretch"
 			VerticalAlignment="Stretch"
 			DefaultBackgroundColor="Transparent"
-			Loaded="WebViewControl_LoadedAsync" />
+			Loaded="WebViewControl_Loaded" />
 
 	</Border>
 </UserControl>

src/Files.App/UserControls/StatusBar.xaml

@@ -31,6 +31,7 @@
 			<ColumnDefinition />
 			<ColumnDefinition Width="Auto" />
 			<ColumnDefinition Width="Auto" />
+			<ColumnDefinition Width="Auto" />
 		</Grid.ColumnDefinitions>
 
 		<!--  Folder and selection info  -->
@@ -322,7 +323,7 @@
 				x:Load="{x:Bind MainPageViewModel.IsTerminalViewOpen, Mode=OneWay}"
 				Background="Transparent"
 				BorderBrush="Transparent"
-				Command="{x:Bind MainPageViewModel.TerminalSyncUpCommand}">
+				Command="{x:Bind MainPageViewModel.TerminalSyncUpCommand, Mode=OneWay}">
 				<Button.Content>
 					<FontIcon FontSize="12" Glyph="&#xE110;" />
 				</Button.Content>
@@ -336,7 +337,7 @@
 				x:Load="{x:Bind MainPageViewModel.IsTerminalViewOpen, Mode=OneWay}"
 				Background="Transparent"
 				BorderBrush="Transparent"
-				Command="{x:Bind MainPageViewModel.TerminalSyncDownCommand}">
+				Command="{x:Bind MainPageViewModel.TerminalSyncDownCommand, Mode=OneWay}">
 				<Button.Content>
 					<FontIcon FontSize="12" Glyph="&#xE74B;" />
 				</Button.Content>
@@ -350,7 +351,7 @@
 				AutomationProperties.Name="Toggle terminal"
 				Background="Transparent"
 				BorderBrush="Transparent"
-				Command="{x:Bind MainPageViewModel.TerminalToggleCommand}">
+				Command="{x:Bind MainPageViewModel.TerminalToggleCommand, Mode=OneWay}">
 				<SplitButton.Content>
 					<StackPanel Orientation="Horizontal" Spacing="8">
 						<FontIcon FontSize="12" Glyph="&#xE756;" />

src/Files.App/Views/MainPage.xaml.cs

@@ -189,6 +189,7 @@ private void UpdateStatusBarProperties()
 			{
 				StatusBar.StatusBarViewModel = SidebarAdaptiveViewModel.PaneHolder?.ActivePaneOrColumn.SlimContentPage?.StatusBarViewModel;
 				StatusBar.SelectedItemsPropertiesViewModel = SidebarAdaptiveViewModel.PaneHolder?.ActivePaneOrColumn.SlimContentPage?.SelectedItemsPropertiesViewModel;
+				StatusBar.MainPageViewModel = ViewModel;
 			}
 		}
 

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

@@ -174,10 +174,7 @@
 				<wctcontrols:SettingsCard.HeaderIcon>
 					<FontIcon Glyph="&#xE756;" />
 				</wctcontrols:SettingsCard.HeaderIcon>
-				<ToggleSwitch
-					AutomationProperties.Name="{helpers:ResourceString Name=SettingsTerminalIntegration}"
-					IsOn="{x:Bind ViewModel.IsTerminalIntegrationEnabled, Mode=TwoWay}"
-					Style="{StaticResource RightAlignedToggleSwitchStyle}" />
+				<ToggleSwitch AutomationProperties.Name="{helpers:ResourceString Name=SettingsTerminalIntegration}" IsOn="{x:Bind ViewModel.IsTerminalIntegrationEnabled, Mode=TwoWay}" />
 			</wctcontrols:SettingsCard>
 		</StackPanel>
 	</Grid>