Rename iTermSettingsModel to iTermAdvancedSettingsModel

Autocomplete.m

@@ -11,7 +11,7 @@
 #import "iTermApplicationDelegate.h"
 #import "iTermController.h"
 #import "iTermTextExtractor.h"
-#import "iTermSettingsModel.h"
+#import "iTermAdvancedSettingsModel.h"
 #define AcLog DLog
@@ -67,7 +67,7 @@ const int kMaxResultContextWords = 4;
 + (int)maxOptions
 {
-    return [iTermSettingsModel autocompleteMaxOptions];
+    return [iTermAdvancedSettingsModel autocompleteMaxOptions];
 }
 - (id)init

HotkeyWindowController.m

@@ -7,7 +7,7 @@
 #import "iTermController.h"
 #import "iTermKeyBindingMgr.h"
 #import "iTermPreferences.h"
-#import "iTermSettingsModel.h"
+#import "iTermAdvancedSettingsModel.h"
 #import "iTermShortcutInputView.h"
 #import "NSTextField+iTerm.h"
 #import "PseudoTerminal.h"
@@ -56,7 +56,7 @@ static void RollInHotkeyTerm(PseudoTerminal* term)
     [NSApp activateIgnoringOtherApps:YES];
     [[term window] makeKeyAndOrderFront:nil];
