Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Optimize] Fix storyborad text issue #200

Merged
merged 1 commit into from
Oct 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Easydict/App/Base.lproj/Main.storyboard
Original file line number Diff line number Diff line change
Expand Up @@ -718,10 +718,10 @@ DQ
<outlet property="helpItem" destination="ICB-w8-IqK" id="MdB-xe-fCz"/>
<outlet property="inputItem" destination="AWf-Ci-7QE" id="Isp-ch-8Q6"/>
<outlet property="menu" destination="A3F-ys-zOg" id="n6f-3z-A90"/>
<outlet property="preferencesItem" destination="Fzj-Rh-cL0" id="wnW-lJ-w5g"/>
<outlet property="quitItem" destination="JZ0-yT-1tw" id="SI7-X9-kea"/>
<outlet property="screenshotOCRItem" destination="bGs-JX-JVH" id="uki-N8-izc"/>
<outlet property="selectionItem" destination="lUI-Zn-Bwr" id="WVP-FO-jlf"/>
<outlet property="settingsItem" destination="Fzj-Rh-cL0" id="bo4-Ps-zfJ"/>
<outlet property="showMiniItem" destination="PmP-cO-1HF" id="z5W-Mb-1f4"/>
<outlet property="snipItem" destination="2TG-8C-8RM" id="NNT-OJ-7eY"/>
<outlet property="versionItem" destination="PkP-25-JBw" id="beL-5f-TOn"/>
Expand Down Expand Up @@ -774,7 +774,7 @@ DQ
<menuItem isSeparatorItem="YES" id="kkp-Wh-Cmv"/>
<menuItem title="设置..." keyEquivalent="," id="Fzj-Rh-cL0">
<connections>
<action selector="preferenceAction:" target="qM9-fT-Fym" id="Emg-Mm-dS5"/>
<action selector="settingAction:" target="qM9-fT-Fym" id="Hl3-VA-VEK"/>
</connections>
</menuItem>
<menuItem title="检查更新" id="GQ2-WA-9QB">
Expand Down
6 changes: 3 additions & 3 deletions Easydict/App/mul.lproj/Main.xcstrings
Original file line number Diff line number Diff line change
Expand Up @@ -1102,18 +1102,18 @@
}
},
"Fzj-Rh-cL0.title" : {
"comment" : "Class = \"NSMenuItem\"; title = \"设置\"; ObjectID = \"Fzj-Rh-cL0\";",
"comment" : "Class = \"NSMenuItem\"; title = \"设置...\"; ObjectID = \"Fzj-Rh-cL0\";",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Settings"
"value" : "Settings..."
}
},
"zh-Hans" : {
"stringUnit" : {
"state" : "translated",
"value" : "设置"
"value" : "设置..."
}
}
}
Expand Down
9 changes: 4 additions & 5 deletions Easydict/Feature/StatusItem/EZMenuItemManager.m
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ @interface EZMenuItemManager () <NSMenuDelegate>
@property (weak) IBOutlet NSMenuItem *inputItem;
@property (weak) IBOutlet NSMenuItem *showMiniItem;
@property (weak) IBOutlet NSMenuItem *screenshotOCRItem;

@property (weak) IBOutlet NSMenuItem *preferencesItem;
@property (weak) IBOutlet NSMenuItem *settingsItem;
@property (weak) IBOutlet NSMenuItem *checkForUpdateItem;
@property (weak) IBOutlet NSMenuItem *helpItem;
@property (weak) IBOutlet NSMenuItem *quitItem;
Expand Down Expand Up @@ -93,7 +92,7 @@ - (void)setup {
self.appVersion = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"];
self.versionItem.title = self.versionTitle;

NSArray *items = @[self.versionItem, self.preferencesItem, self.checkForUpdateItem, self.helpItem, self.quitItem];
NSArray *items = @[self.versionItem, self.settingsItem, self.checkForUpdateItem, self.helpItem, self.quitItem];
[self increaseMenuItemsHeight:items lineHeightRatio:kTitleMenuItemHeightRatio];

[self updateVersionItem];
Expand Down Expand Up @@ -175,8 +174,8 @@ - (IBAction)screenshotOCRAction:(NSMenuItem *)sender {
}


- (IBAction)preferenceAction:(NSMenuItem *)sender {
NSLog(@"偏好设置");
- (IBAction)settingAction:(NSMenuItem *)sender {
NSLog(@"设置...");
if (Snip.shared.isSnapshotting) {
[Snip.shared stop];
}
Expand Down