fix: remove updaterController from Main.storyboard

tisfeng · Jan 26, 2024 · e6f6bf9 · e6f6bf9
1 parent 99009f9
commit e6f6bf9
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 14 deletions.
diff --git a/Easydict/App/AppDelegate.h b/Easydict/App/AppDelegate.h
@@ -7,7 +7,6 @@
 //
 
 #import <Cocoa/Cocoa.h>
-#import <Sparkle/SPUStandardUpdaterController.h>
 
 @interface AppDelegate : NSObject <NSApplicationDelegate>
 

diff --git a/Easydict/App/Base.lproj/Main.storyboard b/Easydict/App/Base.lproj/Main.storyboard
@@ -716,18 +716,8 @@ DQ
                         <outlet property="delegate" destination="Voe-Tx-rLC" id="PrD-fu-P6m"/>
                     </connections>
                 </application>
-                <customObject id="Voe-Tx-rLC" customClass="AppDelegate">
-                    <connections>
-                        <outlet property="updaterController" destination="dTQ-Lg-1D6" id="ulf-mx-z8R"/>
-                    </connections>
-                </customObject>
+                <customObject id="Voe-Tx-rLC" customClass="AppDelegate"/>
                 <customObject id="YLy-65-1bz" customClass="NSFontManager"/>
-                <customObject id="dTQ-Lg-1D6" customClass="SPUStandardUpdaterController">
-                    <connections>
-                        <outlet property="updaterDelegate" destination="Voe-Tx-rLC" id="3Ya-Y2-qiK"/>
-                        <outlet property="userDriverDelegate" destination="Voe-Tx-rLC" id="pxF-ql-RTh"/>
-                    </connections>
-                </customObject>
                 <customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
                 <customObject id="qM9-fT-Fym" customClass="EZMenuItemManager">
                     <connections>
@@ -799,7 +789,7 @@ DQ
                         <menuItem title="检查更新" id="GQ2-WA-9QB">
                             <modifierMask key="keyEquivalentModifierMask"/>
                             <connections>
-                                <action selector="checkForUpdates:" target="dTQ-Lg-1D6" id="ydL-Jy-6z2"/>
+                                <action selector="checkForUpdateItem:" target="qM9-fT-Fym" id="m6i-mV-Hiy"/>
                             </connections>
                         </menuItem>
                         <menuItem title="帮助" id="ICB-w8-IqK">

diff --git 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
@@ -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
@@ -15,6 +15,7 @@
 #import "EZRightClickDetector.h"
 #import "EZConfiguration.h"
 #import "Easydict-Swift.h"
+#import <Sparkle/SPUStandardUpdaterController.h>
 
 @interface EZMenuItemManager () <NSMenuDelegate>
 
@@ -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];
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,6 @@ @@
     //
     #import <Cocoa/Cocoa.h>
-    #import <Sparkle/SPUStandardUpdaterController.h>
     @interface AppDelegate : NSObject <NSApplicationDelegate>
@@ Expand Down @@