ソースを参照

转档页面范围控件-默认输入状态,与预览联动加强修复,转档-转档条显示修复

liyijie 1 年間 前
コミット
8e660dc4cb

+ 1 - 0
PDF Office/CustomControl/WritableComboBox.xaml.cs

@@ -348,6 +348,7 @@ namespace PDF_Master.CustomControl
                             break;
                         }
                     case "CustomPage":
+                        writableTextBox.Focus();
                         break;
                     default:
                         break;

+ 14 - 4
PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterCSVDialogViewModel.cs

@@ -218,9 +218,10 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
                 var currentViewer = this.currentViewer;
                 string PageRange = "";
                 var PageRangeText = this.PageRangeText;
-                if (PageRangeSelectIndex == "0" || PageRangeSelectIndex == "2" || PageRangeSelectIndex == "3")
+                if (PageRangeSelectIndex == "0" || PageRangeSelectIndex == "2" || PageRangeSelectIndex == "3"|| PageRangeSelectIndex == "4")
                 {
-                    HomePageEditHelper.GetPagerange(PageRangeSelectIndex, currentViewer, ref PageRange, PageRangeText, true);
+                    if (PageRangeSelectIndex == "4") { HomePageEditHelper.GetPagerange("0", currentViewer, ref PageRange, PageRangeText, true); } else { HomePageEditHelper.GetPagerange(PageRangeSelectIndex, currentViewer, ref PageRange, PageRangeText, true); }
+                    
                     char[] enumerationSeparator = new char[] { ',' };
                     char[] rangeSeparator = new char[] { '-' };
                     if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
@@ -269,8 +270,17 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
 
                     if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
                     { //TODO
-                        ConverterPreview.PageIndexLists.Add(0);
-
+                        HomePageEditHelper.GetPagerange("0", currentViewer, ref PageRange, PageRangeText, true);
+                       
+                        if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
+                        { //TODO
+                            ConverterPreview.PageIndexLists.Add(0);
+                            Trace.WriteLine("输入不对");
+                            MessageBoxEx.Show("输入不对");
+                            return;
+                        }
+                        ConverterPreview.PageIndex.Text = ConverterPreview.PageIndexLists.Count.ToString();
+                        ConverterPreview.CurrentIndex = 0;
                         return;
                     }
                     else

+ 13 - 4
PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterExcelDialogViewModel.cs

@@ -447,9 +447,9 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
                 var currentViewer = this.currentViewer;
                 string PageRange = "";
                 var PageRangeText = this.PageRangeText;
-                if (PageRangeSelectIndex == CheckPageSelect["0"] || PageRangeSelectIndex == CheckPageSelect["2"] || PageRangeSelectIndex == CheckPageSelect["3"])
+                if (PageRangeSelectIndex == CheckPageSelect["0"] || PageRangeSelectIndex == CheckPageSelect["2"] || PageRangeSelectIndex == CheckPageSelect["3"] ||PageRangeSelectIndex == CheckPageSelect["4"])
                 {
-                    HomePageEditHelper.GetPagerange(PageRangeSelectIndex, currentViewer, ref PageRange, PageRangeText, !IsCurrentPageIndex);
+                    if (PageRangeSelectIndex == CheckPageSelect["4"]) { HomePageEditHelper.GetPagerange("0", currentViewer, ref PageRange, PageRangeText, true); } else { HomePageEditHelper.GetPagerange(PageRangeSelectIndex, currentViewer, ref PageRange, PageRangeText, true); }
                     char[] enumerationSeparator = new char[] { ',' };
                     char[] rangeSeparator = new char[] { '-' };
                     if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
@@ -498,8 +498,17 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
 
                     if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
                     { //TODO
-                        ConverterPreview.PageIndexLists.Add(0);
-
+                        HomePageEditHelper.GetPagerange("0", currentViewer, ref PageRange, PageRangeText, true);
+
+                        if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
+                        { //TODO
+                            ConverterPreview.PageIndexLists.Add(0);
+                            Trace.WriteLine("输入不对");
+                            MessageBoxEx.Show("输入不对");
+                            return;
+                        }
+                        ConverterPreview.PageIndex.Text = ConverterPreview.PageIndexLists.Count.ToString();
+                        ConverterPreview.CurrentIndex = 0;
                         return;
                     }
                     else

+ 15 - 5
PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterHTMLDialogViewModel.cs

@@ -263,7 +263,7 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
                 MessageBoxEx.Show("输入不对");
                 return;
             }
-            ConverterHTMLModel.htmlOptions=ConverterHTMLModel.HTMLOptions();
+            ConverterHTMLModel.htmlOptions = ConverterHTMLModel.HTMLOptions();
             //result = await ConverterHelper.TxtConvert(ConverterTextModel.InputPath, ConverterTextModel.OutputPath, ConverterTextModel.GetProgress, ConverterTextModel.PageIndexLists, ConverterTextModel.Pawssword);
             //DialogParameters value = new DialogParameters();
             //value.Add(ParameterNames.ConverterType, "HTML");
@@ -291,9 +291,9 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
                 var currentViewer = this.currentViewer;
                 string PageRange = "";
                 var PageRangeText = this.PageRangeText;
-                if (PageRangeSelectIndex == "0" || PageRangeSelectIndex == "2" || PageRangeSelectIndex == "3")
+                if (PageRangeSelectIndex == "0" || PageRangeSelectIndex == "2" || PageRangeSelectIndex == "3" || PageRangeSelectIndex == "4")
                 {
-                    HomePageEditHelper.GetPagerange(PageRangeSelectIndex, currentViewer, ref PageRange, PageRangeText, true);
+                    if (PageRangeSelectIndex == "4") { HomePageEditHelper.GetPagerange("0", currentViewer, ref PageRange, PageRangeText, true); } else { HomePageEditHelper.GetPagerange(PageRangeSelectIndex, currentViewer, ref PageRange, PageRangeText, true); }
                     char[] enumerationSeparator = new char[] { ',' };
                     char[] rangeSeparator = new char[] { '-' };
                     if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
@@ -342,9 +342,19 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
 
                     if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
                     { //TODO
-                        ConverterPreview.PageIndexLists.Add(0);
-
+                        HomePageEditHelper.GetPagerange("0", currentViewer, ref PageRange, PageRangeText, true);
+
+                        if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
+                        { //TODO
+                            ConverterPreview.PageIndexLists.Add(0);
+                            Trace.WriteLine("输入不对");
+                            MessageBoxEx.Show("输入不对");
+                            return;
+                        }
+                        ConverterPreview.PageIndex.Text = ConverterPreview.PageIndexLists.Count.ToString();
+                        ConverterPreview.CurrentIndex = 0;
                         return;
+
                     }
                     else
                     {

+ 19 - 9
PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterImgDialogViewModel.cs

@@ -83,7 +83,7 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
             T_YES = App.MainPageLoader.GetString("Convert_Yes");
             T_No = App.MainPageLoader.GetString("Convert_No");
             T_PageRange = App.MainPageLoader.GetString("Convert_PDFPageRange");
-            T_Format= App.MainPageLoader.GetString("Convert_PDFToImageFormat");
+            T_Format = App.MainPageLoader.GetString("Convert_PDFToImageFormat");
         }
 
         #endregion
@@ -119,7 +119,7 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
 
         public List<string> ImageTypeFamily { set; get; } = new List<string>();
 
-        private int imageTypeSelectedIndex=0;
+        private int imageTypeSelectedIndex = 0;
         /// <summary>
         /// 图像类型的下拉框索引值
         /// 如果只需要根据选中项的索引判断,则可以不用再采取command绑定命令的形式,而是可以通过一个int类型属性绑定的形式,然后在set方法里进行处理
@@ -213,7 +213,7 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
         public DelegateCommand SetCustomPageRangeCommand { get; set; }
 
         public DelegateCommand BatchConverterCommand { get; set; }
-        
+
         #endregion
 
         public ConverterImgDialogViewModel(IDialogService dialogService)
@@ -232,7 +232,7 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
 
         #region 逻辑函数
 
-        
+
 
         public void SetCustomPageRange()
         {
@@ -416,9 +416,9 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
                 var currentViewer = this.currentViewer;
                 string PageRange = "";
                 var PageRangeText = this.PageRangeText;
-                if (PageRangeSelectIndex == CheckPageSelect["0"] || PageRangeSelectIndex == CheckPageSelect["2"] || PageRangeSelectIndex == CheckPageSelect["3"])
+                if (PageRangeSelectIndex == CheckPageSelect["0"] || PageRangeSelectIndex == CheckPageSelect["2"] || PageRangeSelectIndex == CheckPageSelect["3"] || PageRangeSelectIndex == CheckPageSelect["4"])
                 {
-                    HomePageEditHelper.GetPagerange(PageRangeSelectIndex, currentViewer, ref PageRange, PageRangeText, !IsCurrentPageIndex);
+                    if (PageRangeSelectIndex == CheckPageSelect["4"]) { HomePageEditHelper.GetPagerange("0", currentViewer, ref PageRange, PageRangeText, true); } else { HomePageEditHelper.GetPagerange(PageRangeSelectIndex, currentViewer, ref PageRange, PageRangeText, true); }
                     char[] enumerationSeparator = new char[] { ',' };
                     char[] rangeSeparator = new char[] { '-' };
                     if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
@@ -467,9 +467,19 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
 
                     if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
                     { //TODO
-                        ConverterPreview.PageIndexLists.Add(0);
-
+                        HomePageEditHelper.GetPagerange("0", currentViewer, ref PageRange, PageRangeText, true);
+
+                        if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
+                        { //TODO
+                            ConverterPreview.PageIndexLists.Add(0);
+                            Trace.WriteLine("输入不对");
+                            MessageBoxEx.Show("输入不对");
+                            return;
+                        }
+                        ConverterPreview.PageIndex.Text = ConverterPreview.PageIndexLists.Count.ToString();
+                        ConverterPreview.CurrentIndex = 0;
                         return;
+
                     }
                     else
                     {
@@ -520,7 +530,7 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
                 ImageDPISelectedIndex = 0;
                 FileInfo fileinfo = new FileInfo(ConverterImgModel.InputPath);
                 ConverterImgModel.OutputPath = fileinfo.DirectoryName;
-                
+
             }
         }
         #endregion

+ 13 - 4
PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterPPTDialogViewModel.cs

@@ -318,9 +318,9 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
                 var currentViewer = this.currentViewer;
                 string PageRange = "";
                 var PageRangeText = this.PageRangeText;
-                if (PageRangeSelectIndex == CheckPageSelect["0"] || PageRangeSelectIndex == CheckPageSelect["2"] || PageRangeSelectIndex == CheckPageSelect["3"])
+                if (PageRangeSelectIndex == CheckPageSelect["0"] || PageRangeSelectIndex == CheckPageSelect["2"] || PageRangeSelectIndex == CheckPageSelect["3"] || PageRangeSelectIndex == CheckPageSelect["4"])
                 {
-                    HomePageEditHelper.GetPagerange(PageRangeSelectIndex, currentViewer, ref PageRange, PageRangeText, !IsCurrentPageIndex);
+                    if (PageRangeSelectIndex == CheckPageSelect["4"]) { HomePageEditHelper.GetPagerange("0", currentViewer, ref PageRange, PageRangeText, true); } else { HomePageEditHelper.GetPagerange(PageRangeSelectIndex, currentViewer, ref PageRange, PageRangeText, true); }
                     char[] enumerationSeparator = new char[] { ',' };
                     char[] rangeSeparator = new char[] { '-' };
                     if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
@@ -369,8 +369,17 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
 
                     if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
                     { //TODO
-                        ConverterPreview.PageIndexLists.Add(0);
-
+                        HomePageEditHelper.GetPagerange("0", currentViewer, ref PageRange, PageRangeText, true);
+
+                        if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
+                        { //TODO
+                            ConverterPreview.PageIndexLists.Add(0);
+                            Trace.WriteLine("输入不对");
+                            MessageBoxEx.Show("输入不对");
+                            return;
+                        }
+                        ConverterPreview.PageIndex.Text = ConverterPreview.PageIndexLists.Count.ToString();
+                        ConverterPreview.CurrentIndex = 0;
                         return;
                     }
                     else

+ 13 - 4
PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterRTFDialogViewModel.cs

@@ -290,9 +290,9 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
                 var currentViewer = this.currentViewer;
                 string PageRange = "";
                 var PageRangeText = this.PageRangeText;
-                if (PageRangeSelectIndex == "0" || PageRangeSelectIndex == "2" || PageRangeSelectIndex == "3")
+                if (PageRangeSelectIndex == "0" || PageRangeSelectIndex == "2" || PageRangeSelectIndex == "3" || PageRangeSelectIndex == "4")
                 {
-                    HomePageEditHelper.GetPagerange(PageRangeSelectIndex, currentViewer, ref PageRange, PageRangeText, true);
+                    if (PageRangeSelectIndex == "4") { HomePageEditHelper.GetPagerange("0", currentViewer, ref PageRange, PageRangeText, true); } else { HomePageEditHelper.GetPagerange(PageRangeSelectIndex, currentViewer, ref PageRange, PageRangeText, true); }
                     char[] enumerationSeparator = new char[] { ',' };
                     char[] rangeSeparator = new char[] { '-' };
                     if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
@@ -341,8 +341,17 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
 
                     if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
                     { //TODO
-                        ConverterPreview.PageIndexLists.Add(0);
-
+                        HomePageEditHelper.GetPagerange("0", currentViewer, ref PageRange, PageRangeText, true);
+
+                        if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
+                        { //TODO
+                            ConverterPreview.PageIndexLists.Add(0);
+                            Trace.WriteLine("输入不对");
+                            MessageBoxEx.Show("输入不对");
+                            return;
+                        }
+                        ConverterPreview.PageIndex.Text = ConverterPreview.PageIndexLists.Count.ToString();
+                        ConverterPreview.CurrentIndex = 0;
                         return;
                     }
                     else

+ 13 - 4
PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterTextDialogViewModel.cs

@@ -289,9 +289,9 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
                 var currentViewer = this.currentViewer;
                 string PageRange = "";
                 var PageRangeText = this.PageRangeText;
-                if (PageRangeSelectIndex == "0" || PageRangeSelectIndex == "2" || PageRangeSelectIndex == "3")
+                if (PageRangeSelectIndex == "0" || PageRangeSelectIndex == "2" || PageRangeSelectIndex == "3" || PageRangeSelectIndex == "4")
                 {
-                    HomePageEditHelper.GetPagerange(PageRangeSelectIndex, currentViewer, ref PageRange, PageRangeText, true);
+                    if (PageRangeSelectIndex == "4") { HomePageEditHelper.GetPagerange("0", currentViewer, ref PageRange, PageRangeText, true); } else { HomePageEditHelper.GetPagerange(PageRangeSelectIndex, currentViewer, ref PageRange, PageRangeText, true); }
                     char[] enumerationSeparator = new char[] { ',' };
                     char[] rangeSeparator = new char[] { '-' };
                     if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
@@ -340,8 +340,17 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
 
                     if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
                     { //TODO
-                        ConverterPreview.PageIndexLists.Add(0);
-
+                        HomePageEditHelper.GetPagerange("0", currentViewer, ref PageRange, PageRangeText, true);
+
+                        if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
+                        { //TODO
+                            ConverterPreview.PageIndexLists.Add(0);
+                            Trace.WriteLine("输入不对");
+                            MessageBoxEx.Show("输入不对");
+                            return;
+                        }
+                        ConverterPreview.PageIndex.Text = ConverterPreview.PageIndexLists.Count.ToString();
+                        ConverterPreview.CurrentIndex = 0;
                         return;
                     }
                     else

+ 13 - 4
PDF Office/ViewModels/Dialog/ConverterDialogs/ConverterWordDialogViewModel.cs

@@ -320,9 +320,9 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
                 var currentViewer = this.currentViewer;
                 string PageRange = "";
                 var PageRangeText = this.PageRangeText;
-                if (PageRangeSelectIndex == CheckPageSelect["0"] || PageRangeSelectIndex == CheckPageSelect["2"] || PageRangeSelectIndex == CheckPageSelect["3"])
+                if (PageRangeSelectIndex == CheckPageSelect["0"] || PageRangeSelectIndex == CheckPageSelect["2"] || PageRangeSelectIndex == CheckPageSelect["3"] || PageRangeSelectIndex == CheckPageSelect["4"])
                 {
-                    HomePageEditHelper.GetPagerange(PageRangeSelectIndex, currentViewer, ref PageRange, PageRangeText, !IsCurrentPageIndex);
+                    if (PageRangeSelectIndex == CheckPageSelect["4"]) { HomePageEditHelper.GetPagerange("0", currentViewer, ref PageRange, PageRangeText, true); } else { HomePageEditHelper.GetPagerange(PageRangeSelectIndex, currentViewer, ref PageRange, PageRangeText, true); }
                     char[] enumerationSeparator = new char[] { ',' };
                     char[] rangeSeparator = new char[] { '-' };
                     if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
@@ -371,8 +371,17 @@ namespace PDF_Master.ViewModels.Dialog.ConverterDialogs
 
                     if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
                     { //TODO
-                        ConverterPreview.PageIndexLists.Add(0);
-
+                        HomePageEditHelper.GetPagerange("0", currentViewer, ref PageRange, PageRangeText, true);
+
+                        if (!CommonHelper.GetPagesInRange(ref ConverterPreview.PageIndexLists, PageRange, currentViewer.Document.PageCount, enumerationSeparator, rangeSeparator))
+                        { //TODO
+                            ConverterPreview.PageIndexLists.Add(0);
+                            Trace.WriteLine("输入不对");
+                            MessageBoxEx.Show("输入不对");
+                            return;
+                        }
+                        ConverterPreview.PageIndex.Text = ConverterPreview.PageIndexLists.Count.ToString();
+                        ConverterPreview.CurrentIndex = 0;
                         return;
                     }
                     else

+ 14 - 14
PDF Office/ViewModels/ViewContentViewModel.cs

@@ -471,18 +471,18 @@ namespace PDF_Master.ViewModels
         private Visibility converterBarContentVisible = Visibility.Collapsed;
         private Visibility toolsbarContentVisible = Visibility.Collapsed;
 
-        /// <summary>
-        /// 控制ToolsBarContent的显示
-        /// 留意:显示前需要先注入内容、设置好行和跨行数
-        /// </summary>
-        public Visibility ConverterBarContentVisible
-        {
-            get { return converterBarContentVisible; }
-            set
-            {
-                SetProperty(ref converterBarContentVisible, value);
-            }
-        }
+        ///// <summary>
+        ///// 控制ToolsBarContent的显示
+        ///// 留意:显示前需要先注入内容、设置好行和跨行数
+        ///// </summary>
+        //public Visibility ConverterBarContentVisible
+        //{
+        //    get { return converterBarContentVisible; }
+        //    set
+        //    {
+        //        SetProperty(ref converterBarContentVisible, value);
+        //    }
+        //}
 
         private Visibility toolsBarContentVisible = Visibility.Collapsed;
 
@@ -1463,7 +1463,7 @@ namespace PDF_Master.ViewModels
         {
             ToolContentVisible = Visibility.Collapsed;
             ToolsBarContentVisible = Visibility.Collapsed;
-            ConverterBarContentVisible = Visibility.Collapsed;
+            ToolsBarContentVisible = Visibility.Collapsed;
             TextEditToolContentVisible = Visibility.Collapsed;
             OCRContentVisible = Visibility.Collapsed;
 
@@ -1487,7 +1487,7 @@ namespace PDF_Master.ViewModels
                     break;
 
                 case "TabItemConvert":
-                    ConverterBarContentVisible = Visibility.Visible;
+                    ToolsBarContentVisible = Visibility.Visible;
                     break;
 
                 case "TabItemPageEdit":