Cleanup

NSStringITerm.h

@@ -102,6 +102,8 @@ int decode_utf8_char(const unsigned char * restrict datap,
 - (NSString *)hexOrDecimalConversionHelp;
+// String starts with http:// or https://. Used to tell if a custom prefs
+// location is a path or URL.
 - (BOOL)stringIsUrlLike;
 @end

PreferencePanel.m

@@ -28,25 +28,25 @@
 #import "HotkeyWindowController.h"
 #import "ITAddressBookMgr.h"
+#import "iTermController.h"
+#import "iTermFontPanel.h"
+#import "iTermKeyBindingMgr.h"
+#import "iTermRemotePreferences.h"
+#import "iTermSettingsModel.h"
+#import "iTermWarning.h"
 #import "NSDictionary+iTerm.h"
 #import "NSFileManager+iTerm.h"
 #import "NSStringITerm.h"
-#import "PTYSession.h"
 #import "PasteboardHistory.h"
 #import "PointerPrefsController.h"
 #import "ProfileModel.h"
 #import "PseudoTerminal.h"
+#import "PTYSession.h"
 #import "SessionView.h"
 #import "SmartSelectionController.h"
 #import "TriggerController.h"
 #import "TrouterPrefsController.h"
 #import "WindowArrangements.h"
-#import "iTermController.h"
-#import "iTermFontPanel.h"
-#import "iTermKeyBindingMgr.h"
-#import "iTermRemotePreferences.h"
-#import "iTermSettingsModel.h"
-#import "iTermWarning.h"
 #include <stdlib.h>
 static NSString * const kCustomColorPresetsKey = @"Custom Color Presets";
@@ -174,10 +174,10 @@ static NSString * const kRebuildColorPresetsMenuNotification = @"kRebuildColorPr
     IBOutlet NSButton *highlightTabLabels;
     BOOL defaultHighlightTabLabels;
     
-        // Hide menu bar in non-lion fullscreen
-        IBOutlet NSButton *hideMenuBarInFullscreen;
-        BOOL defaultHideMenuBarInFullscreen;
-        
+    // Hide menu bar in non-lion fullscreen
+    IBOutlet NSButton *hideMenuBarInFullscreen;
+    BOOL defaultHideMenuBarInFullscreen;
+    
     // Minimum contrast
     IBOutlet NSSlider* minimumContrast;
     
@@ -243,7 +243,6 @@ static NSString * const kRebuildColorPresetsMenuNotification = @"kRebuildColorPr
     
     // Load prefs from custom folder
     IBOutlet NSButton *loadPrefsFromCustomFolder;
-    BOOL defaultLoadPrefsFromCustomFolder;
     IBOutlet NSTextField *prefsCustomFolder;
     IBOutlet NSButton *browseCustomFolder;
     IBOutlet NSButton *pushToCustomFolder;
@@ -746,9 +745,10 @@ static NSString * const kRebuildColorPresetsMenuNotification = @"kRebuildColorPr
     [dimmingAmount setContinuous:YES];
     [minimumContrast setContinuous:YES];
-    [prefsCustomFolder setEnabled:defaultLoadPrefsFromCustomFolder];
-    [browseCustomFolder setEnabled:defaultLoadPrefsFromCustomFolder];
-    [pushToCustomFolder setEnabled:defaultLoadPrefsFromCustomFolder];
+    BOOL shouldLoadRemotePrefs = [[iTermRemotePreferences sharedInstance] shouldLoadRemotePrefs];
+    [prefsCustomFolder setEnabled:shouldLoadRemotePrefs];
+    [browseCustomFolder setEnabled:shouldLoadRemotePrefs];
+    [pushToCustomFolder setEnabled:shouldLoadRemotePrefs];
     [self _updatePrefsDirWarning];
 }
