Skip to content

Commit fe23867

Browse files
farag2farag2
committed
Fixed XAML in UninstallUWPApps function
1 parent 8efe208 commit fe23867

File tree

7 files changed

+86
-98
lines changed

7 files changed

+86
-98
lines changed

‎src/Sophia_Script_for_Windows_10/Module/Sophia.psm1‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10015,7 +10015,7 @@ function UninstallUWPApps
1001510015
<Window
1001610016
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
1001710017
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
10018-
Name="Window"
10018+
x:Name="Window"
1001910019
MinHeight="400" MinWidth="415"
1002010020
SizeToContent="Width" WindowStartupLocation="CenterScreen"
1002110021
TextOptions.TextFormattingMode="Display" SnapsToDevicePixels="True"
@@ -10027,27 +10027,25 @@ function UninstallUWPApps
1002710027
<Setter Property="VerticalAlignment" Value="Top"/>
1002810028
</Style>
1002910029
<Style TargetType="CheckBox">
10030-
<Setter Property="Margin" Value="10, 13, 10"/>
10030+
<Setter Property="Margin" Value="10,13,10,13"/>
1003110031
<Setter Property="IsChecked" Value="True"/>
1003210032
</Style>
1003310033
<Style TargetType="TextBlock">
10034-
<Setter Property="Margin" Value="0, 10, 10, 10"/>
10034+
<Setter Property="Margin" Value="0,10,10,10"/>
1003510035
</Style>
1003610036
<Style TargetType="Button">
1003710037
<Setter Property="Margin" Value="20"/>
1003810038
<Setter Property="Padding" Value="10"/>
1003910039
<Setter Property="IsEnabled" Value="False"/>
1004010040
</Style>
1004110041
<Style TargetType="Border">
10042-
<Setter Property="Grid.Row" Value="1"/>
10043-
<Setter Property="CornerRadius" Value="0"/>
10044-
<Setter Property="BorderThickness" Value="0, 1, 0, 1"/>
10042+
<Setter Property="BorderThickness" Value="0,1,0,1"/>
1004510043
<Setter Property="BorderBrush" Value="#000000"/>
1004610044
</Style>
1004710045
<Style TargetType="ScrollViewer">
1004810046
<Setter Property="HorizontalScrollBarVisibility" Value="Disabled"/>
1004910047
<Setter Property="BorderBrush" Value="#000000"/>
10050-
<Setter Property="BorderThickness" Value="0, 1, 0, 1"/>
10048+
<Setter Property="BorderThickness" Value="0,1,0,1"/>
1005110049
</Style>
1005210050
</Window.Resources>
1005310051
<Grid>
@@ -10061,21 +10059,21 @@ function UninstallUWPApps
1006110059
<ColumnDefinition Width="*"/>
1006210060
<ColumnDefinition Width="*"/>
1006310061
</Grid.ColumnDefinitions>
10064-
<StackPanel Name="PanelSelectAll" Grid.Column="0" HorizontalAlignment="Left">
10065-
<CheckBox Name="CheckBoxSelectAll" IsChecked="False"/>
10066-
<TextBlock Name="TextBlockSelectAll" Margin="10,10, 0, 10"/>
10062+
<StackPanel x:Name="PanelSelectAll" Grid.Column="0" HorizontalAlignment="Left">
10063+
<CheckBox x:Name="CheckBoxSelectAll" IsChecked="False"/>
10064+
<TextBlock x:Name="TextBlockSelectAll" Margin="10,10,0,10"/>
1006710065
</StackPanel>
10068-
<StackPanel Name="PanelRemoveForAll" Grid.Column="1" HorizontalAlignment="Right">
10069-
<TextBlock Name="TextBlockRemoveForAll" Margin="10,10, 0, 10"/>
10070-
<CheckBox Name="CheckBoxForAllUsers" IsChecked="False"/>
10066+
<StackPanel x:Name="PanelRemoveForAll" Grid.Column="1" HorizontalAlignment="Right">
10067+
<TextBlock x:Name="TextBlockRemoveForAll" Margin="10,10,0,10"/>
10068+
<CheckBox x:Name="CheckBoxForAllUsers" IsChecked="False"/>
1007110069
</StackPanel>
1007210070
</Grid>
10073-
<Border>
10071+
<Border Grid.Row="1">
1007410072
<ScrollViewer>
10075-
<StackPanel Name="PanelContainer" Orientation="Vertical"/>
10073+
<StackPanel x:Name="PanelContainer" Orientation="Vertical"/>
1007610074
</ScrollViewer>
1007710075
</Border>
10078-
<Button Name="ButtonUninstall" Grid.Row="2"/>
10076+
<Button x:Name="ButtonUninstall" Grid.Row="2"/>
1007910077
</Grid>
1008010078
</Window>
1008110079
"@

