Add settings to shortcuts

Easydict/App/Localizable.xcstrings

@@ -485,6 +485,38 @@
         }
       }
     },
+    "automatic_word_segmentation" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "English word auto-splitting"
+          }
+        },
+        "zh-Hans" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "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" : {

Easydict/Feature/Configuration/Configuration.swift

@@ -147,6 +147,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

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

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

@@ -14,9 +14,12 @@
 #import "EZBaseQueryWindow.h"
 #import "EZConfiguration.h"
 #import "Easydict-Swift.h"
+#import "EZPreferencesWindowController.h"
 
 @interface EZTitlebar ()
 
+@property (nonatomic, strong) NSStackView *stackView;
+
 @end
 
 @implementation EZTitlebar
@@ -64,7 +67,26 @@ - (void)setup {
         }
     }];
 
+    [self setupSettingButton];
+
     [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateConstraints) name:EZQuickLinkButtonUpdateNotification object:nil];
+
+}
+
+- (void)setupSettingButton {
+    EZOpenLinkButton *button = [[EZOpenLinkButton alloc] init];
+    NSImage *image = [[NSImage imageWithSystemSymbolName:@"switch.2" accessibilityDescription:nil]imageWithSymbolConfiguration:[NSImageSymbolConfiguration configurationWithScale:NSImageSymbolScaleLarge]];
+
+    button.image = image;
+    self.settingButton = button;
+    button.clickBlock = nil;
+
+    mm_weakify(self);
+    [button setMouseUpBlock:^(EZButton *_Nonnull button) {
+        mm_strongify(self);
+        [self showMenu];
+
+    }];
 }
 
 - (void)updateConstraints {
@@ -82,15 +104,25 @@ - (void)updateConstraints {
         make.top.equalTo(self).offset(EZTitlebarHeight_28 - pinButtonWidth);
     }];
 
-    [self.googleButton removeFromSuperview];
-    [self.eudicButton removeFromSuperview];
-    [self.appleDictionaryButton removeFromSuperview];
+    for (NSView *view in self.stackView.arrangedSubviews) {
+        [self.stackView removeArrangedSubview:view];
+        [view removeFromSuperview];
+    }
+    [self.stackView removeFromSuperview];
+
+    self.stackView = [[NSStackView alloc] init];
+    self.stackView.orientation = NSUserInterfaceLayoutOrientationHorizontal;
+    self.stackView.spacing = kButtonPadding_4;
+    self.stackView.alignment = NSLayoutAttributeCenterY;
+    [self addSubview:self.stackView];
 
-    NSView *lastView;
     CGFloat quickLinkButtonTopOffset = EZTitlebarHeight_28 - kButtonWidth_24;
     CGFloat quickLinkButtonRightOffset = 12;
 
-    // TODO: We should refactor it later.
+    [self.stackView mas_remakeConstraints:^(MASConstraintMaker *make) {
+        make.top.equalTo(self).offset(quickLinkButtonTopOffset);
+        make.right.equalTo(self).offset(-quickLinkButtonRightOffset);
+    }];
 
     // Google
     if (Configuration.shared.showGoogleQuickLink) {
@@ -105,15 +137,10 @@ - (void)updateConstraints {
         googleButton.contentTintColor = NSColor.clearColor;
 
         [googleButton mas_remakeConstraints:^(MASConstraintMaker *make) {
-            make.top.equalTo(self).offset(quickLinkButtonTopOffset);
             make.size.mas_equalTo(buttonSize);
-            if (lastView) {
-                make.right.equalTo(lastView.mas_left).offset(-kButtonPadding_4);
-            } else {
-                make.right.equalTo(self).offset(-quickLinkButtonRightOffset);
-            }
         }];
-        lastView = googleButton;
+
+        [self.stackView addArrangedSubview:googleButton];
     }
 
     // Apple Dictionary
@@ -129,15 +156,9 @@ - (void)updateConstraints {
         appleDictButton.contentTintColor = NSColor.clearColor;
 
         [appleDictButton mas_remakeConstraints:^(MASConstraintMaker *make) {
-            make.top.equalTo(self).offset(quickLinkButtonTopOffset);
             make.size.mas_equalTo(buttonSize);
-            if (lastView) {
-                make.right.equalTo(lastView.mas_left).offset(-kButtonPadding_4);
-            } else {
-                make.right.equalTo(self).offset(-quickLinkButtonRightOffset);
-            }
         }];
-        lastView = appleDictButton;
+        [self.stackView insertArrangedSubview:appleDictButton atIndex:0];
     }
 
     // Eudic
@@ -158,18 +179,17 @@ - (void)updateConstraints {
             eudicButton.contentTintColor = NSColor.clearColor;
 
             [eudicButton mas_remakeConstraints:^(MASConstraintMaker *make) {
-                make.top.equalTo(self).offset(quickLinkButtonTopOffset);
                 make.size.mas_equalTo(buttonSize);
-                if (lastView) {
-                    make.right.equalTo(lastView.mas_left).offset(-kButtonPadding_4);
-                } else {
-                    make.right.equalTo(self).offset(-quickLinkButtonRightOffset);
-                }
             }];
-            lastView = eudicButton;
+            [self.stackView insertArrangedSubview:eudicButton atIndex:0];
         }
     }
 
