页面编辑-插入自定义弹窗 打开失败

PDF Office/ViewModels/Dialog/PageEditDialogs/InsertDialogViewModel.cs

@@ -1,4 +1,5 @@
-using PDF_Master.Helper;
+using Microsoft.AppCenter.Utils.Files;
+using PDF_Master.Helper;
 using PDF_Master.Model;
 using PDF_Master.Model.PageEdit;
 using Prism.Commands;
@@ -8,6 +9,7 @@ using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
 using System.Drawing.Printing;
+using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
@@ -320,10 +322,28 @@ namespace PDF_Master.ViewModels.Dialog.PageEditDialogs
         private void InitPageSource()
         {
             Pages = new ObservableCollection<CustomPageItem>();
-            Pages.Add(new CustomPageItem() { Name = "空白页", FilePath = "" });
-            Pages.Add(new CustomPageItem() { Name = "横线", FilePath = System.IO.Path.Combine(Environment.CurrentDirectory, @"Resources\PageEdit\HorizontalLine.jpg") });
-            Pages.Add(new CustomPageItem() { Name = "五线谱", FilePath = System.IO.Path.Combine(Environment.CurrentDirectory, @"Resources\PageEdit\Staff.jpg") });
-            Pages.Add(new CustomPageItem() { Name = "格子线", FilePath = System.IO.Path.Combine(Environment.CurrentDirectory, @"Resources\PageEdit\GridLine.jpg") });
+
+            //20230704 插入自定义弹窗，弹窗不出来的情况，保险起见 先注释掉这部分代码
+            //Pages.Add(new CustomPageItem() { Name = "空白页", FilePath = "" });
+
+            //string filePath = System.IO.Path.Combine(Environment.CurrentDirectory, @"Resources\PageEdit\HorizontalLine.jpg");
+            //if (System.IO.File.Exists(filePath))
+            //{
+            //    Pages.Add(new CustomPageItem() { Name = "横线", FilePath = filePath });
+            //}
+            //filePath = System.IO.Path.Combine(Environment.CurrentDirectory, @"Resources\PageEdit\Staff.jpg");
+            //if (System.IO.File.Exists(filePath))
+            //{
+            //    Pages.Add(new CustomPageItem() { Name = "五线谱", FilePath = filePath });
+            //}
+            //filePath = System.IO.Path.Combine(Environment.CurrentDirectory, @"Resources\PageEdit\GridLine.jpg");
+            //if (System.IO.File.Exists(filePath))
+            //{
+            //    Pages.Add(new CustomPageItem() { Name = "格子线", FilePath = filePath });
+            //}
+            //Pages.Add(new CustomPageItem() { Name = "横线", FilePath = System.IO.Path.Combine(Environment.CurrentDirectory, @"Resources\PageEdit\HorizontalLine.jpg") });
+            //Pages.Add(new CustomPageItem() { Name = "五线谱", FilePath = System.IO.Path.Combine(Environment.CurrentDirectory, @"Resources\PageEdit\Staff.jpg") });
+            //Pages.Add(new CustomPageItem() { Name = "格子线", FilePath = System.IO.Path.Combine(Environment.CurrentDirectory, @"Resources\PageEdit\GridLine.jpg") });
         }
 
         private void cancel()

PDF Office/Views/Dialog/PageEditDialogs/InsertDialog.xaml

@@ -102,6 +102,7 @@
                     <RowDefinition Height="auto" />
                     <RowDefinition Height="auto" />
                 </Grid.RowDefinitions>
+                <!--  20230704 如果设置为Hidden，可能会导致弹窗无法打开，报 图片被占用  -->
                 <ListBox
                     Padding="0,16,0,0"
                     HorizontalAlignment="Center"
@@ -109,7 +110,7 @@
                     ItemTemplate="{StaticResource CustomItem}"
                     ItemsSource="{Binding Pages}"
                     SelectedIndex="{Binding ItemSelectedIndex, Mode=TwoWay}"
-                    Visibility="Hidden">
+                    Visibility="Collapsed">
                     <ListBox.ItemContainerStyle>
                         <Style TargetType="{x:Type ListBoxItem}">
                             <Setter Property="Template" Value="{StaticResource ListBoxItemControlTemplate}" />
@@ -204,10 +205,11 @@
                             </TextBox.Resources>
                         </TextBox>
                         <TextBlock
+                            Margin="5,0"
                             VerticalAlignment="Center"
                             FontFamily="Segoe UI"
                             FontSize="14"
-                            Text="X" Margin="5,0" />
+                            Text="X" />
                         <!--<TextBox
                         Width="80"
                         Height="32"