- Fixes search highlights removing in code blocks and tags

- Fixes missed undelete undo
- Fixes images loading in first print
- Adds toggle for cmd+L
- Fixes russian localization

Author: glushchenko

FSNotes.xcodeproj/project.pbxproj

@@ -4370,7 +4370,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 482;
+				CURRENT_PROJECT_VERSION = 486;
 				DEVELOPMENT_TEAM = 866P6MTE92;
 				EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = YES;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -4383,7 +4383,7 @@
 				INFOPLIST_FILE = "FSNotes Info (Notarized).plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 5beta5;
+				MARKETING_VERSION = 5beta6;
 				PRODUCT_BUNDLE_IDENTIFIER = co.fluder.FSNotes;
 				PRODUCT_NAME = FSNotes;
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -4405,7 +4405,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 482;
+				CURRENT_PROJECT_VERSION = 486;
 				DEPLOYMENT_LOCATION = NO;
 				DEVELOPMENT_TEAM = 866P6MTE92;
 				EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = YES;
@@ -4419,7 +4419,7 @@
 				INFOPLIST_FILE = "FSNotes Info (Notarized).plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 5beta5;
+				MARKETING_VERSION = 5beta6;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = co.fluder.FSNotes;
 				PRODUCT_NAME = FSNotes;
@@ -4733,7 +4733,7 @@
 				CODE_SIGN_IDENTITY = "Developer ID Application";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 482;
+				CURRENT_PROJECT_VERSION = 486;
 				DEVELOPMENT_TEAM = 866P6MTE92;
 				EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = YES;
 				ENABLE_NS_ASSERTIONS = NO;
@@ -4745,7 +4745,7 @@
 				INFOPLIST_FILE = FSNotes/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 5beta5;
+				MARKETING_VERSION = 5beta6;
 				OTHER_SWIFT_FLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = co.fluder.FSNotes;
 				PRODUCT_NAME = FSNotes;
@@ -4767,7 +4767,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 482;
+				CURRENT_PROJECT_VERSION = 486;
 				DEPLOYMENT_LOCATION = NO;
 				DEVELOPMENT_TEAM = 866P6MTE92;
 				EMBED_ASSET_PACKS_IN_PRODUCT_BUNDLE = YES;
@@ -4780,7 +4780,7 @@
 				INFOPLIST_FILE = FSNotes/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 5beta5;
+				MARKETING_VERSION = 5beta6;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = co.fluder.FSNotes;
 				PRODUCT_NAME = FSNotes;

FSNotes/Helpers/UserDefaultsManagement.swift

@@ -207,7 +207,6 @@ public class UserDefaultsManagement {
             }
 
             if let fontName = self.fontName, let font = Font(name: fontName, size: CGFloat(self.fontSize)) {
-                print(fontName)
                 return font
             }
 

FSNotes/MPreviewView.swift

@@ -453,7 +453,7 @@ class MPreviewView: WKWebView, WKUIDelegate, WKNavigationDelegate {
             codeStyle = try! String.init(contentsOfFile: hgPath)
         }
 
-        let familyName = UserDefaultsManagement.noteFont.familyName
+        var familyName = UserDefaultsManagement.noteFont.familyName
 
         #if os(iOS)
             if !UserDefaultsManagement.dynamicTypeFont {
@@ -476,7 +476,11 @@ class MPreviewView: WKWebView, WKUIDelegate, WKNavigationDelegate {
                 width = 0
             }
 
-            return "body {font: \(UserDefaultsManagement.fontSize)px '\(familyName)', '-apple-system'; margin: 0 \(width + 5)px; } code, pre {font: \(UserDefaultsManagement.codeFontSize)px '\(UserDefaultsManagement.codeFontName)', Courier, monospace, 'Liberation Mono', Menlo; line-height: 30px;} img {display: block; margin: 0 auto;} \(codeStyle) \(css)"
+        if familyName!.starts(with: ".") {
+            familyName = "Helvetica Neue";
+        }
+
+        return "body {font: \(UserDefaultsManagement.fontSize)px '\(familyName!)', '-apple-system'; margin: 0 \(width + 5)px; } code, pre {font: \(UserDefaultsManagement.codeFontSize)px '\(UserDefaultsManagement.codeFontName)', Courier, monospace, 'Liberation Mono', Menlo; line-height: 30px;} img {display: block; margin: 0 auto;} \(codeStyle) \(css)"
         #endif
     }
 }

FSNotes/MainWindowController.swift

@@ -96,8 +96,4 @@ class MainWindowController: NSWindowController, NSWindowDelegate {
             }
         }
     }
-
-    func windowDidUpdate(_ notification: Notification) {
-        ViewController.shared()?.editArea.invalidateLayout()
-    }
 }

FSNotes/View/EditTextView.swift

@@ -71,7 +71,9 @@ class EditTextView: NSTextView, NSTextFinderClient, NSSharingServicePickerDelega
 
             let tagAttributes = attributedString().attributes(at: range.location, effectiveRange: nil)
             let oneCharSize = ("a" as NSString).size(withAttributes: tagAttributes)