-    [[NSAnimationContext currentContext] setDuration:[iTermSettingsModel hotkeyTermAnimationDuration]];
+    [[NSAnimationContext currentContext] setDuration:[iTermAdvancedSettingsModel hotkeyTermAnimationDuration]];
     [[[term window] animator] setAlphaValue:1];
     [[HotkeyWindowController sharedInstance] performSelector:@selector(rollInFinished)
                                                   withObject:nil
@@ -151,7 +151,7 @@ static void RollOutHotkeyTerm(PseudoTerminal* term, BOOL itermWasActiveWhenHotke
         return;
     }
     BOOL temp = [term isHotKeyWindow];
-    [[NSAnimationContext currentContext] setDuration:[iTermSettingsModel hotkeyTermAnimationDuration]];
+    [[NSAnimationContext currentContext] setDuration:[iTermAdvancedSettingsModel hotkeyTermAnimationDuration]];
     [[[term window] animator] setAlphaValue:0];
     [[HotkeyWindowController sharedInstance] performSelector:@selector(restoreNormalcy:)

PTYSession.h

@@ -34,7 +34,7 @@ extern NSString *const kPTYSessionTmuxFontDidChange;
 @class iTermController;
 @class iTermGrowlDelegate;
-// The time period for just blinking is in -[iTermSettingsModel timeBetweenBlinks].
+// The time period for just blinking is in -[iTermAdvancedSettingsModel timeBetweenBlinks].
 // Timer period when receiving lots of data.
 static const float kSlowTimerIntervalSec = 1.0 / 15.0;
 // Timer period for interactive use.

PTYSession.m

@@ -16,7 +16,7 @@
 #import "iTermPasteHelper.h"
 #import "iTermPreferences.h"
 #import "iTermSelection.h"
-#import "iTermSettingsModel.h"
+#import "iTermAdvancedSettingsModel.h"
 #import "iTermTextExtractor.h"
 #import "iTermWarning.h"
 #import "MovePaneController.h"
@@ -783,7 +783,7 @@ typedef enum {
 }
 - (BOOL)shouldSetCtype {
-    return ![iTermSettingsModel doNotSetCtype];
+    return ![iTermAdvancedSettingsModel doNotSetCtype];
 }
 - (void)startProgram:(NSString *)program
@@ -1006,7 +1006,7 @@ typedef enum {
     static BOOL checkedDebug;
     static BOOL debugKeyDown;
     if (!checkedDebug) {
-        debugKeyDown = [iTermSettingsModel debugKeyDown];
+        debugKeyDown = [iTermAdvancedSettingsModel debugKeyDown];
         checkedDebug = YES;
     }
     if (debugKeyDown || gDebugLogging) {
@@ -2267,7 +2267,7 @@ typedef enum {
     }
     if (set) {
-        NSTimeInterval period = MIN(60, [iTermSettingsModel antiIdleTimerPeriod]);
+        NSTimeInterval period = MIN(60, [iTermAdvancedSettingsModel antiIdleTimerPeriod]);
         
         _antiIdleTimer = [[NSTimer scheduledTimerWithTimeInterval:period
                                                            target:self
@@ -2512,7 +2512,7 @@ static long long timeInTenthsOfSeconds(struct timeval t)
     if (anotherUpdateNeeded) {
         if ([[[self tab] parentWindow] currentTab] == [self tab]) {
-            [self scheduleUpdateIn:[iTermSettingsModel timeBetweenBlinks]];
+            [self scheduleUpdateIn:[iTermAdvancedSettingsModel timeBetweenBlinks]];
         } else {
             [self scheduleUpdateIn:kBackgroundSessionIntervalSec];
         }
@@ -2530,7 +2530,7 @@ static long long timeInTenthsOfSeconds(struct timeval t)
 - (void)refreshAndStartTimerIfNeeded
 {
     if ([_textview refresh]) {
-        [self scheduleUpdateIn:[iTermSettingsModel timeBetweenBlinks]];
+        [self scheduleUpdateIn:[iTermAdvancedSettingsModel timeBetweenBlinks]];
     }
 }
@@ -3447,7 +3447,7 @@ static long long timeInTenthsOfSeconds(struct timeval t)
 // pass the keystroke as input.
 - (void)keyDown:(NSEvent *)event
 {
-  BOOL debugKeyDown = [iTermSettingsModel debugKeyDown];
+  BOOL debugKeyDown = [iTermAdvancedSettingsModel debugKeyDown];
   unsigned char *send_str = NULL;
   unsigned char *dataPtr = NULL;
   int dataLength = 0;
@@ -4151,7 +4151,7 @@ static long long timeInTenthsOfSeconds(struct timeval t)
 - (void)textViewWillNeedUpdateForBlink
 {
-    [self scheduleUpdateIn:[iTermSettingsModel timeBetweenBlinks]];
+    [self scheduleUpdateIn:[iTermAdvancedSettingsModel timeBetweenBlinks]];
 }
 - (void)textViewSplitVertically:(BOOL)vertically withProfileGuid:(NSString *)guid
@@ -4422,7 +4422,7 @@ static long long timeInTenthsOfSeconds(struct timeval t)
                     break;
                 case MOUSE_REPORTING_NONE:
-                    if ([iTermSettingsModel alternateMouseScroll] &&
+                    if ([iTermAdvancedSettingsModel alternateMouseScroll] &&
                         [_screen showingAlternateScreen]) {
                         NSData *arrowKeyData = nil;
                         if (deltaY > 0) {

PTYTextView.m

@@ -43,7 +43,7 @@
 #import "iTermNSKeyBindingEmulator.h"
 #import "iTermPreferences.h"
 #import "iTermSelection.h"
-#import "iTermSettingsModel.h"
+#import "iTermAdvancedSettingsModel.h"
 #import "iTermTextExtractor.h"
 #import "iTermURLSchemeController.h"
 #include <math.h>
@@ -465,7 +465,7 @@ static NSImage* alertImage;
                                                                    selector:@selector(threeFingerTap:)];
             }
         }
-        if ([iTermSettingsModel logDrawingPerformance]) {
+        if ([iTermAdvancedSettingsModel logDrawingPerformance]) {
             NSLog(@"** Drawing performance timing enabled **");
             drawRectDuration_ = [[MovingAverage alloc] init];
             drawRectInterval_ = [[MovingAverage alloc] init];
@@ -1818,7 +1818,7 @@ NSMutableArray* screens=0;
         NSImage* image = nil;
         switch (flashImage_) {
             case FlashBell:
-                if ([iTermSettingsModel traditionalVisualBell]) {
+                if ([iTermAdvancedSettingsModel traditionalVisualBell]) {
                     image = [[[NSImage alloc] initWithSize: frame.size] autorelease];
                     [image lockFocus];
                     NSColor *foregroundColor = [_colorMap colorForKey:kColorMapForeground];
@@ -2319,7 +2319,7 @@ NSMutableArray* screens=0;
         isFirstInteraction = NO;
     }
-    BOOL debugKeyDown = [iTermSettingsModel debugKeyDown];
+    BOOL debugKeyDown = [iTermAdvancedSettingsModel debugKeyDown];
     if (debugKeyDown) {
         NSLog(@"PTYTextView keyDown BEGIN %@", event);
@@ -2667,7 +2667,7 @@ NSMutableArray* screens=0;
         } else {
             URLAction *action = [self urlActionForClickAtX:x
                                                          y:y
-                                    respectingHardNewlines:![iTermSettingsModel ignoreHardNewlinesInURLs]];
+                                    respectingHardNewlines:![iTermAdvancedSettingsModel ignoreHardNewlinesInURLs]];
             if (action) {
                 _underlineRange = action.range;
@@ -3542,7 +3542,7 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
 - (void)placeCursorOnCurrentLineWithEvent:(NSEvent *)event
 {
-    BOOL debugKeyDown = [iTermSettingsModel debugKeyDown];
+    BOOL debugKeyDown = [iTermAdvancedSettingsModel debugKeyDown];
     if (debugKeyDown) {
         NSLog(@"PTYTextView placeCursorOnCurrentLineWithEvent BEGIN %@", event);
@@ -3683,7 +3683,7 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
         return nil;
     }
     BOOL copyLastNewline = [iTermPreferences boolForKey:kPreferenceKeyCopyLastNewline];
-    BOOL trimWhitespace = [iTermSettingsModel trimWhitespaceOnCopy];
+    BOOL trimWhitespace = [iTermAdvancedSettingsModel trimWhitespaceOnCopy];
     NSMutableString *theSelectedText = [[NSMutableString alloc] init];
     [_selection enumerateSelectedRanges:^(VT100GridWindowedRange range, BOOL *stop, BOOL eol) {
         int cap = INT_MAX;
@@ -3886,7 +3886,7 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
 - (void)copySelectionAccordingToUserPreferences
 {
-    if ([iTermSettingsModel copyWithStylesByDefault]) {
+    if ([iTermAdvancedSettingsModel copyWithStylesByDefault]) {
         [self copyWithStyles:self];
     } else {
         [self copy:self];
@@ -4550,7 +4550,7 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
 - (void)searchInBrowser:(id)sender
 {
     NSString* url =
-        [NSString stringWithFormat:[iTermSettingsModel searchCommand],
+        [NSString stringWithFormat:[iTermAdvancedSettingsModel searchCommand],
                                    [[self selectedText] stringWithPercentEscape]];
     [self _findUrlInString:url
           andOpenInBackground:NO];
@@ -4868,7 +4868,7 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
     }
     DLog(@"PTYTextView insertText:%@", aString);
     if ([self hasMarkedText]) {
-        BOOL debugKeyDown = [iTermSettingsModel debugKeyDown];
+        BOOL debugKeyDown = [iTermAdvancedSettingsModel debugKeyDown];
         if (debugKeyDown) {
             NSLog(@"insertText: clear marked text");
         }
@@ -4911,7 +4911,7 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
 // TODO: Respect replacementRange
 - (void)setMarkedText:(id)aString selectedRange:(NSRange)selRange replacementRange:(NSRange)replacementRange
 {
-    BOOL debugKeyDown = [iTermSettingsModel debugKeyDown];
+    BOOL debugKeyDown = [iTermAdvancedSettingsModel debugKeyDown];
     if (debugKeyDown) {
         NSLog(@"set marked text to %@; range %@", aString, [NSValue valueWithRange:selRange]);
     }
@@ -4956,7 +4956,7 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
 - (void)unmarkText
 {
-    BOOL debugKeyDown = [iTermSettingsModel debugKeyDown];
+    BOOL debugKeyDown = [iTermAdvancedSettingsModel debugKeyDown];
     if (debugKeyDown) {
         NSLog(@"clear marked text");
     }
@@ -5480,7 +5480,7 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
                                         repeats:NO];
     }
     // Turn the image to opaque and ask to redraw the screen.
-    if ([iTermSettingsModel traditionalVisualBell]) {
+    if ([iTermAdvancedSettingsModel traditionalVisualBell]) {
         flashing_ = 0.33;
     } else {
         flashing_ = 1;
@@ -7251,7 +7251,7 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
                 if (lineBelow) {
                     [constraints addObject:@([self _brightnessOfCharBackground:lineBelow[x1]])];
                 }
-                if ([self _minimumDistanceOf:bgBrightness fromAnyValueIn:constraints] < [iTermSettingsModel smartCursorColorBgThreshold]) {
+                if ([self _minimumDistanceOf:bgBrightness fromAnyValueIn:constraints] < [iTermAdvancedSettingsModel smartCursorColorBgThreshold]) {
                     CGFloat b = [self _farthestValueFromAnyValueIn:constraints];
                     bgColor = [NSColor colorWithCalibratedRed:b green:b blue:b alpha:1];
                 }
@@ -7327,7 +7327,7 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
                                                                  isBackground:NO] colorUsingColorSpaceName:NSCalibratedRGBColorSpace];
                             CGFloat fgBrightness = [proposedForeground perceivedBrightness];
                             CGFloat bgBrightness = [bgColor perceivedBrightness];
-                            if (!frameOnly && fabs(fgBrightness - bgBrightness) < [iTermSettingsModel smartCursorColorFgThreshold]) {
+                            if (!frameOnly && fabs(fgBrightness - bgBrightness) < [iTermAdvancedSettingsModel smartCursorColorFgThreshold]) {
                                 // foreground and background are very similar. Just use black and
                                 // white.
                                 if (bgBrightness < 0.5) {
@@ -7554,7 +7554,7 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
 {
     static NSMutableCharacterSet* urlChars;
     if (!urlChars) {
-        NSString *chars = [iTermSettingsModel URLCharacterSet];
+        NSString *chars = [iTermAdvancedSettingsModel URLCharacterSet];
         urlChars = [[NSMutableCharacterSet characterSetWithCharactersInString:chars] retain];
         [urlChars formUnionWithCharacterSet:[NSCharacterSet alphanumericCharacterSet]];
         [urlChars retain];
@@ -7733,7 +7733,7 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
     NSDictionary *rule = [self smartSelectAtX:x
                                             y:y
                                            to:&smartRange
-                             ignoringNewlines:[iTermSettingsModel ignoreHardNewlinesInURLs]
+                             ignoringNewlines:[iTermAdvancedSettingsModel ignoreHardNewlinesInURLs]
                                actionRequired:YES
                               respectDividers:YES];
     NSArray *actions = [SmartSelectionController actionsInRule:rule];
@@ -7830,7 +7830,7 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
     // that it doesn't work well. Hard EOLs mid-url are very common. Let's try always ignoring them.
     return [self urlActionForClickAtX:x
                                     y:y
-               respectingHardNewlines:![iTermSettingsModel ignoreHardNewlinesInURLs]];
+               respectingHardNewlines:![iTermAdvancedSettingsModel ignoreHardNewlinesInURLs]];
 }
 // Returns the drag operation to use. It is determined from the type of thing
@@ -8262,7 +8262,7 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
     gettimeofday(&now, NULL);
     double timeDelta = now.tv_sec - lastBlink.tv_sec;
     timeDelta += (now.tv_usec - lastBlink.tv_usec) / 1000000.0;
-    if (timeDelta >= [iTermSettingsModel timeBetweenBlinks]) {
+    if (timeDelta >= [iTermAdvancedSettingsModel timeBetweenBlinks]) {
         blinkShow = !blinkShow;
         lastBlink = now;
         redrawBlink = YES;

PTYWindow.m

@@ -29,7 +29,7 @@
 #import "iTermController.h"
 #import "iTermApplicationDelegate.h"
 #import "iTermPreferences.h"
-#import "iTermSettingsModel.h"
+#import "iTermAdvancedSettingsModel.h"
 #ifdef PSEUDOTERMINAL_VERBOSE_LOGGING
 #define PtyLog NSLog
@@ -298,7 +298,7 @@ end:
 }
 - (void)setToolbar:(NSToolbar *)toolbar {
-    if ([iTermSettingsModel disableToolbar]) {
+    if ([iTermAdvancedSettingsModel disableToolbar]) {
         return;
     }
     [super setToolbar:toolbar];

PasteContext.m

@@ -7,7 +7,7 @@
 //
 #import "PasteContext.h"
-#import "iTermSettingsModel.h"
+#import "iTermAdvancedSettingsModel.h"
 @implementation PasteContext

PasteboardHistory.m

@@ -32,7 +32,7 @@
 #import "PopupModel.h"
 #import "iTermController.h"
 #import "iTermPreferences.h"
-#import "iTermSettingsModel.h"
+#import "iTermAdvancedSettingsModel.h"
 #define PBHKEY_ENTRIES @"Entries"
 #define PBHKEY_VALUE @"Value"
@@ -60,7 +60,7 @@
 + (int)maxEntries
 {
-    return [iTermSettingsModel pasteHistoryMaxOptions];
+    return [iTermAdvancedSettingsModel pasteHistoryMaxOptions];
 }
 + (PasteboardHistory*)sharedInstance

PreferencePanel.m

@@ -75,7 +75,7 @@
 #import "iTermKeyMappingViewController.h"
 #import "iTermPreferences.h"
 #import "iTermRemotePreferences.h"
-#import "iTermSettingsModel.h"
+#import "iTermAdvancedSettingsModel.h"
 #import "iTermURLSchemeController.h"
 #import "iTermWarning.h"
 #import "KeysPreferencesViewController.h"

PseudoTerminal.m

@@ -50,7 +50,7 @@
 #import "iTermGrowlDelegate.h"
 #import "iTermInstantReplayWindowController.h"
 #import "iTermPreferences.h"
-#import "iTermSettingsModel.h"
+#import "iTermAdvancedSettingsModel.h"
 #import "iTermURLSchemeController.h"
 #include <unistd.h>
@@ -867,7 +867,7 @@ NSString *kSessionsKVCKey = @"sessions";
 - (void)magnifyWithEvent:(NSEvent *)event
 {
-    if ([iTermSettingsModel pinchToChangeFontSizeDisabled]) {
+    if ([iTermAdvancedSettingsModel pinchToChangeFontSizeDisabled]) {
         return;
     }
     const double kMagTimeout = 0.2;
@@ -1640,7 +1640,7 @@ NSString *kSessionsKVCKey = @"sessions";
 - (IBAction)findUrls:(id)sender {
     FindViewController *findViewController = [[[self currentSession] view] findViewController];
-    NSString *regex = [iTermSettingsModel findUrlsRegex];
+    NSString *regex = [iTermAdvancedSettingsModel findUrlsRegex];
     [findViewController closeViewAndDoTemporarySearchForString:regex
                                                   ignoringCase:NO
                                                          regex:YES];
@@ -2039,7 +2039,7 @@ NSString *kSessionsKVCKey = @"sessions";
     // update the cursor
     if ([[[self currentSession] textview] refresh]) {
-        [[self currentSession] scheduleUpdateIn:[iTermSettingsModel timeBetweenBlinks]];
+        [[self currentSession] scheduleUpdateIn:[iTermAdvancedSettingsModel timeBetweenBlinks]];
     }
     [[[self currentSession] textview] setNeedsDisplay:YES];
     [self _loadFindStringFromSharedPasteboard];
@@ -3236,7 +3236,7 @@ NSString *kSessionsKVCKey = @"sessions";
     }
     if (([[[iTermController sharedInstance] terminals] count] == 1) ||
         (![iTermPreferences boolForKey:kPreferenceKeySmartWindowPlacement])) {
-        if ([iTermSettingsModel rememberWindowPositions]) {
+        if ([iTermAdvancedSettingsModel rememberWindowPositions]) {
             PtyLog(@"No smart layout");
             NSRect frame = [window frame];
             [self assignUniqueNumberToWindow];
@@ -5488,12 +5488,12 @@ NSString *kSessionsKVCKey = @"sessions";
     [tabBarControl setDisableTabClose:[iTermPreferences boolForKey:kPreferenceKeyHideTabCloseButton]];
     if ([iTermPreferences boolForKey:kPreferenceKeyHideTabCloseButton] &&
         [iTermPreferences boolForKey:kPreferenceKeyHideTabNumber]) {
-        [tabBarControl setCellMinWidth:[iTermSettingsModel minCompactTabWidth]];
+        [tabBarControl setCellMinWidth:[iTermAdvancedSettingsModel minCompactTabWidth]];
     } else {
-        [tabBarControl setCellMinWidth:[iTermSettingsModel minTabWidth]];
+        [tabBarControl setCellMinWidth:[iTermAdvancedSettingsModel minTabWidth]];
     }
-    [tabBarControl setSizeCellsToFit:[iTermSettingsModel useUnevenTabs]];
-    [tabBarControl setCellOptimumWidth:[iTermSettingsModel optimumTabWidth]];
+    [tabBarControl setSizeCellsToFit:[iTermAdvancedSettingsModel useUnevenTabs]];
+    [tabBarControl setCellOptimumWidth:[iTermAdvancedSettingsModel optimumTabWidth]];
     PtyLog(@"repositionWidgets - refresh textviews in this tab");
     for (PTYSession* session in [[self currentTab] sessions]) {
@@ -5997,7 +5997,7 @@ NSString *kSessionsKVCKey = @"sessions";
         [item action] == @selector(openDashboard:)) {
         result = [[iTermController sharedInstance] haveTmuxConnection];
     } else if ([item action] == @selector(wrapToggleToolbarShown:)) {
-        result = ![iTermSettingsModel disableToolbar] && (self.window.styleMask & NSTitledWindowMask);
+        result = ![iTermAdvancedSettingsModel disableToolbar] && (self.window.styleMask & NSTitledWindowMask);
     } else if ([item action] == @selector(moveSessionToWindow:)) {
         result = ([[self sessions] count] > 1);
     } else if ([item action] == @selector(openSplitHorizontallySheet:) ||
@@ -6794,7 +6794,7 @@ NSString *kSessionsKVCKey = @"sessions";
     [self setupSession:object title:nil withSize:nil];
     tabViewItemsBeingAdded--;
     if ([object screen]) {  // screen initialized ok
-        if ([iTermSettingsModel addNewTabAtEndOfTabs] || ![self currentTab]) {
+        if ([iTermAdvancedSettingsModel addNewTabAtEndOfTabs] || ![self currentTab]) {
             [self insertSession:object atIndex:[TABVIEW numberOfTabViewItems]];
         } else {
             [self insertSession:object atIndex:[self indexOfTab:[self currentTab]] + 1];

iTerm.xcodeproj/project.pbxproj

@@ -741,9 +741,9 @@
 		A697100618D82E79007E901D /* iTermAdvancedSettingsController.h in Headers */ = {isa = PBXBuildFile; fileRef = A697100418D82E79007E901D /* iTermAdvancedSettingsController.h */; };
 		A697100718D82E79007E901D /* iTermAdvancedSettingsController.m in Sources */ = {isa = PBXBuildFile; fileRef = A697100518D82E79007E901D /* iTermAdvancedSettingsController.m */; };
 		A697100818D82E79007E901D /* iTermAdvancedSettingsController.m in Sources */ = {isa = PBXBuildFile; fileRef = A697100518D82E79007E901D /* iTermAdvancedSettingsController.m */; };
-		A697100B18D94CDA007E901D /* iTermSettingsModel.h in Headers */ = {isa = PBXBuildFile; fileRef = A697100918D94CDA007E901D /* iTermSettingsModel.h */; };
-		A697100C18D94CDA007E901D /* iTermSettingsModel.m in Sources */ = {isa = PBXBuildFile; fileRef = A697100A18D94CDA007E901D /* iTermSettingsModel.m */; };
-		A697100D18D94CDA007E901D /* iTermSettingsModel.m in Sources */ = {isa = PBXBuildFile; fileRef = A697100A18D94CDA007E901D /* iTermSettingsModel.m */; };
+		A697100B18D94CDA007E901D /* iTermAdvancedSettingsModel.h in Headers */ = {isa = PBXBuildFile; fileRef = A697100918D94CDA007E901D /* iTermAdvancedSettingsModel.h */; };
+		A697100C18D94CDA007E901D /* iTermAdvancedSettingsModel.m in Sources */ = {isa = PBXBuildFile; fileRef = A697100A18D94CDA007E901D /* iTermAdvancedSettingsModel.m */; };
+		A697100D18D94CDA007E901D /* iTermAdvancedSettingsModel.m in Sources */ = {isa = PBXBuildFile; fileRef = A697100A18D94CDA007E901D /* iTermAdvancedSettingsModel.m */; };
 		A697101218DFA7D5007E901D /* closebutton@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A697101018DFA7D5007E901D /* closebutton@2x.png */; };
 		A697101318DFA7D5007E901D /* closebutton.png in Resources */ = {isa = PBXBuildFile; fileRef = A697101118DFA7D5007E901D /* closebutton.png */; };
 		A697101418DFA7F9007E901D /* closebutton@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = A697101018DFA7D5007E901D /* closebutton@2x.png */; };
@@ -1377,8 +1377,8 @@
 		A693395B1851A61D00EBEA20 /* VT100ScreenMark.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VT100ScreenMark.m; sourceTree = "<group>"; };
 		A697100418D82E79007E901D /* iTermAdvancedSettingsController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iTermAdvancedSettingsController.h; sourceTree = "<group>"; };
 		A697100518D82E79007E901D /* iTermAdvancedSettingsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = iTermAdvancedSettingsController.m; sourceTree = "<group>"; };
-		A697100918D94CDA007E901D /* iTermSettingsModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iTermSettingsModel.h; sourceTree = "<group>"; };
-		A697100A18D94CDA007E901D /* iTermSettingsModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = iTermSettingsModel.m; sourceTree = "<group>"; };
+		A697100918D94CDA007E901D /* iTermAdvancedSettingsModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = iTermAdvancedSettingsModel.h; sourceTree = "<group>"; };
+		A697100A18D94CDA007E901D /* iTermAdvancedSettingsModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = iTermAdvancedSettingsModel.m; sourceTree = "<group>"; };
 		A697101018DFA7D5007E901D /* closebutton@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "closebutton@2x.png"; path = "images/closebutton@2x.png"; sourceTree = "<group>"; };
 		A697101118DFA7D5007E901D /* closebutton.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = closebutton.png; path = images/closebutton.png; sourceTree = "<group>"; };
 		A699BAE418C8394700D425A7 /* CVector.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CVector.h; sourceTree = "<group>"; };
@@ -1729,7 +1729,7 @@
 				FB4CECF4AC4392B21E87A07B /* iTermRemotePreferences.h */,
 				1DAED99012EDF923005E49ED /* iTermSearchField.h */,
 				A63BA39318A9CB43002BE075 /* iTermSelection.h */,
-				A697100918D94CDA007E901D /* iTermSettingsModel.h */,
+				A697100918D94CDA007E901D /* iTermAdvancedSettingsModel.h */,
 				A63BA39D18B27B92002BE075 /* iTermTextExtractor.h */,
 				A6E713B818FCCDD1008D94DD /* iTermURLSchemeController.h */,
 				A6099B0318D6B0FD00081FA9 /* iTermWarning.h */,
@@ -2047,7 +2047,7 @@
 				A6E713A718F7C9F4008D94DD /* iTermProfilePreferences.m */,
 				A6E713A218F7C7E0008D94DD /* iTermProfilePreferencesBaseViewController.m */,
 				FB4CEAC661436E55F3B3A668 /* iTermRemotePreferences.m */,
-				A697100A18D94CDA007E901D /* iTermSettingsModel.m */,
+				A697100A18D94CDA007E901D /* iTermAdvancedSettingsModel.m */,
 				1DF8FEF218F3217100722B35 /* KeysPreferencesViewController.m */,
 				1DFA9D6F18F3A30F008ADC98 /* PointerPreferencesViewController.m */,
 				1D8255FB14687EE8007CAE78 /* PointerPrefsController.m */,
@@ -2767,7 +2767,7 @@
 				1D407A3A14BABE8700BD5035 /* iTermKeyBindingMgr.h in Headers */,
 				1D407A3B14BABE8700BD5035 /* NSStringITerm.h in Headers */,
 				A68A30F5186D150A007F550F /* NSArray+iTerm.h in Headers */,
-				A697100B18D94CDA007E901D /* iTermSettingsModel.h in Headers */,
+				A697100B18D94CDA007E901D /* iTermAdvancedSettingsModel.h in Headers */,
 				1D407A3C14BABE8700BD5035 /* PreferencePanel.h in Headers */,
 				1D407A3D14BABE8700BD5035 /* PseudoTerminal.h in Headers */,
 				1D407A3E14BABE8700BD5035 /* PTYScrollView.h in Headers */,
@@ -3089,7 +3089,7 @@
 				A6CFDAD9185D53C2005DC94B /* AsyncHostLookupController.m in Sources */,
 				1D9A555C180FA83900B42CE9 /* EventMonitorView.m in Sources */,
 				A68A30E9186D1429007F550F /* VT100WorkingDirectory.m in Sources */,
-				A697100D18D94CDA007E901D /* iTermSettingsModel.m in Sources */,
+				A697100D18D94CDA007E901D /* iTermAdvancedSettingsModel.m in Sources */,
 				A647E3AB18C353C500450FA1 /* VT100StringParser.m in Sources */,
 				A68A3116186E2F14007F550F /* PopupWindow.m in Sources */,
 				A6A13ABD18C34F6400B241ED /* VT100XtermParser.m in Sources */,
@@ -3502,7 +3502,7 @@
 				1DA9AEEB14A51CA000BEB37B /* TmuxSessionsTable.m in Sources */,
 				1D0B613914A7BC1200C57C33 /* TmuxControllerRegistry.m in Sources */,
 				A6E7138018F1DB1E008D94DD /* iTermPreferences.m in Sources */,
-				A697100C18D94CDA007E901D /* iTermSettingsModel.m in Sources */,
+				A697100C18D94CDA007E901D /* iTermAdvancedSettingsModel.m in Sources */,
 				1D0B613D14A7C76500C57C33 /* TmuxWindowsTable.m in Sources */,
 				1DAE714E14AAF24200DA144B /* EquivalenceClassSet.m in Sources */,
 				A68A3115186E2F14007F550F /* PopupWindow.m in Sources */,

iTermAdvancedSettingsController.h

@@ -10,7 +10,7 @@
 @interface iTermAdvancedSettingsController : NSObject <NSTableViewDataSource, NSTableViewDelegate>
-// Don't call these methods directly. Instead, go through iTermSettingsModel.
+// Don't call these methods directly. Instead, go through iTermAdvancedSettingsModel.
 + (BOOL)boolForIdentifier:(NSString*)identifier
              defaultValue:(BOOL)defaultValue
               description:(NSString*)description;

iTermAdvancedSettingsController.m

@@ -7,7 +7,7 @@
 //
 #import "iTermAdvancedSettingsController.h"
-#import "iTermSettingsModel.h"
+#import "iTermAdvancedSettingsModel.h"
 #import <objc/runtime.h>
 typedef enum {
@@ -151,13 +151,13 @@ static NSDictionary *gIntrospection;
         settings = [NSMutableArray array];
         NSArray *internalMethods = @[ @"initialize", @"load" ];
         unsigned int methodCount = 0;
-        Method *methods = class_copyMethodList(object_getClass([iTermSettingsModel class]), &methodCount);
+        Method *methods = class_copyMethodList(object_getClass([iTermAdvancedSettingsModel class]), &methodCount);
         gIntrospecting = YES;
         for (int i = 0; i < methodCount; i++) {
             SEL name = method_getName(methods[i]);
             NSString *stringName = NSStringFromSelector(name);
             if (![internalMethods containsObject:stringName]) {
-                [iTermSettingsModel performSelector:name withObject:nil];
+                [iTermAdvancedSettingsModel performSelector:name withObject:nil];
                 assert(gIntrospection != nil);
                 [settings addObject:gIntrospection];
                 [gIntrospection release];

iTermSettingsModel.h → iTermAdvancedSettingsModel.h

 //
-//  iTermSettingsModel.h
+//  iTermAdvancedSettingsModel.h
 //  iTerm
 //
 //  Created by George Nachman on 3/18/14.
@@ -8,7 +8,7 @@
 #import <Foundation/Foundation.h>
-@interface iTermSettingsModel : NSObject
+@interface iTermAdvancedSettingsModel : NSObject
 + (BOOL)useUnevenTabs;
 + (int)minTabWidth;

iTermSettingsModel.m → iTermAdvancedSettingsModel.m

 //
-//  iTermSettingsModel.m
+//  iTermAdvancedSettingsModel.m
 //  iTerm
 //
 //  Created by George Nachman on 3/18/14.
 //
 //
-#import "iTermSettingsModel.h"
+#import "iTermAdvancedSettingsModel.h"
 #import "iTermAdvancedSettingsController.h"
 #import "NSStringITerm.h"
-@implementation iTermSettingsModel
+@implementation iTermAdvancedSettingsModel
 #define DEFINE_BOOL(name, theDefault, theDescription) \
 + (BOOL)name { \

iTermApplicationDelegate.m

@@ -35,7 +35,7 @@
 #import "iTermFontPanel.h"
 #import "iTermPreferences.h"
 #import "iTermRemotePreferences.h"
-#import "iTermSettingsModel.h"
+#import "iTermAdvancedSettingsModel.h"
 #import "iTermURLSchemeController.h"
 #import "iTermWarning.h"
 #import "NSStringITerm.h"
@@ -394,7 +394,7 @@ static BOOL hasBecomeActive = NO;
 - (PseudoTerminal *)terminalToOpenFileIn
 {
-    if ([iTermSettingsModel openFileInNewWindows]) {
+    if ([iTermAdvancedSettingsModel openFileInNewWindows]) {
         return nil;
     } else {
         return [self currentTerminal];
@@ -472,7 +472,7 @@ static BOOL hasBecomeActive = NO;
         return NO;
     }
     if (!userHasInteractedWithAnySession_) {
-        if ([[NSDate date] timeIntervalSinceDate:launchTime_] < [iTermSettingsModel minRunningTime]) {
+        if ([[NSDate date] timeIntervalSinceDate:launchTime_] < [iTermAdvancedSettingsModel minRunningTime]) {
             NSLog(@"Not quitting iTerm2 because it ran very briefly and had no user interaction. Set the MinRunningTime float preference to 0 to turn this feature off.");
             return NO;
         }
@@ -493,11 +493,11 @@ static BOOL hasBecomeActive = NO;
             if ([[hotkeyTerm window] alphaValue] == 1) {
                 [[HotkeyWindowController sharedInstance] hideHotKeyWindow:hotkeyTerm];
                 return NO;
-            } else if ([iTermSettingsModel dockIconTogglesWindow]) {
+            } else if ([iTermAdvancedSettingsModel dockIconTogglesWindow]) {
                 [[HotkeyWindowController sharedInstance] showHotKeyWindow];
                 return NO;
             }
-        } else if ([iTermSettingsModel dockIconTogglesWindow]) {
+        } else if ([iTermAdvancedSettingsModel dockIconTogglesWindow]) {
             // No existing hotkey window but preference is to toggle it by dock icon so open a new
             // one.
             [[HotkeyWindowController sharedInstance] showHotKeyWindow];
@@ -514,7 +514,7 @@ static BOOL hasBecomeActive = NO;
     // I suppose, but I don't want to die on this hill.
     [self performSelector:@selector(updateScreenParametersInAllTerminals)
                withObject:nil
-               afterDelay:[iTermSettingsModel updateScreenParamsDelay]];
+               afterDelay:[iTermAdvancedSettingsModel updateScreenParamsDelay]];
 }
 - (void)updateScreenParametersInAllTerminals {