Add settings to shortcuts

Easydict/App/EZConst.h

@@ -54,5 +54,6 @@ static NSInteger const EZMaxFiveWordSynonymCount = 5;
 
 static CGFloat const EZGetClipboardTextDelayTime = 0.1;
 
+static NSString *const EZOpenSettingsNotification = @"EZOpenSettingsNotification";
 
 #endif /* EZConst_h */

Easydict/App/Localizable.xcstrings

@@ -485,6 +485,38 @@
         }
       }
     },
+    "automatic_word_segmentation" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Word auto-splitting: key_value —> key value"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "单词自动分词 key_value —> key value"
+          }
+        }
+      }
+    },
+    "automatically_remove_code_comment_symbols" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Automatically remove code comment symbols「/*#」"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "自动去除代码注释符号「/*#」"
+          }
+        }
+      }
+    },
     "avoid_conflict_with_PopClip_display" : {
       "localizations" : {
         "en" : {
@@ -1366,6 +1398,22 @@
         }
       }
     },
+    "go_to_settings" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Go to Settings"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "前往设置"
+          }
+        }
+      }
+    },
     "google_translate" : {
       "localizations" : {
         "en" : {
@@ -3929,6 +3977,22 @@
         }
       }
     },
+    "show_setting_quick_link" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Show Setting quick link icon"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "显示快捷设置图标"
+          }
+        }
+      }
+    },
     "silent_screenshot_ocr" : {
       "localizations" : {
         "en" : {

Easydict/Feature/Configuration/Configuration.swift

@@ -114,6 +114,9 @@ let kHideMenuBarIconKey = "EZConfiguration_kHideMenuBarIconKey"
     @DefaultsWrapper(.showAppleDictionaryQuickLink)
     var showAppleDictionaryQuickLink: Bool
 
+    @DefaultsWrapper(.showSettingQuickLink)
+    var showSettingQuickLink: Bool
+
     @DefaultsWrapper(.hideMenuBarIcon)
     var hideMenuBarIcon: Bool
 
@@ -147,6 +150,12 @@ let kHideMenuBarIconKey = "EZConfiguration_kHideMenuBarIconKey"
     @DefaultsWrapper(.selectQueryTextWhenWindowActivate)
     var selectQueryTextWhenWindowActivate: Bool
 
+    @DefaultsWrapper(.automaticWordSegmentation)
+    var automaticWordSegmentation: Bool
+
+    @DefaultsWrapper(.automaticallyRemoveCodeCommentSymbols)
+    var automaticallyRemoveCodeCommentSymbols: Bool
+
     var disabledAutoSelect: Bool = false
 
     var isRecordingSelectTextShortcutKey: Bool = false
@@ -331,6 +340,14 @@ let kHideMenuBarIconKey = "EZConfiguration_kHideMenuBarIconKey"
                 }
         )
 
+        cancellables.append(
+            Defaults.publisher(.showSettingQuickLink, options: [])
+                .removeDuplicates()
+                .sink { [weak self] _ in
+                    self?.didSetShowSettingQuickLink()
+                }
+        )
+
         cancellables.append(
             Defaults.publisher(.hideMenuBarIcon)
                 .removeDuplicates()
@@ -541,6 +558,12 @@ private extension Configuration {
         logSettings(["show_apple_dictionary_link": showAppleDictionaryQuickLink])
     }
 
+    func didSetShowSettingQuickLink() {
+        postUpdateQuickLinkButtonNotification()
+
+        logSettings(["showSettingQuickLink": showSettingQuickLink])
+    }
+
     func didSetHideMenuBarIcon() {
         if !Configuration.shared.enableBetaNewApp {
             hideMenuBarIcon(hidden: hideMenuBarIcon)

Easydict/Feature/PerferenceWindow/EZSettingViewController.m

@@ -93,6 +93,7 @@ @interface EZSettingViewController () <NSComboBoxDelegate>
 @property (nonatomic, strong) NSButton *showGoogleQuickLinkButton;
 @property (nonatomic, strong) NSButton *showEudicQuickLinkButton;
 @property (nonatomic, strong) NSButton *showAppleDictionaryQuickLinkButton;
+@property (nonatomic, strong) NSButton *showSettingQuickLinkButton;
 
 @property (nonatomic, strong) NSView *separatorView2;
 
@@ -468,6 +469,9 @@ - (void)setupUI {
     self.showAppleDictionaryQuickLinkButton = [NSButton checkboxWithTitle:showAppleDictionaryQuickLink target:self action:@selector(showAppleDictionaryQuickLinkButtonClicked:)];
     [self.contentView addSubview:self.showAppleDictionaryQuickLinkButton];
 
+    NSString *showSettingQuickLink = NSLocalizedString(@"show_setting_quick_link", nil);
+    self.showSettingQuickLinkButton = [NSButton checkboxWithTitle:showSettingQuickLink target:self action:@selector(showSettingQuickLinkButtonClicked:)];
+    [self.contentView addSubview:self.showSettingQuickLinkButton];
 
     NSView *separatorView2 = [[NSView alloc] init];
     [self.contentView addSubview:separatorView2];
@@ -570,6 +574,7 @@ - (void)setupUI {
     self.showGoogleQuickLinkButton.mm_isOn = self.config.showGoogleQuickLink;
     self.showEudicQuickLinkButton.mm_isOn = self.config.showEudicQuickLink;
     self.showAppleDictionaryQuickLinkButton.mm_isOn = self.config.showAppleDictionaryQuickLink;
+    self.showSettingQuickLinkButton.mm_isOn = self.config.showSettingQuickLink;
     self.hideMenuBarIconButton.mm_isOn = self.config.hideMenuBarIcon;
     if (@available(macOS 13.0, *)) {
         self.enableBetaNewAppButton.mm_isOn = self.config.enableBetaNewApp;
@@ -829,11 +834,16 @@ - (void)updateViewConstraints {
         make.left.equalTo(self.showEudicQuickLinkButton);
         make.top.equalTo(self.showEudicQuickLinkButton.mas_bottom).offset(self.verticalPadding);
     }];
-
+
+    [self.showSettingQuickLinkButton mas_remakeConstraints:^(MASConstraintMaker *make) {
+        make.left.equalTo(self.showAppleDictionaryQuickLinkButton);
+        make.top.equalTo(self.showAppleDictionaryQuickLinkButton.mas_bottom).offset(self.verticalPadding);
+    }];
+
     [self.fontSizeLabel mas_remakeConstraints:^(MASConstraintMaker *make) {
         make.right.equalTo(self.autoGetSelectedTextLabel);
-        make.top.equalTo(self.showAppleDictionaryQuickLinkButton.mas_bottom).offset(20);
-        make.top.equalTo(self.showAppleDictionaryQuickLinkButton.mas_bottom).offset(20);
+        make.top.equalTo(self.showSettingQuickLinkButton.mas_bottom).offset(20);
+        make.top.equalTo(self.showSettingQuickLinkButton.mas_bottom).offset(20);
     }];
 
     CGFloat changeFontSizeViewWidth = 220;
@@ -1019,6 +1029,9 @@ - (void)showAppleDictionaryQuickLinkButtonClicked:(NSButton *)sender {
     self.config.showAppleDictionaryQuickLink = sender.mm_isOn;
 }
 
+- (void)showSettingQuickLinkButtonClicked:(NSButton *)sender {
+    self.config.showSettingQuickLink = sender.mm_isOn;
+}
 
 - (void)hideMenuBarIconButtonClicked:(NSButton *)sender {
     // if user not set select shortcut and input shortcut not allow hidden menu bar icon

Easydict/Feature/Utility/Swift/Notification/Notification+Name.swift

@@ -10,8 +10,12 @@ import Foundation
 
 extension Notification.Name {
     static let serviceHasUpdated = Notification.Name(EZServiceHasUpdatedNotification)
+
+    static let openSettings = Notification.Name(EZOpenSettingsNotification)
 }
 
 @objc public extension NSNotification {
     static let serviceHasUpdated = Notification.Name.serviceHasUpdated
+
+    static let openSettings = Notification.Name.openSettings
 }

Easydict/Feature/ViewController/Model/EZQueryModel.m

@@ -186,20 +186,22 @@ - (NSString *)handleInputText:(NSString *)inputText {
 
      _anchoredDraggable_State --> anchored Draggable State
      */