‎src/Sophia_Script_for_Windows_10_PowerShell_7/Module/Sophia.psm1‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10025,7 +10025,7 @@ function UninstallUWPApps
1002510025
<Window
1002610026
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
1002710027
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
10028-
Name="Window"
10028+
x:Name="Window"
1002910029
MinHeight="400" MinWidth="415"
1003010030
SizeToContent="Width" WindowStartupLocation="CenterScreen"
1003110031
TextOptions.TextFormattingMode="Display" SnapsToDevicePixels="True"
@@ -10037,27 +10037,25 @@ function UninstallUWPApps
1003710037
<Setter Property="VerticalAlignment" Value="Top"/>
1003810038
</Style>
1003910039
<Style TargetType="CheckBox">
10040-
<Setter Property="Margin" Value="10, 13, 10"/>
10040+
<Setter Property="Margin" Value="10,13,10,13"/>
1004110041
<Setter Property="IsChecked" Value="True"/>
1004210042
</Style>
1004310043
<Style TargetType="TextBlock">
10044-
<Setter Property="Margin" Value="0, 10, 10, 10"/>
10044+
<Setter Property="Margin" Value="0,10,10,10"/>
1004510045
</Style>
1004610046
<Style TargetType="Button">
1004710047
<Setter Property="Margin" Value="20"/>
1004810048
<Setter Property="Padding" Value="10"/>
1004910049
<Setter Property="IsEnabled" Value="False"/>
1005010050
</Style>
1005110051
<Style TargetType="Border">
10052-
<Setter Property="Grid.Row" Value="1"/>
10053-
<Setter Property="CornerRadius" Value="0"/>
10054-
<Setter Property="BorderThickness" Value="0, 1, 0, 1"/>
10052+
<Setter Property="BorderThickness" Value="0,1,0,1"/>
1005510053
<Setter Property="BorderBrush" Value="#000000"/>
1005610054
</Style>
1005710055
<Style TargetType="ScrollViewer">
1005810056
<Setter Property="HorizontalScrollBarVisibility" Value="Disabled"/>
1005910057
<Setter Property="BorderBrush" Value="#000000"/>
10060-
<Setter Property="BorderThickness" Value="0, 1, 0, 1"/>
10058+
<Setter Property="BorderThickness" Value="0,1,0,1"/>
1006110059
</Style>
1006210060
</Window.Resources>
1006310061
<Grid>
@@ -10071,21 +10069,21 @@ function UninstallUWPApps
1007110069
<ColumnDefinition Width="*"/>
1007210070
<ColumnDefinition Width="*"/>
1007310071
</Grid.ColumnDefinitions>
10074-
<StackPanel Name="PanelSelectAll" Grid.Column="0" HorizontalAlignment="Left">
10075-
<CheckBox Name="CheckBoxSelectAll" IsChecked="False"/>
10076-
<TextBlock Name="TextBlockSelectAll" Margin="10,10, 0, 10"/>
10072+
<StackPanel x:Name="PanelSelectAll" Grid.Column="0" HorizontalAlignment="Left">
10073+
<CheckBox x:Name="CheckBoxSelectAll" IsChecked="False"/>
10074+
<TextBlock x:Name="TextBlockSelectAll" Margin="10,10,0,10"/>
1007710075
</StackPanel>
10078-
<StackPanel Name="PanelRemoveForAll" Grid.Column="1" HorizontalAlignment="Right">
10079-
<TextBlock Name="TextBlockRemoveForAll" Margin="10,10, 0, 10"/>
10080-
<CheckBox Name="CheckBoxForAllUsers" IsChecked="False"/>
10076+
<StackPanel x:Name="PanelRemoveForAll" Grid.Column="1" HorizontalAlignment="Right">
10077+
<TextBlock x:Name="TextBlockRemoveForAll" Margin="10,10,0,10"/>
10078+
<CheckBox x:Name="CheckBoxForAllUsers" IsChecked="False"/>
1008110079
</StackPanel>
1008210080
</Grid>
10083-
<Border>
10081+
<Border Grid.Row="1">
1008410082
<ScrollViewer>
10085-
<StackPanel Name="PanelContainer" Orientation="Vertical"/>
10083+
<StackPanel x:Name="PanelContainer" Orientation="Vertical"/>
1008610084
</ScrollViewer>
1008710085
</Border>
10088-
<Button Name="ButtonUninstall" Grid.Row="2"/>
10086+
<Button x:Name="ButtonUninstall" Grid.Row="2"/>
1008910087
</Grid>
1009010088
</Window>
1009110089
"@

