[macOS] fix conflict with Adobe Photoshop and Illutrator

tuyenvm · Oct 2, 2019 · 79054f5 · 79054f5
1 parent 0f04c37
commit 79054f5
Show file tree

Hide file tree

Showing 6 changed files with 171 additions and 47 deletions.
diff --git a/Sources/OpenKey/macOS/ModernKey/AboutViewController.h b/Sources/OpenKey/macOS/ModernKey/AboutViewController.h
@@ -13,6 +13,7 @@ NS_ASSUME_NONNULL_BEGIN
 @interface AboutViewController : NSViewController
 @property (weak) IBOutlet NSTextField *VersionInfo;
 @property (weak) IBOutlet NSButton *CheckNewVersionButton;
+@property (weak) IBOutlet NSButton *CheckUpdateOnStatus;
 
 @end
 

diff --git a/Sources/OpenKey/macOS/ModernKey/AboutViewController.m b/Sources/OpenKey/macOS/ModernKey/AboutViewController.m
@@ -23,6 +23,9 @@ - (void)viewDidLoad {
                                     [[NSBundle mainBundle] objectForInfoDictionaryKey: @"CFBundleShortVersionString"],
                                     [[NSBundle mainBundle] objectForInfoDictionaryKey: @"CFBundleVersion"],
                                     [OpenKeyManager getBuildDate]] ;
+
+    NSInteger dontCheckUpdate = [[NSUserDefaults standardUserDefaults] integerForKey:@"DontCheckUpdate"];
+    self.CheckUpdateOnStatus.state = dontCheckUpdate ? NSControlStateValueOff :NSControlStateValueOn;
 }
 
 - (IBAction)onHomePage:(id)sender {
@@ -37,6 +40,16 @@ - (IBAction)onLatestReleaseVersion:(id)sender {
     [[NSWorkspace sharedWorkspace] openURL: [NSURL URLWithString:@"https://github.com/tuyenvm/OpenKey/releases"]];
 }
 
+- (IBAction)onCheckUpdateOnStartup:(NSButton *)sender {
+    NSInteger val = 0;
+    if (sender.state == NSControlStateValueOn) {
+        val = 0;
+    } else {
+        val = 1;
+    }
+    [[NSUserDefaults standardUserDefaults] setInteger:val forKey:@"DontCheckUpdate"];
+}
+
 - (IBAction)onCheckNewVersion:(id)sender {
 
     self.CheckNewVersionButton.title = @"Đang kiểm tra...";

diff --git a/Sources/OpenKey/macOS/ModernKey/AppDelegate.m b/Sources/OpenKey/macOS/ModernKey/AppDelegate.m
@@ -142,7 +142,10 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
     }
     [[NSUserDefaults standardUserDefaults] setInteger:1 forKey:@"NonFirstTime"];
 
-    [OpenKeyManager checkNewVersion:nil];
+    //check update if enable
+    NSInteger dontCheckUpdate = [[NSUserDefaults standardUserDefaults] integerForKey:@"DontCheckUpdate"];
+    if (!dontCheckUpdate)
+        [OpenKeyManager checkNewVersion:nil];
 }