Merge 125e78be96 into ce1ef2a519

- remove "Segoe Fluent Icons" changes
- add Invoke-WPFGetIso improvements from #2731
> read image once, then take info from the result of that.

config/themes.json

@@ -19,7 +19,7 @@
         "IconFontSize":     "14",
         "IconButtonSize":   "35",
         "SettingsIconFontSize":   "18",
-        "CloseIconFontSize":      "12",
+        "CloseIconFontSize":      "18",
         "MicroWinLogoSize": "10",
         "MicrowinCheckBoxMargin": "-10,5,0,0",
         "GroupBorderBackgroundColor":  "#232629",

functions/public/Invoke-WPFGetIso.ps1

@@ -260,19 +260,33 @@ function Invoke-WPFGetIso {
             $wimFile = $wimFile.Replace(".wim", ".esd").Trim()
         }
         $sync.MicrowinWindowsFlavors.Items.Clear()
-        Get-WindowsImage -ImagePath $wimFile | ForEach-Object {
+
+        # Store the results of Get-WindowsImage in a variable
+        $images = Get-WindowsImage -ImagePath $wimFile
+
+        $proEditionIndex = -1
+        $proeditionfound = $false
+
+        # Populate the list of Windows flavors and find the Pro edition
+        $images | ForEach-Object {
             $imageIdx = $_.ImageIndex
             $imageName = $_.ImageName
             $sync.MicrowinWindowsFlavors.Items.Add("$imageIdx : $imageName")
-        }
-        $sync.MicrowinWindowsFlavors.SelectedIndex = 0
-        Write-Host "Finding suitable Pro edition. This can take some time. Do note that this is an automatic process that might not select the edition you want."
-        Get-WindowsImage -ImagePath $wimFile | ForEach-Object {
-            if ((Get-WindowsImage -ImagePath $wimFile -Index $_.ImageIndex).EditionId -eq "Professional") {
-                # We have found the Pro edition
-                $sync.MicrowinWindowsFlavors.SelectedIndex = $_.ImageIndex - 1
+
+            # Check if the image name contains 'Pro'
+            if ($imageName -like "*Pro*" -and !$proeditionfound) {
+                $proEditionIndex = $imageIdx
+                $proeditionfound = $true
             }
         }
+
+        # Set the selected index to the Pro edition if found, otherwise default to the first item
+        if ($proEditionIndex -ne -1) {
+            $sync.MicrowinWindowsFlavors.SelectedIndex = $proEditionIndex - 1
+        } else {
+            $sync.MicrowinWindowsFlavors.SelectedIndex = 0
+        }
+
         Get-Volume $driveLetter | Get-DiskImage | Dismount-DiskImage
         Write-Host "Selected value '$($sync.MicrowinWindowsFlavors.SelectedValue)'....."
 

xaml/inputXML.xaml

@@ -617,22 +617,9 @@
                                         <ControlTemplate TargetType="ContextMenu">
                                             <Border Background="{DynamicResource MainBackgroundColor}" BorderBrush="{DynamicResource BorderColor}" BorderThickness="1" CornerRadius="5" Padding="5">
                                                 <StackPanel>
-                                                    <MenuItem Command="Cut" Header="Cut">
-                                                    <MenuItem.Icon>
-                                                            <TextBlock Text="&#xE8C6;" FontSize="14" FontFamily="Segoe Fluent Icons"/>
-                                                        </MenuItem.Icon>
-                                                    </MenuItem>
-                                                    <MenuItem Command="Copy" Header="Copy">
-                                                        <MenuItem.Icon>
-                                                            <TextBlock Text="&#xE8C8;" FontSize="14" FontFamily="Segoe Fluent Icons"/>
-                                                        </MenuItem.Icon>
-                                                    </MenuItem>
-                                                    <MenuItem Command="Paste" Header="Paste">
-                                                        <MenuItem.Icon>
-                                                            <TextBlock Text="&#xE77F;" FontSize="14" FontFamily="Segoe Fluent Icons"/>
-                                                        </MenuItem.Icon>
-                                                    </MenuItem>
-
+                                                    <MenuItem Command="Cut" Header="Cut"/>
+                                                    <MenuItem Command="Copy" Header="Copy"/>
+                                                    <MenuItem Command="Paste" Header="Paste"/>
                                                 </StackPanel>
                                             </Border>
                                         </ControlTemplate>
@@ -887,7 +874,7 @@
                     Width="{DynamicResource IconButtonSize}" Height="{DynamicResource IconButtonSize}"
                     HorizontalAlignment="Right" VerticalAlignment="Top"
                     Margin="5,5,5,0"
-                    FontFamily="Segoe Fluent Icons"
+                    FontFamily="Segoe MDL2 Assets"
                     Content="&#xE713;"/>
                 <Popup Grid.Column="3" Name="SettingsPopup"
                     IsOpen="False"
@@ -914,13 +901,13 @@
 
             <Button
                 Grid.Column="4"
-                Content="&#xE8BB;" BorderThickness="0"
+                Content="&#xD7;" BorderThickness="0"
                 BorderBrush="Transparent"
                 Background="{DynamicResource MainBackgroundColor}"
                 Width="{DynamicResource IconButtonSize}" Height="{DynamicResource IconButtonSize}"
                 HorizontalAlignment="Right" VerticalAlignment="Top"
                 Margin="0,5,5,0"
-                FontFamily="Segoe Fluent Icons"
+                FontFamily="{DynamicResource FontFamily}"
                 Foreground="{DynamicResource MainForegroundColor}" FontSize="{DynamicResource CloseIconFontSize}" Name="WPFCloseButton" />
             </Grid>