Merge pull request #816 from ychin/auto-update-preference-pane

Expose "automatically install updates" option in preference pane

Author: ychin

src/MacVim/English.lproj/Preferences.nib/designable.nib

@@ -17,9 +17,11 @@
 
     // General pane
     IBOutlet NSPopUpButton *layoutPopUpButton;
+    IBOutlet NSButton *autoInstallUpdateButton;
 }
 
 // General pane
 - (IBAction)openInCurrentWindowSelectionChanged:(id)sender;
+- (IBAction)checkForUpdatesChanged:(id)sender;
 
 @end

src/MacVim/English.lproj/Preferences.nib/keyedobjects.nib

@@ -86,8 +86,20 @@ - (IBAction)openInCurrentWindowSelectionChanged:(id)sender
     BOOL openInCurrentWindowSelected = ([[sender selectedCell] tag] != 0);
     BOOL useWindowsLayout =
             ([[layoutPopUpButton selectedItem] tag] == MMLayoutWindows);
-    if (openInCurrentWindowSelected && useWindowsLayout)
-        [layoutPopUpButton selectItemWithTag:MMLayoutTabs];
+    if (openInCurrentWindowSelected && useWindowsLayout) {
+        [[NSUserDefaults standardUserDefaults] setInteger:MMLayoutTabs forKey:MMOpenLayoutKey];
+    }
+}
+
+- (IBAction)checkForUpdatesChanged:(id)sender
+{
+    // Sparkle's auto-install update preference trumps "check for update", so
+    // need to make sure to unset that if the user unchecks "check for update".
+    NSButton *button = (NSButton *)sender;
+    BOOL checkForUpdates = ([button state] != 0);
+    if (!checkForUpdates) {
+        [[NSUserDefaults standardUserDefaults] setBool:NO forKey:@"SUAutomaticallyUpdate"];
+    }
 }
 
 @end