-    if ([queryText isSingleWord]) {
-        // If text is an English word, like LaTeX, we don't split it.
-        BOOL isEnglishWord = [EZAppleDictionary.shared queryDictionaryForText:queryText language:EZLanguageEnglish];
-        if (!isEnglishWord) {
-            // If text has quotes, like 'UIKit', we don't split it.
-            if ([queryText hasQuotesPair]) {
-                queryText = [queryText tryToRemoveQuotes];
-            } else {
-                queryText = [queryText splitCodeText];
+    if (Configuration.shared.automaticWordSegmentation) {
+        if ([queryText isSingleWord]) {
+            // If text is an English word, like LaTeX, we don't split it.
+            BOOL isEnglishWord = [EZAppleDictionary.shared queryDictionaryForText:queryText language:EZLanguageEnglish];
+            if (!isEnglishWord) {
+                // If text has quotes, like 'UIKit', we don't split it.
+                if ([queryText hasQuotesPair]) {
+                    queryText = [queryText tryToRemoveQuotes];
+                } else {
+                    queryText = [queryText splitCodeText];
+                }
             }
         }
     }
 
-    if (Configuration.shared.beta) {
+    if (Configuration.shared.automaticallyRemoveCodeCommentSymbols) {
         // Remove prefix [//,#,*,] and join texts.
         queryText = [queryText removeCommentBlockSymbols];
     }

Easydict/Feature/ViewController/View/Titlebar/EZTitlebar.h

@@ -24,6 +24,8 @@ NS_ASSUME_NONNULL_BEGIN
 
 @property (nonatomic, strong) EZOpenLinkButton *favoriteButton;
 
+@property (nonatomic, strong) EZOpenLinkButton *settingButton;
+
 @end
 
 NS_ASSUME_NONNULL_END