‎src/Sophia_Script_for_Windows_11/Module/Sophia.psm1‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9399,7 +9399,7 @@ function UninstallUWPApps
93999399
<Window
94009400
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
94019401
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
9402-
Name="Window"
9402+
x:Name="Window"
94039403
MinHeight="400" MinWidth="415"
94049404
SizeToContent="Width" WindowStartupLocation="CenterScreen"
94059405
TextOptions.TextFormattingMode="Display" SnapsToDevicePixels="True"
@@ -9411,27 +9411,25 @@ function UninstallUWPApps
94119411
<Setter Property="VerticalAlignment" Value="Top"/>
94129412
</Style>
94139413
<Style TargetType="CheckBox">
9414-
<Setter Property="Margin" Value="10, 13, 10"/>
9414+
<Setter Property="Margin" Value="10,13,10,13"/>
94159415
<Setter Property="IsChecked" Value="True"/>
94169416
</Style>
94179417
<Style TargetType="TextBlock">
9418-
<Setter Property="Margin" Value="0, 10, 10, 10"/>
9418+
<Setter Property="Margin" Value="0,10,10,10"/>
94199419
</Style>
94209420
<Style TargetType="Button">
94219421
<Setter Property="Margin" Value="20"/>
94229422
<Setter Property="Padding" Value="10"/>
94239423
<Setter Property="IsEnabled" Value="False"/>
94249424
</Style>
94259425
<Style TargetType="Border">
9426-
<Setter Property="Grid.Row" Value="1"/>
9427-
<Setter Property="CornerRadius" Value="0"/>
9428-
<Setter Property="BorderThickness" Value="0, 1, 0, 1"/>
9426+
<Setter Property="BorderThickness" Value="0,1,0,1"/>
94299427
<Setter Property="BorderBrush" Value="#000000"/>
94309428
</Style>
94319429
<Style TargetType="ScrollViewer">
94329430
<Setter Property="HorizontalScrollBarVisibility" Value="Disabled"/>
94339431
<Setter Property="BorderBrush" Value="#000000"/>
9434-
<Setter Property="BorderThickness" Value="0, 1, 0, 1"/>
9432+
<Setter Property="BorderThickness" Value="0,1,0,1"/>
94359433
</Style>
94369434
</Window.Resources>
94379435
<Grid>
@@ -9445,21 +9443,21 @@ function UninstallUWPApps
94459443
<ColumnDefinition Width="*"/>
94469444
<ColumnDefinition Width="*"/>
94479445
</Grid.ColumnDefinitions>
9448-
<StackPanel Name="PanelSelectAll" Grid.Column="0" HorizontalAlignment="Left">
9449-
<CheckBox Name="CheckBoxSelectAll" IsChecked="False"/>
9450-
<TextBlock Name="TextBlockSelectAll" Margin="10,10, 0, 10"/>
9446+
<StackPanel x:Name="PanelSelectAll" Grid.Column="0" HorizontalAlignment="Left">
9447+
<CheckBox x:Name="CheckBoxSelectAll" IsChecked="False"/>
9448+
<TextBlock x:Name="TextBlockSelectAll" Margin="10,10,0,10"/>
94519449
</StackPanel>
9452-
<StackPanel Name="PanelRemoveForAll" Grid.Column="1" HorizontalAlignment="Right">
9453-
<TextBlock Name="TextBlockRemoveForAll" Margin="10,10, 0, 10"/>
9454-
<CheckBox Name="CheckBoxForAllUsers" IsChecked="False"/>
9450+
<StackPanel x:Name="PanelRemoveForAll" Grid.Column="1" HorizontalAlignment="Right">
9451+
<TextBlock x:Name="TextBlockRemoveForAll" Margin="10,10,0,10"/>
9452+
<CheckBox x:Name="CheckBoxForAllUsers" IsChecked="False"/>
94559453
</StackPanel>
94569454
</Grid>
9457-
<Border>
9455+
<Border Grid.Row="1">
94589456
<ScrollViewer>
9459-
<StackPanel Name="PanelContainer" Orientation="Vertical"/>
9457+
<StackPanel x:Name="PanelContainer" Orientation="Vertical"/>
94609458
</ScrollViewer>
94619459
</Border>
9462-
<Button Name="ButtonUninstall" Grid.Row="2"/>
9460+
<Button x:Name="ButtonUninstall" Grid.Row="2"/>
94639461
</Grid>
94649462
</Window>
94659463
"@