-            let tagBorderRect = NSRect(origin: CGPoint(x: tagRect.origin.x-oneCharSize.width*0.25, y: tagRect.origin.y+1), size: CGSize(width: tagRect.size.width+oneCharSize.width*0.33, height: oneCharSize.height))
+
+            let height = oneCharSize.height > tagRect.size.height ? tagRect.size.height : oneCharSize.height
+            let tagBorderRect = NSRect(origin: CGPoint(x: tagRect.origin.x-oneCharSize.width*0.25, y: tagRect.origin.y), size: CGSize(width: tagRect.size.width+oneCharSize.width*0.33, height: height))
 
             NSGraphicsContext.saveGraphicsState()
 
@@ -95,9 +97,10 @@ class EditTextView: NSTextView, NSTextFinderClient, NSSharingServicePickerDelega
 
             let resFont = NSFontManager.shared.convert(font, toSize: font.pointSize - 1)
             let dict = NSMutableDictionary(dictionary: tagAttributes)
+
             dict.addEntries(from: [NSAttributedString.Key.font: resFont, NSAttributedString.Key.foregroundColor: textColor])
             dict.removeObject(forKey: NSAttributedString.Key.link)
-            (tag as NSString).draw(in: tagRect, withAttributes: dict as! [NSAttributedString.Key : Any])
+            (tag as NSString).draw(in: tagRect, withAttributes: (dict as! [NSAttributedString.Key : Any]))
 
             NSGraphicsContext.restoreGraphicsState()
         }
@@ -746,7 +749,7 @@ class EditTextView: NSTextView, NSTextFinderClient, NSSharingServicePickerDelega
             invalidateLayout()
         }
 
-        undoManager?.removeAllActions()
+        undoManager?.removeAllActions(withTarget: self)
         registerHandoff(note: note)
 
         // resets timer if editor refilled 
