Skip to content
Snippets Groups Projects
Commit b64fd730 authored by George Nachman's avatar George Nachman
Browse files

Improve handling of default saved arrangement, change wording in prefs->general.

parent dd55e2d8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
English.lproj/PreferencePanel.xib
+ 120
− 112
View file @ b64fd730
@@ -12,7 +12,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="5559"/>
<integer value="1947"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -217,7 +217,7 @@
<object class="NSTabViewItem" id="403608584">
<string key="NSIdentifier">1</string>
<object class="NSView" key="NSView" id="505411774">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder" ref="415305200"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -589,7 +589,7 @@
<object class="NSButtonCell" key="NSCell" id="920268231">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Open saved window arrangement</string>
<string key="NSContents">Open default window arrangement</string>
<reference key="NSSupport" ref="966507434"/>
<reference key="NSControlView" ref="460179065"/>
<int key="NSButtonFlags">1211912703</int>
@@ -956,6 +956,7 @@
</object>
</object>
<string key="NSFrameSize">{767, 383}</string>
<reference key="NSSuperview" ref="415305200"/>
</object>
<string key="NSLabel">Global Settings</string>
<reference key="NSColor" ref="303715562"/>
@@ -7528,7 +7529,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTabViewItem" id="900816504">
<string key="NSIdentifier">Keys</string>
<object class="NSView" key="NSView" id="798698582">
<reference key="NSNextResponder" ref="415305200"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -7770,21 +7771,20 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
<string key="NSFrameSize">{767, 383}</string>
<reference key="NSSuperview" ref="415305200"/>
</object>
<string key="NSLabel">Keys</string>
<reference key="NSColor" ref="303715562"/>
<reference key="NSTabView" ref="415305200"/>
</object>
</object>
<reference key="NSSelectedTabViewItem" ref="900816504"/>
<reference key="NSSelectedTabViewItem" ref="403608584"/>
<reference key="NSFont" ref="966507434"/>
<int key="NSTvFlags">6</int>
<bool key="NSAllowTruncatedLabels">YES</bool>
<bool key="NSDrawsBackground">YES</bool>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="798698582"/>
<reference ref="505411774"/>
</object>
</object>
</object>
@@ -8870,7 +8870,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
</object>
<object class="NSCustomObject" id="560304331">
<string key="NSClassName">ArrangementsModel</string>
<string key="NSClassName">WindowArrangements</string>
</object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
@@ -19587,9 +19587,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES"/>
<string>{{272, 190}, {800, 411}}</string>
<string>{{233, 190}, {800, 411}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{272, 190}, {800, 411}}</string>
<string>{{233, 190}, {800, 411}}</string>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{364, 601}, {616, 0}}</string>
@@ -20993,106 +20993,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="minorKey">ArrangementPreviewView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">ArrangementsModel</string>
<string key="superclassName">NSObject</string>
<object class="NSMutableDictionary" key="actions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>deleteSelectedArrangement:</string>
<string>setDefault:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>deleteSelectedArrangement:</string>
<string>setDefault:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">deleteSelectedArrangement:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">setDefault:</string>
<string key="candidateClassName">id</string>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>defaultButton_</string>
<string>defaultColumn_</string>
<string>deleteButton_</string>
<string>previewView_</string>
<string>tableView_</string>
<string>titleColumn_</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSButton</string>
<string>NSTableColumn</string>
<string>NSButton</string>
<string>ArrangementPreviewView</string>
<string>NSTableView</string>
<string>NSTableColumn</string>
</object>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>defaultButton_</string>
<string>defaultColumn_</string>
<string>deleteButton_</string>
<string>previewView_</string>
<string>tableView_</string>
<string>titleColumn_</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">defaultButton_</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">defaultColumn_</string>
<string key="candidateClassName">NSTableColumn</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">deleteButton_</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">previewView_</string>
<string key="candidateClassName">ArrangementPreviewView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">tableView_</string>
<string key="candidateClassName">NSTableView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">titleColumn_</string>
<string key="candidateClassName">NSTableColumn</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">ArrangementsModel.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">BookmarkListView</string>
<string key="superclassName">NSView</string>
@@ -21642,7 +21542,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>NSToolbarItem</string>
<string>NSTabViewItem</string>
<string>NSToolbarItem</string>
<string>ArrangementsModel</string>
<string>WindowArrangements</string>
<string>NSButton</string>
<string>NSColorWell</string>
<string>NSButton</string>
@@ -22141,7 +22041,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<object class="IBToOneOutletInfo">
<string key="name">arrangements_</string>
<string key="candidateClassName">ArrangementsModel</string>
<string key="candidateClassName">WindowArrangements</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">asciiAntiAliased</string>
@@ -22870,6 +22770,114 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="minorKey"/>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">WindowArrangements</string>
<string key="superclassName">NSObject</string>
<object class="NSMutableDictionary" key="actions">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>deleteSelectedArrangement:</string>
<string>setDefault:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>deleteSelectedArrangement:</string>
<string>setDefault:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBActionInfo">
<string key="name">deleteSelectedArrangement:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">setDefault:</string>
<string key="candidateClassName">id</string>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>defaultButton_</string>
<string>defaultColumn_</string>
<string>deleteButton_</string>
<string>previewView_</string>
<string>tableView_</string>
<string>titleColumn_</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSButton</string>
<string>NSTableColumn</string>
<string>NSButton</string>
<string>ArrangementPreviewView</string>
<string>NSTableView</string>
<string>NSTableColumn</string>
</object>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>defaultButton_</string>
<string>defaultColumn_</string>
<string>deleteButton_</string>
<string>previewView_</string>
<string>tableView_</string>
<string>titleColumn_</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="IBToOneOutletInfo">
<string key="name">defaultButton_</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">defaultColumn_</string>
<string key="candidateClassName">NSTableColumn</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">deleteButton_</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">previewView_</string>
<string key="candidateClassName">ArrangementPreviewView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">tableView_</string>
<string key="candidateClassName">NSTableView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">titleColumn_</string>
<string key="candidateClassName">NSTableColumn</string>
</object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">WindowArrangements.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">WindowArrangements</string>
<string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
</object>
</object>
</object>
<object class="NSMutableArray" key="referencedPartialClassDescriptionsV3.2+">
<bool key="EncodedWithXMLCoder">YES</bool>
Headers/iTerm/PreferencePanel.h
+ 3
− 3
View file @ b64fd730
@@ -27,7 +27,7 @@
#import <Cocoa/Cocoa.h>
#import <iTerm/BookmarkModel.h>
#import "BookmarkListView.h"
#import "ArrangementsModel.h"
#import "WindowArrangements.h"
 
