Bladeren bron

其他- 应用偏好设置自动展开属性面板逻辑

ZhouJieSheng 2 jaren geleden
bovenliggende
commit
aab9f9d91e
3 gewijzigde bestanden met toevoegingen van 15 en 3 verwijderingen
  1. 9 1
      PDF Office/App.xaml.cs
  2. 5 1
      PDF Office/ViewModels/ViewContentViewModel.cs
  3. 1 1
      PDFSettings/APPSettingProperties.cs

+ 9 - 1
PDF Office/App.xaml.cs

@@ -74,7 +74,7 @@ namespace PDF_Office
         /// <summary>
         /// 内嵌文档路径
         /// </summary>
-        public static string GuidPDFPath = Path.Combine(Environment.CurrentDirectory, "Resources//GuidPDF//Quick Start Guide.pdf");
+        public static string GuidPDFPath = Path.Combine(Environment.CurrentDirectory, "Resources\\GuidPDF\\Quick Start Guide.pdf");
 
         /// <summary>
         /// 是否需要更新内嵌文档
@@ -105,9 +105,17 @@ namespace PDF_Office
         /// </summary>
         public static string modelFolderPath = null;
 
+        /// <summary>
+        /// 是否是软件的第一个主窗体
+        /// </summary>
         public static bool IsFirstOpen = true;
         public static bool IsBookMode = false;
 
+        /// <summary>
+        /// 是否已经登陆
+        /// </summary>
+        public static bool IsLogin = false;
+
         //是否需要显示注册弹窗
         //app第一次启动时需要弹出注册弹窗
         public static bool IsShowRegist = false;

+ 5 - 1
PDF Office/ViewModels/ViewContentViewModel.cs

@@ -507,7 +507,11 @@ namespace PDF_Office.ViewModels
             get { return isPorpertyOpen; }
             set
             {
-                SetProperty(ref isPorpertyOpen, value);
+                //如果设置为手动展开属性面板时,则不响应代码控制的展开
+                if (Settings.Default.AppProperties.InitialVIew.AutoExpandProperty)
+                {
+                    SetProperty(ref isPorpertyOpen, value);
+                }
             }
         }
 

+ 1 - 1
PDFSettings/APPSettingProperties.cs

@@ -150,7 +150,7 @@ namespace PDFSettings
         /// <summary>
         /// 属性面板 手动展开
         /// </summary>
-        public bool ClickOpenProperty = true;
+        public bool ClickOpenProperty = false;
 
         /// <summary>
         /// 阅读页背景色