@@ -1547,6 +1550,11 @@ class EditTextView: NSTextView, NSTextFinderClient, NSSharingServicePickerDelega
     func getSearchText() -> String {
         guard let search = ViewController.shared()?.search else { return String() }
 
+        let pb = NSPasteboard(name: NSPasteboard.Name.find)
+        if let string = pb.string(forType: NSPasteboard.PasteboardType.string) {
+            return string
+        }
+
         if let editor = search.currentEditor(), editor.selectedRange.length > 0 {
             return (search.stringValue as NSString).substring(with: NSRange(0..<editor.selectedRange.location))
         }

FSNotes/ViewController+Print.swift

@@ -10,23 +10,7 @@ import WebKit
 
 extension ViewController {
 
-    @objc func allImagesLoaded(_ message: String) {}
-
-    override class func isSelectorExcluded(fromWebScript sel: Selector) -> Bool {
-        if sel == #selector(ViewController.allImagesLoaded(_:)) {
-            return false
-        }
-        return true
-    }
-
-    override class func webScriptName(for sel: Selector) -> String? {
-        if sel == #selector(ViewController.allImagesLoaded(_:)) {
-            return "allImagesLoaded";
-        }
-        return nil
-    }
-
-    public func printMarkdownPreview(webView: WebView?) {
+    public func printMarkdownPreview() {
         guard let note = EditTextView.note else { return }
 
         let classBundle = Bundle(for: MPreviewView.self)
@@ -49,13 +33,13 @@ extension ViewController {
         try? FileManager.default.removeItem(at: printDir)
 
         copyInitialFiles(printDir: printDir)
-        copyImages(note: note, dst: printDir)
+        htmlString = assignBase64Images(note: note, html: htmlString)
 
-        webView?.frameLoadDelegate = self
-        webView?.mainFrame.loadHTMLString(htmlString, baseURL: printDir)
+        self.printWebView.frameLoadDelegate = self
+        self.printWebView.mainFrame.loadHTMLString(htmlString, baseURL: printDir)
 
         if UserDataService.instance.isDark {
-            webView?.stringByEvaluatingJavaScript(from: "switchToDarkMode();")
+            self.printWebView.stringByEvaluatingJavaScript(from: "switchToDarkMode();")
         }
     }
 
@@ -91,30 +75,32 @@ extension ViewController {
         }
     }
 
-    public func copyImages(note: Note, dst: URL) {
+    public func assignBase64Images(note: Note, html: String) -> String {
+        var html = html
+
         NotesTextProcessor.imageInlineRegex.regularExpression.enumerateMatches(in: note.content.string, options: NSRegularExpression.MatchingOptions(rawValue: 0), range: NSRange(0..<note.content.length), using:
                 {(result, flags, stop) -> Void in
 
             guard let range = result?.range(at: 3), note.content.length >= range.location else { return }
 
-            guard let imagePath = note.content.attributedSubstring(from: range).string.removingPercentEncoding else { return }
+            let path = note.content.attributedSubstring(from: range).string
+            guard let imagePath = path.removingPercentEncoding else { return }
 
             if let url = note.getImageUrl(imageName: imagePath) {
                 if url.isRemote() {
                     return
                 }
 
                 if FileManager.default.fileExists(atPath: url.path), url.isImage {
-                    let result = dst.appendingPathComponent(imagePath)
-                    let dstDir = result.deletingLastPathComponent()
-
-                    try? FileManager.default.createDirectory(at:dstDir, withIntermediateDirectories: true, attributes: nil)
-
-                    try? FileManager.default.copyItem(at: url, to: result)
+                    if let image = try? Data(contentsOf: url) {
+                        let base64 = image.base64EncodedString()
+                        html = html.replacingOccurrences(of: path, with: "data:image;base64," + base64)
+                    }
                 }
             }
         })
 
+        return html
     }
 
     func webView(_ sender: WebView!, didFinishLoadFor frame: WebFrame!) {

FSNotes/ViewController.swift

@@ -33,7 +33,7 @@ class ViewController: NSViewController,
     var previewResizeTimer = Timer()
     var rowUpdaterTimer = Timer()
     let searchQueue = OperationQueue()
-    var printWebView: WebView?
+    var printWebView = WebView()
     var tagsScannerQueue = [Note]()
 
     /* Git */
@@ -398,8 +398,7 @@ class ViewController: NSViewController,
             cell.searchButtonCell?.action = #selector(openRecentPopup(_:))
         }
 
-        NSWorkspace.shared.notificationCenter.addObserver(self, selector: #selector(onWakeNote(note:)),
-            name: NSWorkspace.didWakeNotification, object: nil)
+        DistributedNotificationCenter.default().addObserver(self, selector: #selector(onWakeNote(note:)), name: Notification.Name("com.apple.screenIsUnlocked"), object: nil)
 
         NSWorkspace.shared.notificationCenter.addObserver(
             self, selector: #selector(onSleepNote(note:)),
@@ -547,11 +546,15 @@ class ViewController: NSViewController,
         if let view = NSApplication.shared.mainWindow?.firstResponder as? NSTextView, let textField = view.superview?.superview {
 
             if textField.isKind(of: SearchTextField.self) {
-                vc.search.searchesMenu = vc.search.generateRecentMenu()
-                let general = vc.search.searchesMenu!.item(at: 0)
-                vc.search.searchesMenu!.popUp(positioning: general, at: NSPoint(x: 5, y: vc.search.frame.height + 7), in: vc.search)
+                if vc.search.searchesMenu != nil {
+                    vc.search.searchesMenu = nil
+                } else {
+                    vc.search.searchesMenu = vc.search.generateRecentMenu()
+                    let general = vc.search.searchesMenu!.item(at: 0)
+                    vc.search.searchesMenu!.popUp(positioning: general, at: NSPoint(x: 5, y: vc.search.frame.height + 7), in: vc.search)
 
-                return
+                    return
+                }
             }
         }
 
@@ -899,7 +902,7 @@ class ViewController: NSViewController,
     }
 
     @objc func onWakeNote(note: NSNotification) {
-        editArea.invalidateLayout()
+        refillEditArea()
     }
 
     func cancelTextSearch() {
@@ -1373,8 +1376,7 @@ class ViewController: NSViewController,
 
     @IBAction func printNotes(_ sender: NSMenuItem) {
         if let note = EditTextView.note, note.isMarkdown() {
-            self.printWebView = WebView()
-            printMarkdownPreview(webView: self.printWebView)
+            printMarkdownPreview()
             return
         }
 

FSNotes/ru.lproj/Main.strings

@@ -86,7 +86,7 @@
 "63m-us-3j9.title" = "Шрифт кода:";
 
 /* Class = "NSButtonCell"; title = "Hide images preview"; ObjectID = "6AI-tL-TDI"; */
-"6AI-tL-TDI.title" = "Спрять превью изображений";
+"6AI-tL-TDI.title" = "Спрятать превью изображений";
 
 /* Class = "NSMenuItem"; title = "Redo"; ObjectID = "6dh-zS-Vam"; */
 "6dh-zS-Vam.title" = "Вперёд";
@@ -248,7 +248,7 @@
 "e0G-y0-N0C.title" = "Todo";
 
 /* Class = "NSButtonCell"; title = "Hide date"; ObjectID = "e15-ps-th1"; */
-"e15-ps-th1.title" = "Спрять дату";
+"e15-ps-th1.title" = "Спрятать дату";
 
 /* Class = "NSMenuItem"; title = "Duplicate"; ObjectID = "E6I-n5-dsi"; */
 "E6I-n5-dsi.title" = "Создать копию";

Resources/DownView.bundle/css/markdown-preview.css

@@ -257,7 +257,8 @@ img {
     width: auto !important;
     width: 100%;
     max-width: 678px;
-    height: auto;
+    height: auto !important;
+    max-height: 900px;
 }
 canvas {
     border-radius: 3px;