#define OPT_NORMAL 0
#define OPT_META 1
@@ -460,7 +460,7 @@ typedef enum { CURSOR_UNDERLINE, CURSOR_VERTICAL, CURSOR_BOX } ITermCursorType;
IBOutlet NSButton* globalRemoveMappingButton;
IBOutlet NSButton* globalAddNewMapping;
IBOutlet ArrangementsModel *arrangements_;
IBOutlet WindowArrangements *arrangements_;
}
 
typedef enum { BulkCopyColors, BulkCopyDisplay, BulkCopyWindow, BulkCopyTerminal, BulkCopyKeyboard } BulkCopySettings;
@@ -476,7 +476,7 @@ typedef enum { BulkCopyColors, BulkCopyDisplay, BulkCopyWindow, BulkCopyTerminal
- (void)editKeyMapping:(id)sender;
- (IBAction)saveKeyMapping:(id)sender;
- (BOOL)keySheetIsOpen;
- (ArrangementsModel *)arrangements;
- (WindowArrangements *)arrangements;
- (IBAction)closeKeyMapping:(id)sender;
- (BOOL)validateToolbarItem:(NSToolbarItem *)theItem;
- (NSToolbarItem *)toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString *)itemIdentifier willBeInsertedIntoToolbar:(BOOL)flag;
PreferencePanel.m
+ 7
− 7
View file @ b64fd730
@@ -35,7 +35,7 @@
#import <iTerm/BookmarkModel.h>
#import "PasteboardHistory.h"
#import "SessionView.h"
#import "ArrangementsModel.h"
#import "WindowArrangements.h"
 
