|
|
@@ -11,15 +11,13 @@ class KMConvertImageSettingView: KMConvertSettingView {
|
|
|
@IBOutlet weak var resolutionComboBox: NSComboBox!
|
|
|
|
|
|
@IBOutlet weak var formatBox: NSBox!
|
|
|
- var formartView: KMDesignSelect!
|
|
|
-
|
|
|
@IBOutlet weak var pageRangeBox: NSBox!
|
|
|
-
|
|
|
@IBOutlet weak var topBoxHeightConst: NSLayoutConstraint!
|
|
|
|
|
|
-
|
|
|
@IBOutlet weak var dpiTitleLabel: NSTextField!
|
|
|
@IBOutlet weak var dpiSelectBox: NSBox!
|
|
|
+
|
|
|
+ private var formartView: KMDesignSelect?
|
|
|
private var dpiVC: KMDesignSelect?
|
|
|
|
|
|
var selectedFormatIndex = 0
|
|
|
@@ -28,27 +26,20 @@ class KMConvertImageSettingView: KMConvertSettingView {
|
|
|
override func awakeFromNib() {
|
|
|
super.awakeFromNib()
|
|
|
|
|
|
- fileTypeTitleLabel.stringValue = NSLocalizedString("Format", comment: "")
|
|
|
- fileTypeTitleLabel.textColor = NSColor(hex: "#616469")
|
|
|
- fileTypeTitleLabel.font = .SFProTextSemibold(12)
|
|
|
+ self.fileTypeTitleLabel.stringValue = NSLocalizedString("Format", comment: "")
|
|
|
+ self.fileTypeTitleLabel.textColor = NSColor(hex: "#616469")
|
|
|
+ self.fileTypeTitleLabel.font = .SFProTextSemibold(12)
|
|
|
|
|
|
- formartView = KMDesignSelect.init(withType: .Combox)
|
|
|
+ self.formartView = KMDesignSelect.init(withType: .Combox)
|
|
|
+ self.formatBox.fillColor = .clear
|
|
|
+ self.formatBox.contentView = self.formartView!.view
|
|
|
|
|
|
- formatBox.fillColor = .clear
|
|
|
- formatBox.contentView = formartView.view
|
|
|
-
|
|
|
- formartView.removeAllItems()
|
|
|
- formartView.addItems(withObjectValues: ["JPEG","JPG","PNG","GIF","TIFF","TGA","BMP","JPEG-2000"])
|
|
|
- formartView.selectItem(at: 0)
|
|
|
- formartView.editable = false //默认属性，初始化可不设置
|
|
|
- formartView.delete = self
|
|
|
- formartView.updateUI()
|
|
|
-
|
|
|
-// resolutionComboBox.isEditable = false
|
|
|
-// resolutionComboBox.removeAllItems()
|
|
|
-// resolutionComboBox.addItems(withObjectValues: ["50 dpi", "72 dpi", "96 dpi", "150 dpi", "300 dpi", "600 dpi"])
|
|
|
-// resolutionComboBox.selectItem(at: 3)
|
|
|
-// resolutionComboBox.delegate = self
|
|
|
+ self.formartView?.removeAllItems()
|
|
|
+ self.formartView?.addItems(withObjectValues: ["JPEG","JPG","PNG","GIF","TIFF","TGA","BMP","JPEG-2000"])
|
|
|
+ self.formartView?.selectItem(at: 0)
|
|
|
+ self.formartView?.editable = false //默认属性，初始化可不设置
|
|
|
+ self.formartView?.delete = self
|
|
|
+ self.formartView?.updateUI()
|
|
|
|
|
|
self.dpiTitleLabel.stringValue = NSLocalizedString("Resolution", comment: "")
|
|
|
self.dpiTitleLabel.textColor = NSColor(hex: "#616469")
|
|
|
@@ -63,42 +54,43 @@ class KMConvertImageSettingView: KMConvertSettingView {
|
|
|
self.dpiVC?.updateUI()
|
|
|
|
|
|
self.topBoxHeightConst.constant = 80
|
|
|
- resolutionComboBox.isHidden = true
|
|
|
+ self.resolutionComboBox.isHidden = true
|
|
|
}
|
|
|
|
|
|
override func viewDidMoveToWindow() {
|
|
|
super.viewDidMoveToWindow()
|
|
|
|
|
|
- let pageRangeItemView = KMConvertPageRangeSettingItemView.createFromNib()
|
|
|
- pageRangeItemView?.frame = pageRangeBox.contentView!.bounds
|
|
|
- pageRangeItemView?.autoresizingMask = NSView.AutoresizingMask(rawValue: 18)
|
|
|
- pageRangeBox.contentView = pageRangeItemView
|
|
|
- self.pageRangeItemView = pageRangeItemView
|
|
|
- pageRangeItemView?.isTextDidEndCallback = true
|
|
|
- pageRangeItemView?.pageCount = self.pageCount
|
|
|
-
|
|
|
- pageRangeItemView?.itemClick = { [unowned self] index, _ in
|
|
|
- pageRangeSelectedIndex = index
|
|
|
+ if (self.pageRangeItemView == nil) {
|
|
|
+ let viwe = KMConvertPageRangeSettingItemView.createFromNib()
|
|
|
+ self.pageRangeBox.contentView = viwe
|
|
|
+ self.pageRangeItemView = viwe
|
|
|
|
|
|
- guard let callback = self.pageRangeDidChange else {
|
|
|
- return
|
|
|
+ viwe?.itemClick = { [unowned self] index, _ in
|
|
|
+ pageRangeSelectedIndex = index
|
|
|
+
|
|
|
+ guard let callback = self.pageRangeDidChange else {
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ callback(KMPageRange(rawValue: index)!)
|
|
|
}
|
|
|
|
|
|
- callback(KMPageRange(rawValue: index)!)
|
|
|
- }
|
|
|
-
|
|
|
- pageRangeItemView?.textDidEndEditingCallback = { [unowned self] textString in
|
|
|
- let pageRange = KMPageRange(rawValue: self.pageRangeSelectedIndex)
|
|
|
- if (pageRange != .custom) {
|
|
|
- return
|
|
|
- }
|
|
|
-
|
|
|
- guard let callback = pageRangeDidInputFinishCallback else {
|
|
|
- return
|
|
|
+ viwe?.textDidEndEditingCallback = { [unowned self] textString in
|
|
|
+ let pageRange = KMPageRange(rawValue: self.pageRangeSelectedIndex)
|
|
|
+ if (pageRange != .custom) {
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ guard let callback = pageRangeDidInputFinishCallback else {
|
|
|
+ return
|
|
|
+ }
|
|
|
+
|
|
|
+ callback(textString)
|
|
|
}
|
|
|
-
|
|
|
- callback(textString)
|
|
|
}
|
|
|
+
|
|
|
+ self.pageRangeItemView?.isTextDidEndCallback = true
|
|
|
+ self.pageRangeItemView?.pageCount = self.pageCount
|
|
|
}
|
|
|
|
|
|
override func getPageRangeString() -> String {
|
|
|
@@ -111,11 +103,11 @@ class KMConvertImageSettingView: KMConvertSettingView {
|
|
|
|
|
|
extension KMConvertImageSettingView: KMSelectPopButtonDelegate {
|
|
|
func km_comboBoxSelectionDidChange(_ obj: KMDesignSelect) {
|
|
|
- if formartView.isEqual(to: obj) {
|
|
|
- if formartView.indexOfSelectedItem < 0 {
|
|
|
+ if (obj.isEqual(to: self.formartView)) {
|
|
|
+ if formartView!.indexOfSelectedItem < 0 {
|
|
|
selectedFormatIndex = 0
|
|
|
} else {
|
|
|
- selectedFormatIndex = formartView.indexOfSelectedItem
|
|
|
+ selectedFormatIndex = formartView!.indexOfSelectedItem
|
|
|
}
|
|
|
} else if (obj.isEqual(to: self.dpiVC)) {
|
|
|
if let index = self.dpiVC?.indexOfSelectedItem {
|