‎src/Sophia_Script_for_Windows_11_ARM/Module/Sophia.psm1‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9270,7 +9270,7 @@ function UninstallUWPApps
92709270
<Window
92719271
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
92729272
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
9273-
Name="Window"
9273+
x:Name="Window"
92749274
MinHeight="400" MinWidth="415"
92759275
SizeToContent="Width" WindowStartupLocation="CenterScreen"
92769276
TextOptions.TextFormattingMode="Display" SnapsToDevicePixels="True"
@@ -9282,27 +9282,25 @@ function UninstallUWPApps
92829282
<Setter Property="VerticalAlignment" Value="Top"/>
92839283
</Style>
92849284
<Style TargetType="CheckBox">
9285-
<Setter Property="Margin" Value="10, 13, 10"/>
9285+
<Setter Property="Margin" Value="10,13,10,13"/>
92869286
<Setter Property="IsChecked" Value="True"/>
92879287
</Style>
92889288
<Style TargetType="TextBlock">
9289-
<Setter Property="Margin" Value="0, 10, 10, 10"/>
9289+
<Setter Property="Margin" Value="0,10,10,10"/>
92909290
</Style>
92919291
<Style TargetType="Button">
92929292
<Setter Property="Margin" Value="20"/>
92939293
<Setter Property="Padding" Value="10"/>
92949294
<Setter Property="IsEnabled" Value="False"/>
92959295
</Style>
92969296
<Style TargetType="Border">
9297-
<Setter Property="Grid.Row" Value="1"/>
9298-
<Setter Property="CornerRadius" Value="0"/>
9299-
<Setter Property="BorderThickness" Value="0, 1, 0, 1"/>
9297+
<Setter Property="BorderThickness" Value="0,1,0,1"/>
93009298
<Setter Property="BorderBrush" Value="#000000"/>
93019299
</Style>
93029300
<Style TargetType="ScrollViewer">
93039301
<Setter Property="HorizontalScrollBarVisibility" Value="Disabled"/>
93049302
<Setter Property="BorderBrush" Value="#000000"/>
9305-
<Setter Property="BorderThickness" Value="0, 1, 0, 1"/>
9303+
<Setter Property="BorderThickness" Value="0,1,0,1"/>
93069304
</Style>
93079305
</Window.Resources>
93089306
<Grid>
@@ -9316,21 +9314,21 @@ function UninstallUWPApps
93169314
<ColumnDefinition Width="*"/>
93179315
<ColumnDefinition Width="*"/>
93189316
</Grid.ColumnDefinitions>
9319-
<StackPanel Name="PanelSelectAll" Grid.Column="0" HorizontalAlignment="Left">
9320-
<CheckBox Name="CheckBoxSelectAll" IsChecked="False"/>
9321-
<TextBlock Name="TextBlockSelectAll" Margin="10,10, 0, 10"/>
9317+
<StackPanel x:Name="PanelSelectAll" Grid.Column="0" HorizontalAlignment="Left">
9318+
<CheckBox x:Name="CheckBoxSelectAll" IsChecked="False"/>
9319+
<TextBlock x:Name="TextBlockSelectAll" Margin="10,10,0,10"/>
93229320
</StackPanel>
9323-
<StackPanel Name="PanelRemoveForAll" Grid.Column="1" HorizontalAlignment="Right">
9324-
<TextBlock Name="TextBlockRemoveForAll" Margin="10,10, 0, 10"/>
9325-
<CheckBox Name="CheckBoxForAllUsers" IsChecked="False"/>
9321+
<StackPanel x:Name="PanelRemoveForAll" Grid.Column="1" HorizontalAlignment="Right">
9322+
<TextBlock x:Name="TextBlockRemoveForAll" Margin="10,10,0,10"/>
9323+
<CheckBox x:Name="CheckBoxForAllUsers" IsChecked="False"/>
93269324
</StackPanel>
93279325
</Grid>
9328-
<Border>
9326+
<Border Grid.Row="1">
93299327
<ScrollViewer>
9330-
<StackPanel Name="PanelContainer" Orientation="Vertical"/>
9328+
<StackPanel x:Name="PanelContainer" Orientation="Vertical"/>
93319329
</ScrollViewer>
93329330
</Border>
9333-
<Button Name="ButtonUninstall" Grid.Row="2"/>
9331+
<Button x:Name="ButtonUninstall" Grid.Row="2"/>
93349332
</Grid>
93359333
</Window>
93369334
"@