#define CUSTOM_COLOR_PRESETS @"Custom Color Presets"
#define HOTKEY_WINDOW_GENERATED_PROFILE_NAME @"Hotkey Window"
@@ -156,8 +156,8 @@ static float versionNumber;
- (void)_savedArrangementChanged:(id)sender
{
[openArrangementAtStartup setState:defaultOpenArrangementAtStartup ? NSOnState : NSOffState];
[openArrangementAtStartup setEnabled:[ArrangementsModel count] > 0];
if ([ArrangementsModel count] == 0) {
[openArrangementAtStartup setEnabled:[WindowArrangements count] > 0];
if ([WindowArrangements count] == 0) {
[openArrangementAtStartup setState:NO];
}
}
@@ -779,7 +779,7 @@ static float versionNumber;
return [editKeyMappingWindow isVisible];
}
 
- (ArrangementsModel *)arrangements
- (WindowArrangements *)arrangements
{
return arrangements_;
}
@@ -928,7 +928,7 @@ static float versionNumber;
defaultHotkeyChar = [prefs objectForKey:@"HotkeyChar"]?[[prefs objectForKey:@"HotkeyChar"] intValue]: 0;
defaultHotkeyModifiers = [prefs objectForKey:@"HotkeyModifiers"]?[[prefs objectForKey:@"HotkeyModifiers"] intValue]: 0;
defaultSavePasteHistory = [prefs objectForKey:@"SavePasteHistory"]?[[prefs objectForKey:@"SavePasteHistory"] boolValue]: NO;
if ([ArrangementsModel count] > 0) {
if ([WindowArrangements count] > 0) {
defaultOpenArrangementAtStartup = [prefs objectForKey:@"OpenArrangementAtStartup"]?[[prefs objectForKey:@"OpenArrangementAtStartup"] boolValue]: NO;
} else {
defaultOpenArrangementAtStartup = NO;
@@ -1151,8 +1151,8 @@ static float versionNumber;
[showBookmarkName setState: defaultShowBookmarkName?NSOnState:NSOffState];
[savePasteHistory setState: defaultSavePasteHistory?NSOnState:NSOffState];
[openArrangementAtStartup setState:defaultOpenArrangementAtStartup ? NSOnState : NSOffState];
[openArrangementAtStartup setEnabled:[ArrangementsModel count] > 0];
if ([ArrangementsModel count] == 0) {
[openArrangementAtStartup setEnabled:[WindowArrangements count] > 0];
if ([WindowArrangements count] == 0) {
[openArrangementAtStartup setState:NO];
}
[hotkey setState: defaultHotkey?NSOnState:NSOffState];
iTerm.xcodeproj/project.pbxproj
+ 8
− 8
View file @ b64fd730
@@ -206,8 +206,8 @@
1DB72CF61396059200EB1005 /* xterm-terminfo.txt in Resources */ = {isa = PBXBuildFile; fileRef = 1DB72CF51396059200EB1005 /* xterm-terminfo.txt */; };
1DC742A0127C96F90069594C /* IBarCursor.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DC7429F127C96F90069594C /* IBarCursor.png */; };
1DCA5ECC13EE4DA800B7725E /* arrangement.png in Resources */ = {isa = PBXBuildFile; fileRef = 1DCA5ECB13EE4DA800B7725E /* arrangement.png */; };
1DCA5ECF13EE507800B7725E /* ArrangementsModel.h in Headers */ = {isa = PBXBuildFile; fileRef = 1DCA5ECD13EE507800B7725E /* ArrangementsModel.h */; };
1DCA5ED013EE507800B7725E /* ArrangementsModel.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DCA5ECE13EE507800B7725E /* ArrangementsModel.m */; };
1DCA5ECF13EE507800B7725E /* WindowArrangements.h in Headers */ = {isa = PBXBuildFile; fileRef = 1DCA5ECD13EE507800B7725E /* WindowArrangements.h */; };
1DCA5ED013EE507800B7725E /* WindowArrangements.m in Sources */ = {isa = PBXBuildFile; fileRef = 1DCA5ECE13EE507800B7725E /* WindowArrangements.m */; };
1DCA8BA9121A1B8000ABDEB5 /* PrefsAdvanced.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1DCA8BA3121A1B8000ABDEB5 /* PrefsAdvanced.tiff */; };
1DCA8BAA121A1B8000ABDEB5 /* PrefsBookmarks.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1DCA8BA4121A1B8000ABDEB5 /* PrefsBookmarks.tiff */; };
1DCA8BAB121A1B8000ABDEB5 /* PrefsDisplay.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 1DCA8BA5121A1B8000ABDEB5 /* PrefsDisplay.tiff */; };
@@ -384,8 +384,8 @@
1DB72CF51396059200EB1005 /* xterm-terminfo.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "xterm-terminfo.txt"; sourceTree = "<group>"; };
1DC7429F127C96F90069594C /* IBarCursor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = IBarCursor.png; path = images/IBarCursor.png; sourceTree = "<group>"; };
1DCA5ECB13EE4DA800B7725E /* arrangement.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = arrangement.png; path = images/arrangement.png; sourceTree = "<group>"; };
1DCA5ECD13EE507800B7725E /* ArrangementsModel.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArrangementsModel.h; sourceTree = "<group>"; };
1DCA5ECE13EE507800B7725E /* ArrangementsModel.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ArrangementsModel.m; sourceTree = "<group>"; };
1DCA5ECD13EE507800B7725E /* WindowArrangements.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WindowArrangements.h; sourceTree = "<group>"; };
1DCA5ECE13EE507800B7725E /* WindowArrangements.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WindowArrangements.m; sourceTree = "<group>"; };
1DCA8BA3121A1B8000ABDEB5 /* PrefsAdvanced.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = PrefsAdvanced.tiff; path = images/PrefsAdvanced.tiff; sourceTree = "<group>"; };
1DCA8BA4121A1B8000ABDEB5 /* PrefsBookmarks.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = PrefsBookmarks.tiff; path = images/PrefsBookmarks.tiff; sourceTree = "<group>"; };
1DCA8BA5121A1B8000ABDEB5 /* PrefsDisplay.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = PrefsDisplay.tiff; path = images/PrefsDisplay.tiff; sourceTree = "<group>"; };
@@ -689,8 +689,8 @@
1D44218B1290B34500891504 /* TextViewWrapper.m */,
E8CF7562026DDA6303A80106 /* VT100Screen.m */,
E8CF7563026DDA6303A80106 /* VT100Terminal.m */,
1DCA5ECD13EE507800B7725E /* ArrangementsModel.h */,
1DCA5ECE13EE507800B7725E /* ArrangementsModel.m */,
1DCA5ECD13EE507800B7725E /* WindowArrangements.h */,
1DCA5ECE13EE507800B7725E /* WindowArrangements.m */,
1D2560A813EE60E4006B35CD /* ArrangementPreviewView.h */,
1D2560A913EE60E4006B35CD /* ArrangementPreviewView.m */,
);
@@ -1140,7 +1140,7 @@
1DA8117E13CEA30A00CCA89A /* FontSizeEstimator.h in Headers */,
1DF0895B13DBAE1F00A52AD8 /* NSBitmapImageRep+CoreImage.h in Headers */,
1DF0895D13DBAE1F00A52AD8 /* NSImage+CoreImage.h in Headers */,
1DCA5ECF13EE507800B7725E /* ArrangementsModel.h in Headers */,
1DCA5ECF13EE507800B7725E /* WindowArrangements.h in Headers */,
1D2560AA13EE60E4006B35CD /* ArrangementPreviewView.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
@@ -1427,7 +1427,7 @@
1DA8117F13CEA30A00CCA89A /* FontSizeEstimator.m in Sources */,
1DF0895C13DBAE1F00A52AD8 /* NSBitmapImageRep+CoreImage.m in Sources */,
1DF0895E13DBAE1F00A52AD8 /* NSImage+CoreImage.m in Sources */,
1DCA5ED013EE507800B7725E /* ArrangementsModel.m in Sources */,
1DCA5ED013EE507800B7725E /* WindowArrangements.m in Sources */,
1D2560AB13EE60E4006B35CD /* ArrangementPreviewView.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
iTermApplicationDelegate.m
+ 12
− 6
View file @ b64fd730
@@ -49,7 +49,8 @@ static NSString *SCRIPT_DIRECTORY = @"~/Library/Application Support/iTerm/Script
static NSString* AUTO_LAUNCH_SCRIPT = @"~/Library/Application Support/iTerm/AutoLaunch.scpt";
static NSString *ITERM2_FLAG = @"~/Library/Application Support/iTerm/version.txt";
static BOOL gStartupActivitiesPerformed = NO;
// Prior to 8/7/11, there was only one window arrangement, always called Default.
static NSString *LEGACY_DEFAULT_ARRANGEMENT_NAME = @"Default";
NSMutableString* gDebugLogStr = nil;
NSMutableString* gDebugLogStr2 = nil;
static BOOL ranAutoLaunchScript = NO;
@@ -160,14 +161,19 @@ static BOOL hasBecomeActive = NO;
[autoLaunchScript executeAndReturnError:&errorInfo];
[autoLaunchScript release];
} else {
if ([WindowArrangements defaultArrangementName] == nil &&
[WindowArrangements arrangementWithName:LEGACY_DEFAULT_ARRANGEMENT_NAME] != nil) {
[WindowArrangements makeDefaultArrangement:LEGACY_DEFAULT_ARRANGEMENT_NAME];
}
if ([[PreferencePanel sharedInstance] openBookmark]) {
[self showBookmarkWindow:nil];
if ([[PreferencePanel sharedInstance] openArrangementAtStartup]) {
// Open both bookmark window and arrangement!
[[iTermController sharedInstance] loadWindowArrangementWithName:[ArrangementsModel defaultArrangementName]];
[[iTermController sharedInstance] loadWindowArrangementWithName:[WindowArrangements defaultArrangementName]];
}
} else if ([[PreferencePanel sharedInstance] openArrangementAtStartup]) {
[[iTermController sharedInstance] loadWindowArrangementWithName:[ArrangementsModel defaultArrangementName]];
[[iTermController sharedInstance] loadWindowArrangementWithName:[WindowArrangements defaultArrangementName]];
} else {
[self newWindow:nil];
}
@@ -429,9 +435,9 @@ static BOOL hasBecomeActive = NO;
[[windowArrangements_ submenu] removeItemAtIndex:0];
}
 
NSString *defaultName = [ArrangementsModel defaultArrangementName];
NSString *defaultName = [WindowArrangements defaultArrangementName];
 
for (NSString *theName in [ArrangementsModel allNames]) {
for (NSString *theName in [WindowArrangements allNames]) {
NSString *theShortcut;
if ([theName isEqualToString:defaultName]) {
theShortcut = @"R";
@@ -1070,7 +1076,7 @@ void DebugLog(NSString* value)
 
- (IBAction)loadWindowArrangement:(id)sender
{
[[iTermController sharedInstance] loadWindowArrangementWithName:[ArrangementsModel defaultArrangementName]];
[[iTermController sharedInstance] loadWindowArrangementWithName:[WindowArrangements defaultArrangementName]];
}
 
// TODO(georgen): Disable "Edit Current Session..." when there are no current sessions.
iTermController.m
+ 5
− 5
View file @ b64fd730
@@ -50,7 +50,7 @@
#import "iTermExpose.h"
#import "GTMCarbonEvent.h"
#import "iTerm.h"
#import "ArrangementsModel.h"
#import "WindowArrangements.h"
 
#define HOTKEY_WINDOW_VERBOSE_LOGGING
#ifdef HOTKEY_WINDOW_VERBOSE_LOGGING
@@ -293,11 +293,11 @@ static BOOL IsSnowLeopardOrLater() {
- (void)saveWindowArrangement
{
NSString *name = [self _showAlertWithText:@"Name for saved window arrangement:"
defaultInput:[NSString stringWithFormat:@"Arrangement %d", 1+[ArrangementsModel count]]];
defaultInput:[NSString stringWithFormat:@"Arrangement %d", 1+[WindowArrangements count]]];
if (!name) {
return;
}
if ([ArrangementsModel hasWindowArrangement:name]) {
if ([WindowArrangements hasWindowArrangement:name]) {
if (NSRunAlertPanel(@"Replace Existing Saved Window Arrangement?",
@"There is an existing saved window arrangement with this name. Would you like to replace it with the current arrangement?",
@"Yes",
@@ -313,12 +313,12 @@ static BOOL IsSnowLeopardOrLater() {
}
}
 
[ArrangementsModel setArrangement:terminalArrangements withName:name];
[WindowArrangements setArrangement:terminalArrangements withName:name];
}
 
- (void)loadWindowArrangementWithName:(NSString *)theName
{
NSArray* terminalArrangements = [ArrangementsModel arrangementWithName:theName];
NSArray* terminalArrangements = [WindowArrangements arrangementWithName:theName];
if (terminalArrangements) {
for (NSDictionary* terminalArrangement in terminalArrangements) {
PseudoTerminal* term = [PseudoTerminal terminalWithArrangement:terminalArrangement];
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment