From e6f6bf90186a37cddb25d106217d755d92e04f8c Mon Sep 17 00:00:00 2001 From: tisfeng Date: Fri, 26 Jan 2024 11:17:21 +0800 Subject: [PATCH] fix: remove updaterController from Main.storyboard --- Easydict/App/AppDelegate.h | 1 - Easydict/App/Base.lproj/Main.storyboard | 14 ++------------ Easydict/Feature/Configuration/EZConfiguration.h | 4 ++++ Easydict/Feature/Configuration/EZConfiguration.m | 6 +++++- Easydict/Feature/StatusItem/EZMenuItemManager.m | 7 +++++++ 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/Easydict/App/AppDelegate.h b/Easydict/App/AppDelegate.h index 4c1bb5030..2ecaff2c6 100644 --- a/Easydict/App/AppDelegate.h +++ b/Easydict/App/AppDelegate.h @@ -7,7 +7,6 @@ // #import -#import @interface AppDelegate : NSObject diff --git a/Easydict/App/Base.lproj/Main.storyboard b/Easydict/App/Base.lproj/Main.storyboard index 9df59d2cb..52009ade9 100644 --- a/Easydict/App/Base.lproj/Main.storyboard +++ b/Easydict/App/Base.lproj/Main.storyboard @@ -716,18 +716,8 @@ DQ - - - - - + - - - - - - @@ -799,7 +789,7 @@ DQ - + diff --git a/Easydict/Feature/Configuration/EZConfiguration.h b/Easydict/Feature/Configuration/EZConfiguration.h index 310f47031..b31a6e12c 100644 --- a/Easydict/Feature/Configuration/EZConfiguration.h +++ b/Easydict/Feature/Configuration/EZConfiguration.h @@ -12,6 +12,8 @@ NS_ASSUME_NONNULL_BEGIN +@class SPUStandardUpdaterController; + FOUNDATION_EXPORT NSString *const kHideMainWindowKey; FOUNDATION_EXPORT NSString *const kLaunchAtStartupKey; FOUNDATION_EXPORT NSString *const kHideMenuBarIconKey; @@ -84,6 +86,8 @@ typedef NS_ENUM(NSUInteger, EZAppearenceType) { @property (nonatomic, assign) EZAppearenceType appearance; +@property (nonatomic, strong, readonly) SPUStandardUpdaterController *updaterController; + + (instancetype)shared; + (void)destroySharedInstance; diff --git a/Easydict/Feature/Configuration/EZConfiguration.m b/Easydict/Feature/Configuration/EZConfiguration.m index 3cd01f6ad..7b8918484 100644 --- a/Easydict/Feature/Configuration/EZConfiguration.m +++ b/Easydict/Feature/Configuration/EZConfiguration.m @@ -63,7 +63,7 @@ @interface EZConfiguration () @property (nonatomic, strong) AppDelegate *appDelegate; -@property (nonatomic, strong) SPUUpdater *updater; +@property (nonatomic, strong, readwrite) SPUUpdater *updater; @end @@ -150,6 +150,10 @@ - (SPUUpdater *)updater { return GlobalContext.getUpdaterController.updater; } +- (SPUStandardUpdaterController *)updaterController { + return GlobalContext.getUpdaterController; +} + #pragma mark - setter - (void)setFirstLanguage:(EZLanguage)firstLanguage { diff --git a/Easydict/Feature/StatusItem/EZMenuItemManager.m b/Easydict/Feature/StatusItem/EZMenuItemManager.m index 8d9f3b017..861a0e136 100644 --- a/Easydict/Feature/StatusItem/EZMenuItemManager.m +++ b/Easydict/Feature/StatusItem/EZMenuItemManager.m @@ -15,6 +15,7 @@ #import "EZRightClickDetector.h" #import "EZConfiguration.h" #import "Easydict-Swift.h" +#import @interface EZMenuItemManager () @@ -181,6 +182,12 @@ - (IBAction)settingAction:(NSMenuItem *)sender { [EZPreferencesWindowController.shared show]; } +- (IBAction)checkForUpdateItem:(id)sender { + NSLog(@"checkForUpdate"); + + [EZConfiguration.shared.updaterController checkForUpdates:sender]; +} + - (IBAction)feedbackAction:(NSMenuItem *)sender { NSLog(@"反馈问题"); NSString *issueURL = [NSString stringWithFormat:@"%@/issues", EZGithubRepoEasydictURL];