+    [self.settingButton mas_remakeConstraints:^(MASConstraintMaker *make) {
+        make.size.mas_equalTo(buttonSize);
+    }];
+    [self.stackView addArrangedSubview:self.settingButton];
+
     [super updateConstraints];
 }
 
@@ -199,6 +219,42 @@ - (void)updatePinButtonImage {
     }];
 }
 
+- (void)showMenu {
+    NSMenu * menu = [[NSMenu alloc]initWithTitle:@"Menu"];
+    NSMenuItem * item1 = [[NSMenuItem alloc]initWithTitle:NSLocalizedString(@"automatically_remove_code_comment_symbols", nil) action:@selector(clickAutomaticallyRemoveCodeCommentSymbols) keyEquivalent:@""];
+    item1.target = self;
+    if (Configuration.shared.automaticallyRemoveCodeCommentSymbols) {
+        item1.state = NSControlStateValueOn;
+    }
+
+    NSMenuItem * item2 = [[NSMenuItem alloc]initWithTitle:NSLocalizedString(@"automatic_word_segmentation", nil) action:@selector(clickAutomaticWordSegmentation) keyEquivalent:@""];
+    item2.target = self;
+    if (Configuration.shared.automaticWordSegmentation) {
+        item2.state = NSControlStateValueOn;
+    }
+
+    NSMenuItem * item3 = [[NSMenuItem alloc]initWithTitle:NSLocalizedString(@"go_to_settings", nil) action:@selector(goToSettings) keyEquivalent:@""];
+    item3.target = self;
+
+    [menu addItem:item1];
+    [menu addItem:item2];
+    [menu addItem:[NSMenuItem separatorItem]];
+    [menu addItem:item3];
+
+    [menu popUpMenuPositioningItem:nil atLocation:[NSEvent mouseLocation] inView:nil];
+}
+
+- (void)clickAutomaticallyRemoveCodeCommentSymbols {
+    Configuration.shared.automaticallyRemoveCodeCommentSymbols = !Configuration.shared.automaticallyRemoveCodeCommentSymbols;
+}
+
+- (void)clickAutomaticWordSegmentation {
+    Configuration.shared.automaticWordSegmentation = !Configuration.shared.automaticWordSegmentation;
+}
+
+- (void)goToSettings {
+    [EZPreferencesWindowController.shared show];
+}
 
 #pragma mark - Setter && Getter
 

Easydict/NewApp/Configuration/Configuration+Defaults.swift

@@ -62,6 +62,9 @@ extension Defaults.Keys {
     static let appearanceType = Key<AppearenceType>("EZConfiguration_kApperanceKey", default: .followSystem)
     static let fontSizeOptionIndex = Key<UInt>("EZConfiguration_kTranslationControllerFontKey", default: 0)
     static let selectedMenuBarIcon = Key<MenuBarIconType>("EZConfiguration_kSelectedMenuBarIconKey", default: .square)
+
+    static let automaticWordSegmentation = Key<Bool>("EZConfiguration_kAutomaticWordSegmentation", default: true)
+    static let automaticallyRemoveCodeCommentSymbols = Key<Bool>("EZConfiguration_kAutomaticallyRemoveCodeCommentSymbols", default: true)
 }
 
 extension Defaults.Keys {