【综合】单个转档去除标准Word

PDF Office/PDF Master/Class/PDFTools/Convert/NewController/KMConvertWindowController.swift

@@ -254,35 +254,26 @@ let kConvertFileSavePath = (kTempSavePath?.stringByAppendingPathComponent("conve
         self.formatSelectButton.removeAllItems()
         
         let dpiArray = ["50 dpi", "72 dpi", "96 dpi", "150 dpi", "300 dpi", "600 dpi"]
-        let formArray = ["Excel (.xlsx)", "PowerPoint (.pptx)", "RTF (.rtf)", "CSV (.csv)", "Html (.html)", "Text (.txt)", "JPEG (.jpeg)", "JPG (.jpg)", "PNG (.png)", "GIF (.gif)", "TIFF (.tiff)", "TGA (.tga)", "BMP (.bmp)", "JPEG-2000 (.jp2)","Json(.json)"]
+        let formArray = ["Word (.docx)", "Excel (.xlsx)", "PowerPoint (.pptx)", "RTF (.rtf)", "CSV (.csv)", "Html (.html)", "Text (.txt)", "JPEG (.jpeg)", "JPG (.jpg)", "PNG (.png)", "GIF (.gif)", "TIFF (.tiff)", "TGA (.tga)", "BMP (.bmp)", "JPEG-2000 (.jp2)","Json(.json)"]
         
         for (index, string) in formArray.enumerated() {
             let item = NSMenuItem()
             item.title = string
             item.target = self
-            item.tag = index + 1
+            if index == 0 {
+                item.tag = KMConvertType.AdvancedWord.rawValue
+            } else {
+                item.tag = index
+            }
             self.formatSelectButton.menu?.addItem(item)
         }
         
-        var isShowAdvanced = false
-        let wordItem = NSMenuItem()
-        wordItem.title = "Word (.docx)"
-        wordItem.target = self
-        
         var isShowUpgrade = false
-        
-        var convertSample: KMConvertType = .Word
-        
 #if VERSION_FREE
 #if VERSION_DMG
         // 桌机版
-        wordItem.tag = convertSample.rawValue
-        isShowAdvanced = true
         if KMMemberInfo.shared.isMemberAllFunction {
             if KMMemberInfo.shared.isPermitConvert {
-                convertSample = .AdvancedWord
-                wordItem.tag = convertSample.rawValue
-                isShowAdvanced = false
             } else {
                 isShowUpgrade = true
             }
@@ -291,14 +282,8 @@ let kConvertFileSavePath = (kTempSavePath?.stringByAppendingPathComponent("conve
         }
 #else
         // 免费版
-        convertSample = .Word
-        wordItem.tag = convertSample.rawValue
-        isShowAdvanced = true
         if KMMemberInfo.shared.isMemberAllFunction {
             if KMMemberInfo.shared.isPermitConvert {
-                convertSample = .AdvancedWord
-                wordItem.tag = convertSample.rawValue
-                isShowAdvanced = false
             } else {
                 isShowUpgrade = true
             }
@@ -308,73 +293,21 @@ let kConvertFileSavePath = (kTempSavePath?.stringByAppendingPathComponent("conve
         
 #endif
 #else
-        convertSample = .Word
-        wordItem.tag = convertSample.rawValue
         // 付费版
-        isShowAdvanced = true
         if KMMemberInfo.shared.isPermitConvert {
-            isShowAdvanced = false
-            convertSample = .AdvancedWord
-            wordItem.tag = convertSample.rawValue
         } else {
             isShowUpgrade = true
         }
 #endif
-        
-        if wordItem.title != "" {
-            if isShowAdvanced {
-                let originStr = " \(KMLocalizedString("Standard", nil)) "
-                let str = KMLocalizedString("Word (.docx)", nil)
-                
-                let attributedStr = NSMutableAttributedString(string: "\(str)  \(originStr)")
-                
-                attributedStr.addAttribute(NSAttributedString.Key.backgroundColor, value: NSColor(red: 40/255.0, green: 193.0/255.0, blue: 107.0/255.0, alpha: 1.0), range: NSMakeRange(str.count + 2, originStr.count))
-                
-                attributedStr.addAttribute(NSAttributedString.Key.foregroundColor, value: NSColor.white, range: NSMakeRange(str.count + 2, originStr.count))
-                
-                let item = NSMenuItem()
-                item.attributedTitle = attributedStr
-                item.target = self
-                item.tag = wordItem.tag
-                self.formatSelectButton.menu?.insertItem(item, at: 0)
-            } else {
-                self.formatSelectButton.menu?.insertItem(wordItem, at: 0)
-            }
-        }
         if !isShowUpgrade {
             self.upgradeButton.isHidden = true
         }
         
         var selectIndex = 0
-        if isShowAdvanced {
-            let originStr = " \(NSLocalizedString("Advanced", comment: "")) "
-            let str = NSLocalizedString("Word (.docx)", comment: "")
-            
-            let attributedStr = NSMutableAttributedString(string: "\(str)  \(originStr)")
-            
-            attributedStr.addAttribute(NSAttributedString.Key.backgroundColor, value: NSColor(red: 245.0/255.0, green: 142.0/255.0, blue: 38.0/255.0, alpha: 1.0), range: NSMakeRange(str.count + 2, originStr.count))
-            
-            attributedStr.addAttribute(NSAttributedString.Key.foregroundColor, value: NSColor.white, range: NSMakeRange(str.count + 2, originStr.count))
-            
-            let item = NSMenuItem()
-            item.attributedTitle = attributedStr
-            item.target = self
-            convertSample = .AdvancedWord
-            item.tag = convertSample.rawValue
-            self.formatSelectButton.menu?.insertItem(item, at: 0)
-            
-        }
-        
-        if self.convertType == .Word {
+        if self.convertType == .Word || self.convertType == .AdvancedWord {
             selectIndex = 0
         } else {
             selectIndex = self.convertType.rawValue
-            if isShowAdvanced {
-                selectIndex += 1
-            }
-            if wordItem.title == "" {
-                selectIndex -= 1
-            }
         }
         
         self.formatSelectButton.selectItem(at: selectIndex)
@@ -409,6 +342,7 @@ let kConvertFileSavePath = (kTempSavePath?.stringByAppendingPathComponent("conve
         self.prePDFView.setDisplay(.singlePage)
         self.prePDFView.layoutDocumentView()
     }
+    
     func updataView() {
         var moreLabelString: String = ""
         var offset: CGFloat = 0
@@ -501,7 +435,7 @@ let kConvertFileSavePath = (kTempSavePath?.stringByAppendingPathComponent("conve
             separateButton.title = NSLocalizedString("Convert each page to a separate worksheet", comment: "")
             singleButton.title = NSLocalizedString("Convert all pages to a single worksheet", comment: "")
             buttonClicked_extractTable(extractTableButton)
-        } else if .AdvancedWord == convertType {
+        } else if .AdvancedWord == convertType || convertType == .Word {
             singleButton.setTitleColor(NSColor.labelColor)
             separateButton.setTitleColor(NSColor.labelColor)
             separateStypeLabel.textColor = NSColor.labelColor
@@ -838,7 +772,7 @@ let kConvertFileSavePath = (kTempSavePath?.stringByAppendingPathComponent("conve
                 if self.convertType == .Json {
                     convert = KMPDFConvertJson()
                     convert.isAllInOneSheet = self.isAllInOneSheet
-                } else if self.convertType == .AdvancedWord || self.convertType == .Word  {
+                } else if self.convertType == .AdvancedWord || self.convertType == .Word {
                     convert = KMPDFConvertWord()
                     let data = convert as? KMPDFConvertWord
                     data?.layoutOptions = self.isAllInOneSheet ? .retainPageLayout : .retainFlowingText
@@ -904,7 +838,7 @@ let kConvertFileSavePath = (kTempSavePath?.stringByAppendingPathComponent("conve
 //                convert.isExtractTable = self.extractTableButton.state == .on
                 convert.outputFolderPath = self.savePath
                 convert.outputFileName = (self.pdfDocument?.documentURL.deletingPathExtension().lastPathComponent) ?? NSLocalizedString("Untitled", comment: "")
-                if self.convertType == .AdvancedWord {
+                if self.convertType == .AdvancedWord || self.convertType == .Word {
                     convert.convertType = .word
                 } else if self.convertType == .JPEG ||
                             self.convertType == .JPG ||