‎src/Sophia_Script_for_Windows_11_ARM_PowerShell_7/Module/Sophia.psm1‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -9282,7 +9282,7 @@ function UninstallUWPApps
92829282
<Window
92839283
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
92849284
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
9285-
Name="Window"
9285+
x:Name="Window"
92869286
MinHeight="400" MinWidth="415"
92879287
SizeToContent="Width" WindowStartupLocation="CenterScreen"
92889288
TextOptions.TextFormattingMode="Display" SnapsToDevicePixels="True"
@@ -9294,27 +9294,25 @@ function UninstallUWPApps
92949294
<Setter Property="VerticalAlignment" Value="Top"/>
92959295
</Style>
92969296
<Style TargetType="CheckBox">
9297-
<Setter Property="Margin" Value="10, 13, 10"/>
9297+
<Setter Property="Margin" Value="10,13,10,13"/>
92989298
<Setter Property="IsChecked" Value="True"/>
92999299
</Style>
93009300
<Style TargetType="TextBlock">
9301-
<Setter Property="Margin" Value="0, 10, 10, 10"/>
9301+
<Setter Property="Margin" Value="0,10,10,10"/>
93029302
</Style>
93039303
<Style TargetType="Button">
93049304
<Setter Property="Margin" Value="20"/>
93059305
<Setter Property="Padding" Value="10"/>
93069306
<Setter Property="IsEnabled" Value="False"/>
93079307
</Style>
93089308
<Style TargetType="Border">
9309-
<Setter Property="Grid.Row" Value="1"/>
9310-
<Setter Property="CornerRadius" Value="0"/>
9311-
<Setter Property="BorderThickness" Value="0, 1, 0, 1"/>
9309+
<Setter Property="BorderThickness" Value="0,1,0,1"/>
93129310
<Setter Property="BorderBrush" Value="#000000"/>
93139311
</Style>
93149312
<Style TargetType="ScrollViewer">
93159313
<Setter Property="HorizontalScrollBarVisibility" Value="Disabled"/>
93169314
<Setter Property="BorderBrush" Value="#000000"/>
9317-
<Setter Property="BorderThickness" Value="0, 1, 0, 1"/>
9315+
<Setter Property="BorderThickness" Value="0,1,0,1"/>
93189316
</Style>
93199317
</Window.Resources>
93209318
<Grid>
@@ -9328,21 +9326,21 @@ function UninstallUWPApps
93289326
<ColumnDefinition Width="*"/>
93299327
<ColumnDefinition Width="*"/>
93309328
</Grid.ColumnDefinitions>
9331-
<StackPanel Name="PanelSelectAll" Grid.Column="0" HorizontalAlignment="Left">
9332-
<CheckBox Name="CheckBoxSelectAll" IsChecked="False"/>
9333-
<TextBlock Name="TextBlockSelectAll" Margin="10,10, 0, 10"/>
9329+
<StackPanel x:Name="PanelSelectAll" Grid.Column="0" HorizontalAlignment="Left">
9330+
<CheckBox x:Name="CheckBoxSelectAll" IsChecked="False"/>
9331+
<TextBlock x:Name="TextBlockSelectAll" Margin="10,10,0,10"/>
93349332
</StackPanel>
9335-
<StackPanel Name="PanelRemoveForAll" Grid.Column="1" HorizontalAlignment="Right">
9336-
<TextBlock Name="TextBlockRemoveForAll" Margin="10,10, 0, 10"/>
9337-
<CheckBox Name="CheckBoxForAllUsers" IsChecked="False"/>
9333+
<StackPanel x:Name="PanelRemoveForAll" Grid.Column="1" HorizontalAlignment="Right">
9334+
<TextBlock x:Name="TextBlockRemoveForAll" Margin="10,10,0,10"/>
9335+
<CheckBox x:Name="CheckBoxForAllUsers" IsChecked="False"/>
93389336
</StackPanel>
93399337
</Grid>
9340-
<Border>
9338+
<Border Grid.Row="1">
93419339
<ScrollViewer>
9342-
<StackPanel Name="PanelContainer" Orientation="Vertical"/>
9340+
<StackPanel x:Name="PanelContainer" Orientation="Vertical"/>
93439341
</ScrollViewer>
93449342
</Border>
9345-
<Button Name="ButtonUninstall" Grid.Row="2"/>
9343+
<Button x:Name="ButtonUninstall" Grid.Row="2"/>
93469344
</Grid>
93479345
</Window>
93489346
"@

0 commit comments

Comments
 (0)