@@ -943,8 +943,9 @@ static NSString * const kRebuildColorPresetsMenuNotification = @"kRebuildColorPr
     if (sender == lionStyleFullscreen) {
         defaultLionStyleFullscreen = ([lionStyleFullscreen state] == NSOnState);
     } else if (sender == loadPrefsFromCustomFolder) {
-        defaultLoadPrefsFromCustomFolder = [loadPrefsFromCustomFolder state] == NSOnState;
-        if (defaultLoadPrefsFromCustomFolder) {
+        BOOL shouldLoadRemotePrefs = [loadPrefsFromCustomFolder state] == NSOnState;
+        [[iTermRemotePreferences sharedInstance] setShouldLoadRemotePrefs:shouldLoadRemotePrefs];
+        if (shouldLoadRemotePrefs) {
             // Just turned it on.
             if ([[prefsCustomFolder stringValue] length] == 0) {
                 // Field was initially empty so browse for a dir.
@@ -962,9 +963,9 @@ static NSString * const kRebuildColorPresetsMenuNotification = @"kRebuildColorPr
                 }
             }
         }
-        [prefsCustomFolder setEnabled:defaultLoadPrefsFromCustomFolder];
-        [browseCustomFolder setEnabled:defaultLoadPrefsFromCustomFolder];
-        [pushToCustomFolder setEnabled:defaultLoadPrefsFromCustomFolder];
+        [prefsCustomFolder setEnabled:shouldLoadRemotePrefs];
+        [browseCustomFolder setEnabled:shouldLoadRemotePrefs];
+        [pushToCustomFolder setEnabled:shouldLoadRemotePrefs];
         [self _updatePrefsDirWarning];
     } else if (sender == prefsCustomFolder) {
         // The OS will never call us directly with this sender, but we do call ourselves this way.
@@ -2169,7 +2170,7 @@ static NSString * const kRebuildColorPresetsMenuNotification = @"kRebuildColorPr
 }
 - (BOOL)remoteLocationIsValid {
-    if (!defaultLoadPrefsFromCustomFolder) {
+    if (![[iTermRemotePreferences sharedInstance] shouldLoadRemotePrefs]) {
         return YES;
     }
     return [[iTermRemotePreferences sharedInstance] remoteLocationIsValid];
@@ -2815,7 +2816,6 @@ static NSString * const kRebuildColorPresetsMenuNotification = @"kRebuildColorPr
     defaultDimmingAmount = [prefs objectForKey:@"SplitPaneDimmingAmount"] ? [[prefs objectForKey:@"SplitPaneDimmingAmount"] floatValue] : 0.4;
     defaultShowWindowBorder = [[prefs objectForKey:@"UseBorder"] boolValue];
     defaultLionStyleFullscreen = [prefs objectForKey:@"UseLionStyleFullscreen"] ? [[prefs objectForKey:@"UseLionStyleFullscreen"] boolValue] : YES;
-    defaultLoadPrefsFromCustomFolder = [prefs objectForKey:@"LoadPrefsFromCustomFolder"] ? [[prefs objectForKey:@"LoadPrefsFromCustomFolder"] boolValue] : NO;
     defaultControl = [prefs objectForKey:@"Control"] ? [[prefs objectForKey:@"Control"] intValue] : MOD_TAG_CONTROL;
     defaultLeftOption = [prefs objectForKey:@"LeftOption"] ? [[prefs objectForKey:@"LeftOption"] intValue] : MOD_TAG_LEFT_OPTION;
@@ -2942,7 +2942,6 @@ static NSString * const kRebuildColorPresetsMenuNotification = @"kRebuildColorPr
     [prefs setFloat:defaultDimmingAmount forKey:@"SplitPaneDimmingAmount"];
     [prefs setBool:defaultShowWindowBorder forKey:@"UseBorder"];
     [prefs setBool:defaultLionStyleFullscreen forKey:@"UseLionStyleFullscreen"];
-    [prefs setBool:defaultLoadPrefsFromCustomFolder forKey:@"LoadPrefsFromCustomFolder"];
     [prefs setInteger:defaultControl forKey:@"Control"];
     [prefs setInteger:defaultLeftOption forKey:@"LeftOption"];
@@ -3997,7 +3996,7 @@ static NSString * const kRebuildColorPresetsMenuNotification = @"kRebuildColorPr
     [dimmingAmount setFloatValue:defaultDimmingAmount];
     [showWindowBorder setState:defaultShowWindowBorder?NSOnState:NSOffState];
     [lionStyleFullscreen setState:defaultLionStyleFullscreen?NSOnState:NSOffState];
-    [loadPrefsFromCustomFolder setState:defaultLoadPrefsFromCustomFolder?NSOnState:NSOffState];
+    [loadPrefsFromCustomFolder setState:[[iTermRemotePreferences sharedInstance] shouldLoadRemotePrefs] ? NSOnState : NSOffState];
     [prefsCustomFolder setStringValue:[[iTermRemotePreferences sharedInstance] customFolderOrURL]];
     [self showWindow: self];

iTerm.xcodeproj/project.pbxproj

@@ -1600,6 +1600,7 @@
 				1D407A2814BABE8700BD5035 /* iTermKeyBindingMgr.h */,
 				A60014F918552BDF00CE38D8 /* iTermNSKeyBindingEmulator.h */,
 				A6B5134818E779BB00D249A5 /* iTermPasteHelper.h */,
+				FB4CECF4AC4392B21E87A07B /* iTermRemotePreferences.h */,
 				1DAED99012EDF923005E49ED /* iTermSearchField.h */,
 				A63BA39318A9CB43002BE075 /* iTermSelection.h */,
 				A697100918D94CDA007E901D /* iTermSettingsModel.h */,
@@ -1899,7 +1900,6 @@
 				1D4AE8FD14343A760092EB49 /* TrouterPrefsController.m */,
 				1DCA5ECE13EE507800B7725E /* WindowArrangements.m */,
 				FB4CEAC661436E55F3B3A668 /* iTermRemotePreferences.m */,
-				FB4CECF4AC4392B21E87A07B /* iTermRemotePreferences.h */,
 			);
 			name = Preferences;
 			sourceTree = "<group>";

iTermApplicationDelegate.m

@@ -30,25 +30,24 @@
 #import "ColorsMenuItemView.h"
 #import "HotkeyWindowController.h"
 #import "ITAddressBookMgr.h"
+#import "iTermController.h"
+#import "iTermExpose.h"
+#import "iTermFontPanel.h"
+#import "iTermRemotePreferences.h"
+#import "iTermSettingsModel.h"
+#import "iTermWarning.h"
 #import "NSStringITerm.h"
 #import "NSView+RecursiveDescription.h"
-#import "PTYSession.h"
-#import "PTYTab.h"
-#import "PTYTextView.h"
-#import "PTYWindow.h"
 #import "PreferencePanel.h"
 #import "ProfilesWindow.h"
 #import "PseudoTerminal.h"
 #import "PseudoTerminalRestorer.h"
+#import "PTYSession.h"
+#import "PTYTab.h"
+#import "PTYTextView.h"
+#import "PTYWindow.h"
 #import "ToastWindowController.h"
 #import "VT100Terminal.h"
-#import "iTermController.h"
-#import "iTermExpose.h"
-#import "iTermFontPanel.h"
-#import "iTermRemotePreferences.h"
-
-#import "iTermSettingsModel.h"
-#import "iTermWarning.h"
 #import <objc/runtime.h>
 #include <sys/stat.h>
 #include <unistd.h>

iTermRemotePreferences.h

@@ -7,18 +7,15 @@
 @interface iTermRemotePreferences : NSObject
+// These properties are backed to user defaults.
+@property(nonatomic, assign) BOOL shouldLoadRemotePrefs;
+@property(nonatomic, copy) NSString *customFolderOrURL;
+
 + (instancetype)sharedInstance;
 // Indicates if the given location (either a path to a folder or a URL) is valid.
 - (BOOL)remoteLocationIsValid;
-// Set the custom prefs folder/URL
-- (void)setCustomFolderOrURL:(NSString *)customLocation;
-- (NSString *)customFolderOrURL;
-
-// Remote location but if it's a filename then tildes are expanded.
-- (NSString *)expandedCustomFolderOrURL;
-
 // Copies the local user defaults to the remote prefs location. If it is a URL or the file is not
 // writable, a modal alert is shown and nothing happens.
 - (void)saveLocalUserDefaultsToRemotePrefs;
@@ -30,12 +27,4 @@
 // overwrite local user defaults. If something goes wrong a modal alert will be presented.
 - (void)copyRemotePrefsToLocalUserDefaults;
-// Indicates if local user defaults differ from the saved copy of the remote preferences loaded with
-// -copyRemotePrefsToLocalUserDefaults.
-- (BOOL)localPrefsDifferFromSavedRemotePrefs;
-
-// Indicates if the remote prefs have changed since -copyRemotePrefsToLocalUserDefaults was called.
-// Remote prefs must be enabled and must have loaded, or else this will return NO.
-- (BOOL)remotePrefsHaveChanged;
-
 @end

iTermRemotePreferences.m

@@ -7,7 +7,10 @@
 #import "NSFileManager+iTerm.h"
 #import "NSStringITerm.h"
+// Are we loading prefs from a custom location?
 static NSString *const kLoadPrefsFromCustomFolderKey = @"LoadPrefsFromCustomFolder";
+
+// Path/URL to location with prefs. Path may have ~ in it.
 static NSString *const kPrefsCustomFolderKey = @"PrefsCustomFolder";
 @interface iTermRemotePreferences ()
@@ -32,11 +35,14 @@ static NSString *const kPrefsCustomFolderKey = @"PrefsCustomFolder";
     [super dealloc];
 }
-- (BOOL)loadingPrefsFromCustomFolder
-{
-    NSNumber *n =
-        [[NSUserDefaults standardUserDefaults] objectForKey:kLoadPrefsFromCustomFolderKey];
-    return n ? [n boolValue] : NO;
+- (BOOL)shouldLoadRemotePrefs {
+    return [[NSUserDefaults standardUserDefaults]
+               boolForKey:kLoadPrefsFromCustomFolderKey];
+}
+
+- (void)setShouldLoadRemotePrefs:(BOOL)value {
+    return [[NSUserDefaults standardUserDefaults] setBool:value
+                                                   forKey:kLoadPrefsFromCustomFolderKey];
 }
 // Returns a URL or containing folder
@@ -47,14 +53,18 @@ static NSString *const kPrefsCustomFolderKey = @"PrefsCustomFolder";
 - (NSString *)expandedCustomFolderOrURL {
     NSString *theString = [self customFolderOrURL];
+    if ([theString stringIsUrlLike]) {
+        return theString;
+    }
     return theString ? [theString stringByExpandingTildeInPath] : @"";
 }
 - (void)setCustomFolderOrURL:(NSString *)customLocation {
-    [[NSUserDefaults standardUserDefaults] setObject:customLocation forKey:kPrefsCustomFolderKey];
+    [[NSUserDefaults standardUserDefaults] setObject:customLocation
+                                              forKey:kPrefsCustomFolderKey];
 }
-// Returns a URL or filename
+// Returns a URL or expanded filename
 - (NSString *)remotePrefsLocation
 {
     NSString *folder = [self expandedCustomFolderOrURL];
@@ -87,7 +97,7 @@ static NSString *const kPrefsCustomFolderKey = @"PrefsCustomFolder";
 - (NSDictionary *)freshCopyOfRemotePreferences
 {
-    if (![self loadingPrefsFromCustomFolder]) {
+    if (!self.shouldLoadRemotePrefs) {
         return nil;
     }
@@ -226,7 +236,7 @@ static NSString *const kPrefsCustomFolderKey = @"PrefsCustomFolder";
     }
     _haveTriedToLoadRemotePrefs = YES;
-    if (![self loadingPrefsFromCustomFolder]) {
+    if (!self.shouldLoadRemotePrefs) {
         return;
     }
     NSDictionary *remotePrefs = [self freshCopyOfRemotePreferences];
@@ -263,7 +273,7 @@ static NSString *const kPrefsCustomFolderKey = @"PrefsCustomFolder";
 - (BOOL)localPrefsDifferFromSavedRemotePrefs
 {
-    if (![self loadingPrefsFromCustomFolder]) {
+    if (!self.shouldLoadRemotePrefs) {
         return NO;
     }
     if (_savedRemotePrefs && [_savedRemotePrefs count]) {
@@ -291,7 +301,7 @@ static NSString *const kPrefsCustomFolderKey = @"PrefsCustomFolder";
 }
 - (BOOL)remotePrefsHaveChanged {
-    if (![self loadingPrefsFromCustomFolder]) {
+    if (!self.shouldLoadRemotePrefs) {
         return NO;
     }
     if (!_savedRemotePrefs) {