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

Implement poorman's prefs sync

parent 531896a3
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
English.lproj/PreferencePanel.xib
+ 422
− 53
View file @ ec3c3abd
@@ -12,7 +12,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="2108"/>
<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>
@@ -823,7 +823,7 @@
<object class="NSTextField" id="951317711">
<reference key="NSNextResponder" ref="505411774"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{546, 110}, {99, 17}}</string>
<string key="NSFrame">{{546, 105}, {99, 17}}</string>
<reference key="NSSuperview" ref="505411774"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="226732540">
@@ -954,8 +954,136 @@
<reference key="NSTextColor" ref="1014689419"/>
</object>
</object>
<object class="NSTextField" id="393388698">
<reference key="NSNextResponder" ref="505411774"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{63, 78}, {83, 17}}</string>
<reference key="NSSuperview" ref="505411774"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="533196323">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents">Preferences</string>
<reference key="NSSupport" ref="907832903"/>
<reference key="NSControlView" ref="393388698"/>
<reference key="NSBackgroundColor" ref="303715562"/>
<reference key="NSTextColor" ref="1014689419"/>
</object>
</object>
<object class="NSButton" id="731675876">
<reference key="NSNextResponder" ref="505411774"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{64, 54}, {261, 18}}</string>
<reference key="NSSuperview" ref="505411774"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="71661080">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Load preferences from custom folder:</string>
<reference key="NSSupport" ref="966507434"/>
<reference key="NSControlView" ref="731675876"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSNormalImage" ref="93419583"/>
<reference key="NSAlternateImage" ref="573748959"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
<object class="NSTextField" id="856582882">
<reference key="NSNextResponder" ref="505411774"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{85, 26}, {251, 22}}</string>
<reference key="NSSuperview" ref="505411774"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="953583655">
<int key="NSCellFlags">-1804468671</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="966507434"/>
<reference key="NSControlView" ref="856582882"/>
<bool key="NSDrawsBackground">YES</bool>
<reference key="NSBackgroundColor" ref="652475538"/>
<reference key="NSTextColor" ref="301846970"/>
</object>
</object>
<object class="NSButton" id="551932464">
<reference key="NSNextResponder" ref="505411774"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{338, 20}, {96, 32}}</string>
<reference key="NSSuperview" ref="505411774"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="64133654">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Browse</string>
<reference key="NSSupport" ref="966507434"/>
<reference key="NSControlView" ref="551932464"/>
<int key="NSButtonFlags">-2038284033</int>
<int key="NSButtonFlags2">129</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
<object class="NSButton" id="916346445">
<reference key="NSNextResponder" ref="505411774"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{434, 20}, {234, 32}}</string>
<reference key="NSSuperview" ref="505411774"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="53419469">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Copy Curent Settings to Folder</string>
<reference key="NSSupport" ref="966507434"/>
<reference key="NSControlView" ref="916346445"/>
<int key="NSButtonFlags">-2038284033</int>
<int key="NSButtonFlags2">129</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
<object class="NSImageView" id="563450424">
<reference key="NSNextResponder" ref="505411774"/>
<int key="NSvFlags">256</int>
<object class="NSMutableSet" key="NSDragTypes">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSArray" key="set.sortedObjects">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>Apple PDF pasteboard type</string>
<string>Apple PICT pasteboard type</string>
<string>Apple PNG pasteboard type</string>
<string>NSFilenamesPboardType</string>
<string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
<string>NeXT TIFF v4.0 pasteboard type</string>
</object>
</object>
<string key="NSFrame">{{67, 28}, {16, 16}}</string>
<reference key="NSSuperview" ref="505411774"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="273228530">
<int key="NSCellFlags">130560</int>
<int key="NSCellFlags2">33554432</int>
<object class="NSCustomResource" key="NSContents" id="563082697">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">Warning</string>
</object>
<int key="NSAlign">0</int>
<int key="NSScale">0</int>
<int key="NSStyle">0</int>
<bool key="NSAnimates">YES</bool>
</object>
<bool key="NSEditable">YES</bool>
</object>
</object>
<string key="NSFrameSize">{767, 434}</string>
<reference key="NSSuperview" ref="415305200"/>
</object>
<string key="NSLabel">Global Settings</string>
<reference key="NSColor" ref="303715562"/>
@@ -1654,7 +1782,7 @@
<object class="NSTabViewItem" id="745611275">
<string key="NSIdentifier">2</string>
<object class="NSView" key="NSView" id="105539794">
<reference key="NSNextResponder" ref="415305200"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -5454,18 +5582,18 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
<object class="NSButton" id="129802823">
<object class="NSButton" id="569261225">
<reference key="NSNextResponder" ref="974784023"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{28, 46}, {288, 18}}</string>
<reference key="NSSuperview" ref="974784023"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="934260534">
<object class="NSButtonCell" key="NSCell" id="259696601">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Automatically log session input to files in:</string>
<reference key="NSSupport" ref="966507434"/>
<reference key="NSControlView" ref="129802823"/>
<reference key="NSControlView" ref="569261225"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSAlternateImage" ref="573748959"/>
@@ -5693,35 +5821,35 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
<object class="NSTextField" id="5781553">
<object class="NSTextField" id="749648309">
<reference key="NSNextResponder" ref="974784023"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{47, 18}, {277, 22}}</string>
<reference key="NSSuperview" ref="974784023"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="723830922">
<object class="NSTextFieldCell" key="NSCell" id="259241430">
<int key="NSCellFlags">-1804468671</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents"/>
<reference key="NSSupport" ref="966507434"/>
<reference key="NSControlView" ref="5781553"/>
<reference key="NSControlView" ref="749648309"/>
<bool key="NSDrawsBackground">YES</bool>
<reference key="NSBackgroundColor" ref="652475538"/>
<reference key="NSTextColor" ref="301846970"/>
</object>
</object>
<object class="NSButton" id="390482947">
<object class="NSButton" id="986355372">
<reference key="NSNextResponder" ref="974784023"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{326, 10}, {96, 32}}</string>
<reference key="NSSuperview" ref="974784023"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="396977994">
<object class="NSButtonCell" key="NSCell" id="1042681243">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Change</string>
<reference key="NSSupport" ref="966507434"/>
<reference key="NSControlView" ref="390482947"/>
<reference key="NSControlView" ref="986355372"/>
<int key="NSButtonFlags">-2038284033</int>
<int key="NSButtonFlags2">129</int>
<string key="NSAlternateContents"/>
@@ -5730,7 +5858,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
<object class="NSImageView" id="382918983">
<object class="NSImageView" id="457848933">
<reference key="NSNextResponder" ref="974784023"/>
<int key="NSvFlags">-2147483392</int>
<object class="NSMutableSet" key="NSDragTypes">
@@ -5748,13 +5876,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="NSFrame">{{29, 22}, {16, 16}}</string>
<reference key="NSSuperview" ref="974784023"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="714716371">
<object class="NSImageCell" key="NSCell" id="317908971">
<int key="NSCellFlags">130560</int>
<int key="NSCellFlags2">33554432</int>
<object class="NSCustomResource" key="NSContents">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">Warning</string>
</object>
<reference key="NSContents" ref="563082697"/>
<int key="NSAlign">0</int>
<int key="NSScale">0</int>
<int key="NSStyle">0</int>
@@ -5940,7 +6065,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="NSHScroller" ref="812569577"/>
<reference key="NSContentView" ref="97511335"/>
<reference key="NSHeaderClipView" ref="93498484"/>
<reference key="NSCornerView" ref="905967772"/>
<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
</object>
<object class="NSButton" id="981472994">
@@ -6423,7 +6547,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
<string key="NSFrameSize">{767, 434}</string>
<reference key="NSSuperview" ref="415305200"/>
</object>
<string key="NSLabel">Bookmarks</string>
<reference key="NSColor" ref="303715562"/>
@@ -7278,7 +7401,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="NSHScroller" ref="1007942010"/>
<reference key="NSContentView" ref="35583"/>
<reference key="NSHeaderClipView" ref="302482683"/>
<reference key="NSCornerView" ref="520715592"/>
<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
</object>
<object class="NSButton" id="649642907">
@@ -7881,14 +8003,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="NSTabView" ref="415305200"/>
</object>
</object>
<reference key="NSSelectedTabViewItem" ref="745611275"/>
<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="105539794"/>
<reference ref="505411774"/>
</object>
</object>
</object>
@@ -13016,14 +13138,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="IBActionConnection" key="connection">
<string key="label">bookmarkSettingChanged:</string>
<reference key="source" ref="155244235"/>
<reference key="destination" ref="129802823"/>
<reference key="destination" ref="569261225"/>
</object>
<int key="connectionID">5594</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">nextKeyView</string>
<reference key="source" ref="129802823"/>
<reference key="source" ref="569261225"/>
<reference key="destination" ref="551361709"/>
</object>
<int key="connectionID">5595</int>
@@ -13032,7 +13154,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="IBActionConnection" key="connection">
<string key="label">selectLogDir:</string>
<reference key="source" ref="155244235"/>
<reference key="destination" ref="390482947"/>
<reference key="destination" ref="986355372"/>
</object>
<int key="connectionID">5604</int>
</object>
@@ -13040,7 +13162,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="IBOutletConnection" key="connection">
<string key="label">logDirWarning</string>
<reference key="source" ref="155244235"/>
<reference key="destination" ref="382918983"/>
<reference key="destination" ref="457848933"/>
</object>
<int key="connectionID">5605</int>
</object>
@@ -13048,14 +13170,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="IBOutletConnection" key="connection">
<string key="label">logDir</string>
<reference key="source" ref="155244235"/>
<reference key="destination" ref="5781553"/>
<reference key="destination" ref="749648309"/>
</object>
<int key="connectionID">5606</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="5781553"/>
<reference key="source" ref="749648309"/>
<reference key="destination" ref="155244235"/>
</object>
<int key="connectionID">5607</int>
@@ -13064,7 +13186,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="IBOutletConnection" key="connection">
<string key="label">autoLog</string>
<reference key="source" ref="155244235"/>
<reference key="destination" ref="129802823"/>
<reference key="destination" ref="569261225"/>
</object>
<int key="connectionID">5608</int>
</object>
@@ -13072,10 +13194,82 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="IBOutletConnection" key="connection">
<string key="label">changeLogDir</string>
<reference key="source" ref="155244235"/>
<reference key="destination" ref="390482947"/>
<reference key="destination" ref="986355372"/>
</object>
<int key="connectionID">5609</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">loadPrefsFromCustomFolder</string>
<reference key="source" ref="155244235"/>
<reference key="destination" ref="731675876"/>
</object>
<int key="connectionID">5622</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">prefsCustomFolder</string>
<reference key="source" ref="155244235"/>
<reference key="destination" ref="856582882"/>
</object>
<int key="connectionID">5623</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">browseCustomFolder</string>
<reference key="source" ref="155244235"/>
<reference key="destination" ref="551932464"/>
</object>
<int key="connectionID">5624</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">pushToCustomFolder</string>
<reference key="source" ref="155244235"/>
<reference key="destination" ref="916346445"/>
</object>
<int key="connectionID">5625</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">browseCustomFolder:</string>
<reference key="source" ref="155244235"/>
<reference key="destination" ref="551932464"/>
</object>
<int key="connectionID">5626</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">pushToCustomFolder:</string>
<reference key="source" ref="155244235"/>
<reference key="destination" ref="916346445"/>
</object>
<int key="connectionID">5627</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">delegate</string>
<reference key="source" ref="856582882"/>
<reference key="destination" ref="155244235"/>
</object>
<int key="connectionID">5630</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">prefsDirWarning</string>
<reference key="source" ref="155244235"/>
<reference key="destination" ref="563450424"/>
</object>
<int key="connectionID">5631</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">settingChanged:</string>
<reference key="source" ref="155244235"/>
<reference key="destination" ref="731675876"/>
</object>
<int key="connectionID">5632</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -16452,10 +16646,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference ref="945983764"/>
<reference ref="46981557"/>
<reference ref="759777225"/>
<reference ref="129802823"/>
<reference ref="5781553"/>
<reference ref="390482947"/>
<reference ref="382918983"/>
<reference ref="569261225"/>
<reference ref="749648309"/>
<reference ref="986355372"/>
<reference ref="457848933"/>
</object>
<reference key="parent" ref="1033690595"/>
</object>
@@ -18054,6 +18248,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference ref="159246787"/>
<reference ref="797035319"/>
<reference ref="238358498"/>
<reference ref="393388698"/>
<reference ref="731675876"/>
<reference ref="856582882"/>
<reference ref="551932464"/>
<reference ref="563450424"/>
<reference ref="916346445"/>
</object>
<reference key="parent" ref="403608584"/>
</object>
@@ -18633,59 +18833,143 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<object class="IBObjectRecord">
<int key="objectID">5592</int>
<reference key="object" ref="129802823"/>
<reference key="object" ref="569261225"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="934260534"/>
<reference ref="259696601"/>
</object>
<reference key="parent" ref="974784023"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5593</int>
<reference key="object" ref="934260534"/>
<reference key="parent" ref="129802823"/>
<reference key="object" ref="259696601"/>
<reference key="parent" ref="569261225"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5598</int>
<reference key="object" ref="5781553"/>
<reference key="object" ref="749648309"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="723830922"/>
<reference ref="259241430"/>
</object>
<reference key="parent" ref="974784023"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5599</int>
<reference key="object" ref="723830922"/>
<reference key="parent" ref="5781553"/>
<reference key="object" ref="259241430"/>
<reference key="parent" ref="749648309"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5600</int>
<reference key="object" ref="390482947"/>
<reference key="object" ref="986355372"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="396977994"/>
<reference ref="1042681243"/>
</object>
<reference key="parent" ref="974784023"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5601</int>
<reference key="object" ref="396977994"/>
<reference key="parent" ref="390482947"/>
<reference key="object" ref="1042681243"/>
<reference key="parent" ref="986355372"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5602</int>
<reference key="object" ref="382918983"/>
<reference key="object" ref="457848933"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="714716371"/>
<reference ref="317908971"/>
</object>
<reference key="parent" ref="974784023"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5603</int>
<reference key="object" ref="714716371"/>
<reference key="parent" ref="382918983"/>
<reference key="object" ref="317908971"/>
<reference key="parent" ref="457848933"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5610</int>
<reference key="object" ref="393388698"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="533196323"/>
</object>
<reference key="parent" ref="505411774"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5611</int>
<reference key="object" ref="533196323"/>
<reference key="parent" ref="393388698"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5614</int>
<reference key="object" ref="731675876"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="71661080"/>
</object>
<reference key="parent" ref="505411774"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5615</int>
<reference key="object" ref="71661080"/>
<reference key="parent" ref="731675876"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5616</int>
<reference key="object" ref="856582882"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="953583655"/>
</object>
<reference key="parent" ref="505411774"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5617</int>
<reference key="object" ref="953583655"/>
<reference key="parent" ref="856582882"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5618</int>
<reference key="object" ref="551932464"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="64133654"/>
</object>
<reference key="parent" ref="505411774"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5619</int>
<reference key="object" ref="64133654"/>
<reference key="parent" ref="551932464"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5620</int>
<reference key="object" ref="916346445"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="53419469"/>
</object>
<reference key="parent" ref="505411774"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5621</int>
<reference key="object" ref="53419469"/>
<reference key="parent" ref="916346445"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5628</int>
<reference key="object" ref="563450424"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="273228530"/>
</object>
<reference key="parent" ref="505411774"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5629</int>
<reference key="object" ref="273228530"/>
<reference key="parent" ref="563450424"/>
</object>
</object>
</object>
@@ -19832,6 +20116,20 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>5600.IBViewBoundsToFrameTransform</string>
<string>5601.IBPluginDependency</string>
<string>5602.IBViewBoundsToFrameTransform</string>
<string>5610.IBPluginDependency</string>
<string>5611.IBPluginDependency</string>
<string>5614.IBPluginDependency</string>
<string>5614.IBViewBoundsToFrameTransform</string>
<string>5615.IBPluginDependency</string>
<string>5616.IBPluginDependency</string>
<string>5616.IBViewBoundsToFrameTransform</string>
<string>5617.IBPluginDependency</string>
<string>5618.IBPluginDependency</string>
<string>5618.IBViewBoundsToFrameTransform</string>
<string>5619.IBPluginDependency</string>
<string>5620.IBPluginDependency</string>
<string>5620.IBViewBoundsToFrameTransform</string>
<string>5621.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -21248,6 +21546,28 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">AUOYgABBqAAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABCgAAAwpIAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDpAAAwpIAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABEEUAAwpoAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDzIAAwkgAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -21266,7 +21586,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">5609</int>
<int key="maxID">5632</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -21386,6 +21706,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>addNewMapping:</string>
<string>bookmarkSettingChanged:</string>
<string>bookmarkUrlSchemeHandlerChanged:</string>
<string>browseCustomFolder:</string>
<string>cancelCopyBookmarks:</string>
<string>closeKeyMapping:</string>
<string>closeWindow:</string>
@@ -21398,6 +21719,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>loadColorPreset:</string>
<string>openCopyBookmarks:</string>
<string>presetKeyMappingsItemSelected:</string>
<string>pushToCustomFolder:</string>
<string>removeBookmark:</string>
<string>removeMapping:</string>
<string>saveKeyMapping:</string>
@@ -21441,6 +21763,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
@@ -21453,6 +21777,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>addNewMapping:</string>
<string>bookmarkSettingChanged:</string>
<string>bookmarkUrlSchemeHandlerChanged:</string>
<string>browseCustomFolder:</string>
<string>cancelCopyBookmarks:</string>
<string>closeKeyMapping:</string>
<string>closeWindow:</string>
@@ -21465,6 +21790,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>loadColorPreset:</string>
<string>openCopyBookmarks:</string>
<string>presetKeyMappingsItemSelected:</string>
<string>pushToCustomFolder:</string>
<string>removeBookmark:</string>
<string>removeMapping:</string>
<string>saveKeyMapping:</string>
@@ -21503,6 +21829,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="name">bookmarkUrlSchemeHandlerChanged:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">browseCustomFolder:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">cancelCopyBookmarks:</string>
<string key="candidateClassName">id</string>
@@ -21551,6 +21881,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="name">presetKeyMappingsItemSelected:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">pushToCustomFolder:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
<string key="name">removeBookmark:</string>
<string key="candidateClassName">id</string>
@@ -21660,6 +21994,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>bookmarksTabViewItem</string>
<string>bookmarksTableView</string>
<string>bookmarksToolbarItem</string>
<string>browseCustomFolder</string>
<string>bulkCopyLabel</string>
<string>changeLogDir</string>
<string>characterEncoding</string>
@@ -21736,6 +22071,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>leftCommandButton</string>
<string>leftOptionButton</string>
<string>lionStyleFullscreen</string>
<string>loadPrefsFromCustomFolder</string>
<string>logDir</string>
<string>logDirWarning</string>
<string>maxVertically</string>
@@ -21754,12 +22090,15 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>openBookmark</string>
<string>optionKeySends</string>
<string>passOnControlLeftClick</string>
<string>prefsCustomFolder</string>
<string>prefsDirWarning</string>
<string>presetsErrorLabel</string>
<string>presetsMenu</string>
<string>presetsPopupButton</string>
<string>profileLabel</string>
<string>promptOnClose</string>
<string>promptOnQuit</string>
<string>pushToCustomFolder</string>
<string>quitWhenAllWindowsClosed</string>
<string>removeBookmarkButton</string>
<string>removeMappingButton</string>
@@ -21872,6 +22211,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>NSTabViewItem</string>
<string>BookmarkListView</string>
<string>NSToolbarItem</string>
<string>NSButton</string>
<string>NSTextField</string>
<string>NSButton</string>
<string>NSPopUpButton</string>
@@ -21948,6 +22288,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>NSPopUpButton</string>
<string>NSPopUpButton</string>
<string>NSButton</string>
<string>NSButton</string>
<string>NSTextField</string>
<string>NSImageView</string>
<string>NSButton</string>
@@ -21967,6 +22308,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>NSMatrix</string>
<string>NSButton</string>
<string>NSTextField</string>
<string>NSImageView</string>
<string>NSTextField</string>
<string>NSMenu</string>
<string>NSPopUpButton</string>
<string>NSTextField</string>
@@ -21975,6 +22318,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>NSButton</string>
<string>NSButton</string>
<string>NSButton</string>
<string>NSButton</string>
<string>NSPopUpButton</string>
<string>NSPopUpButton</string>
<string>NSMatrix</string>
@@ -22087,6 +22431,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>bookmarksTabViewItem</string>
<string>bookmarksTableView</string>
<string>bookmarksToolbarItem</string>
<string>browseCustomFolder</string>
<string>bulkCopyLabel</string>
<string>changeLogDir</string>
<string>characterEncoding</string>
@@ -22163,6 +22508,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>leftCommandButton</string>
<string>leftOptionButton</string>
<string>lionStyleFullscreen</string>
<string>loadPrefsFromCustomFolder</string>
<string>logDir</string>
<string>logDirWarning</string>
<string>maxVertically</string>
@@ -22181,12 +22527,15 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>openBookmark</string>
<string>optionKeySends</string>
<string>passOnControlLeftClick</string>
<string>prefsCustomFolder</string>
<string>prefsDirWarning</string>
<string>presetsErrorLabel</string>
<string>presetsMenu</string>
<string>presetsPopupButton</string>
<string>profileLabel</string>
<string>promptOnClose</string>
<string>promptOnQuit</string>
<string>pushToCustomFolder</string>
<string>quitWhenAllWindowsClosed</string>
<string>removeBookmarkButton</string>
<string>removeMappingButton</string>
@@ -22476,6 +22825,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="name">bookmarksToolbarItem</string>
<string key="candidateClassName">NSToolbarItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">browseCustomFolder</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">bulkCopyLabel</string>
<string key="candidateClassName">NSTextField</string>
@@ -22780,6 +23133,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="name">lionStyleFullscreen</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">loadPrefsFromCustomFolder</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">logDir</string>
<string key="candidateClassName">NSTextField</string>
@@ -22852,6 +23209,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="name">passOnControlLeftClick</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">prefsCustomFolder</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">prefsDirWarning</string>
<string key="candidateClassName">NSImageView</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">presetsErrorLabel</string>
<string key="candidateClassName">NSTextField</string>
@@ -22876,6 +23241,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="name">promptOnQuit</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">pushToCustomFolder</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">quitWhenAllWindowsClosed</string>
<string key="candidateClassName">NSButton</string>
Headers/iTerm/PreferencePanel.h
+ 16
− 1
View file @ ec3c3abd
@@ -205,6 +205,15 @@ typedef enum { CURSOR_UNDERLINE, CURSOR_VERTICAL, CURSOR_BOX } ITermCursorType;
IBOutlet NSButton* lionStyleFullscreen;
BOOL defaultLionStyleFullscreen;
 
// Load prefs from custom folder
IBOutlet NSButton *loadPrefsFromCustomFolder;
BOOL defaultLoadPrefsFromCustomFolder;
IBOutlet NSTextField *prefsCustomFolder;
NSString *defaultPrefsCustomFolder;
IBOutlet NSButton *browseCustomFolder;
IBOutlet NSButton *pushToCustomFolder;
IBOutlet NSImageView *prefsDirWarning;
// hide scrollbar and resize
IBOutlet NSButton *hideScrollbar;
BOOL defaultHideScrollbar;
@@ -463,15 +472,18 @@ typedef enum { CURSOR_UNDERLINE, CURSOR_VERTICAL, CURSOR_BOX } ITermCursorType;
IBOutlet NSTableColumn* globalActionColumn;
IBOutlet NSButton* globalRemoveMappingButton;
IBOutlet NSButton* globalAddNewMapping;
IBOutlet WindowArrangements *arrangements_;
}
 
void LoadPrefsFromCustomFolder(void);
typedef enum { BulkCopyColors, BulkCopyDisplay, BulkCopyWindow, BulkCopyTerminal, BulkCopyKeyboard } BulkCopySettings;
 
+ (PreferencePanel*)sharedInstance;
+ (PreferencePanel*)sessionsInstance;
+ (BOOL)migratePreferences;
- (BOOL)loadPrefs;
- (id)initWithDataSource:(BookmarkModel*)model userDefaults:(NSUserDefaults*)userDefaults;
- (void)setOneBokmarkOnly;
- (void)awakeFromNib;
@@ -541,6 +553,7 @@ typedef enum { BulkCopyColors, BulkCopyDisplay, BulkCopyWindow, BulkCopyTerminal
 
- (BOOL)showWindowBorder;
- (BOOL)lionStyleFullscreen;
- (NSString *)loadPrefsFromCustomFolder;
- (BOOL)dimInactiveSplitPanes;
- (BOOL)dimBackgroundWindows;
- (BOOL)animateDimming;
@@ -569,6 +582,8 @@ typedef enum { BulkCopyColors, BulkCopyDisplay, BulkCopyWindow, BulkCopyTerminal
- (IBAction)displaySelectFont:(id)sender;
- (void)changeFont:(id)fontManager;
- (NSString*)_chooseBackgroundImage;
- (IBAction)browseCustomFolder:(id)sender;
- (IBAction)pushToCustomFolder:(id)sender;
- (IBAction)bookmarkSettingChanged:(id)sender;
- (IBAction)copyToProfile:(id)sender;
- (IBAction)bookmarkUrlSchemeHandlerChanged:(id)sender;
PreferencePanel.m
+ 251
− 4
View file @ ec3c3abd
@@ -44,6 +44,26 @@ NSString* kDeleteKeyString = @"0x7f-0x0";
 
static float versionNumber;
 
@interface NSFileManager (TemporaryDirectory)
- (NSString *)temporaryDirectory;
@end
@implementation NSFileManager (TemporaryDirectory)
- (NSString *)temporaryDirectory
{
// Create a unique directory in the system temporary directory
NSString *guid = [[NSProcessInfo processInfo] globallyUniqueString];
NSString *path = [NSTemporaryDirectory() stringByAppendingPathComponent:guid];
if (![self createDirectoryAtPath:path withIntermediateDirectories:NO attributes:nil error:nil]) {
return nil;
}
return path;
}
@end
@implementation PreferencePanel
 
+ (PreferencePanel*)sharedInstance;
@@ -115,6 +135,9 @@ static float versionNumber;
dataSource = model;
prefs = userDefaults;
oneBookmarkOnly = NO;
if (userDefaults) {
[self loadPrefs];
}
[self readPreferences];
if (defaultEnableBonjour == YES) {
[[ITAddressBookMgr sharedInstance] locateBonjourServices];
@@ -444,9 +467,8 @@ static float versionNumber;
[[NSWorkspace sharedWorkspace] openURL:[NSURL URLWithString:COLOR_GALLERY_URL]];
}
 
- (BOOL)_logDirIsWritable
- (BOOL)_dirIsWritable:(NSString *)dir
{
NSString *dir = [logDir stringValue];
if ([[dir stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceCharacterSet]] length] == 0) {
return NO;
}
@@ -464,9 +486,31 @@ static float versionNumber;
return YES;
}
 
- (BOOL)_logDirIsWritable
{
return [self _dirIsWritable:[logDir stringValue]];
}
- (void)_updateLogDirWarning
{
[logDirWarning setHidden:[self _logDirIsWritable]];
[logDirWarning setHidden:[autoLog state] == NSOffState || [self _logDirIsWritable]];
}
- (BOOL)_prefsDirIsWritable
{
return [self _dirIsWritable:defaultPrefsCustomFolder];
}
- (void)_updatePrefsDirWarning
{
if (([defaultPrefsCustomFolder hasPrefix:@"http://"] ||
[defaultPrefsCustomFolder hasPrefix:@"https://"]) &&
[NSURL URLWithString:defaultPrefsCustomFolder]) {
// Don't warn about URLs, too expensive to check
[prefsDirWarning setHidden:YES];
return;
}
[prefsDirWarning setHidden:!defaultLoadPrefsFromCustomFolder || [self _prefsDirIsWritable]];
}
 
- (void)setScreens
@@ -564,6 +608,11 @@ static float versionNumber;
[transparency setContinuous:YES];
[dimmingAmount setContinuous:YES];
[minimumContrast setContinuous:YES];
[prefsCustomFolder setEnabled:defaultLoadPrefsFromCustomFolder];
[browseCustomFolder setEnabled:defaultLoadPrefsFromCustomFolder];
[pushToCustomFolder setEnabled:defaultLoadPrefsFromCustomFolder];
[self _updatePrefsDirWarning];
}
 
- (void)handleWindowWillCloseNotification:(NSNotification *)notification
@@ -968,6 +1017,8 @@ static float versionNumber;
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;
defaultPrefsCustomFolder = [prefs objectForKey:@"PrefsCustomFolder"] ? [prefs objectForKey:@"PrefsCustomFolder"] : @"";
 
defaultControl = [prefs objectForKey:@"Control"] ? [[prefs objectForKey:@"Control"] intValue] : MOD_TAG_CONTROL;
defaultLeftOption = [prefs objectForKey:@"LeftOption"] ? [[prefs objectForKey:@"LeftOption"] intValue] : MOD_TAG_LEFT_OPTION;
@@ -1103,6 +1154,8 @@ static float versionNumber;
[prefs setFloat:defaultDimmingAmount forKey:@"SplitPaneDimmingAmount"];
[prefs setBool:defaultShowWindowBorder forKey:@"UseBorder"];
[prefs setBool:defaultLionStyleFullscreen forKey:@"UseLionStyleFullscreen"];
[prefs setBool:defaultLoadPrefsFromCustomFolder forKey:@"LoadPrefsFromCustomFolder"];
[prefs setObject:defaultPrefsCustomFolder forKey:@"PrefsCustomFolder"];
 
[prefs setInteger:defaultControl forKey:@"Control"];
[prefs setInteger:defaultLeftOption forKey:@"LeftOption"];
@@ -1201,6 +1254,8 @@ static float versionNumber;
[dimmingAmount setFloatValue:defaultDimmingAmount];
[showWindowBorder setState:defaultShowWindowBorder?NSOnState:NSOffState];
[lionStyleFullscreen setState:defaultLionStyleFullscreen?NSOnState:NSOffState];
[loadPrefsFromCustomFolder setState:defaultLoadPrefsFromCustomFolder?NSOnState:NSOffState];
[prefsCustomFolder setStringValue:defaultPrefsCustomFolder];
 
[self showWindow: self];
[[self window] setLevel:NSNormalWindowLevel];
@@ -1307,6 +1362,36 @@ static float versionNumber;
{
if (sender == lionStyleFullscreen) {
defaultLionStyleFullscreen = ([lionStyleFullscreen state] == NSOnState);
} else if (sender == loadPrefsFromCustomFolder) {
defaultLoadPrefsFromCustomFolder = [loadPrefsFromCustomFolder state] == NSOnState;
if (defaultLoadPrefsFromCustomFolder) {
// Just turned it on.
if ([[prefsCustomFolder stringValue] length] == 0) {
// Field was initially empty so browse for a dir.
[self browseCustomFolder:nil];
}
if ([prefsDirWarning isHidden]) {
// The directory is valid and it's probably the user's first time downt this path.
if ([[NSAlert alertWithMessageText:@"Copy local preferences to custom folder now?"
defaultButton:@"Copy"
alternateButton:@"Cancel"
otherButton:nil
informativeTextWithFormat:@""] runModal] == NSOKButton) {
[self pushToCustomFolder:nil];
}
}
}
[prefsCustomFolder setEnabled:defaultLoadPrefsFromCustomFolder];
[browseCustomFolder setEnabled:defaultLoadPrefsFromCustomFolder];
[pushToCustomFolder setEnabled:defaultLoadPrefsFromCustomFolder];
[self _updatePrefsDirWarning];
} else if (sender == prefsCustomFolder) {
// The OS will never call us directly with this sender, but we do call ourselves this way.
[prefs setObject:[prefsCustomFolder stringValue]
forKey:@"PrefsCustomFolder"];
defaultPrefsCustomFolder = [prefs objectForKey:@"PrefsCustomFolder"];
[self _updatePrefsDirWarning];
} else if (sender == windowStyle ||
sender == tabPosition ||
sender == hideTab ||
@@ -1793,6 +1878,119 @@ static float versionNumber;
}
}
 
- (NSString *)_prefsFilename
{
NSString *prefDir = [[NSHomeDirectory()
stringByAppendingPathComponent:@"Library"]
stringByAppendingPathComponent:@"Preferences"];
return [prefDir stringByAppendingPathComponent:[NSString stringWithFormat:@"%@.plist",
[[NSBundle mainBundle] bundleIdentifier]]];
}
- (NSString *)_prefsFilenameWithBaseDir:(NSString *)base
{
return [NSString stringWithFormat:@"%@/%@.plist", base, [[NSBundle mainBundle] bundleIdentifier]];
}
- (BOOL)loadPrefs
{
static BOOL done;
if (done) {
return YES;
}
done = YES;
BOOL doLoad = [prefs objectForKey:@"LoadPrefsFromCustomFolder"] ? [[prefs objectForKey:@"LoadPrefsFromCustomFolder"] boolValue] : NO;
if (!doLoad) {
return YES;
}
NSString *folder = [prefs objectForKey:@"PrefsCustomFolder"] ? [prefs objectForKey:@"PrefsCustomFolder"] : @"";
NSString *filename = [self _prefsFilenameWithBaseDir:folder];
NSDictionary *remotePrefs;
if ([folder hasPrefix:@"http://"] ||
[folder hasPrefix:@"https://"]) {
// Download the URL's contents.
NSURL *url = [NSURL URLWithString:folder];
const NSTimeInterval kFetchTimeout = 5.0;
NSURLRequest *req = [NSURLRequest requestWithURL:url
cachePolicy:NSURLRequestUseProtocolCachePolicy
timeoutInterval:kFetchTimeout];
NSURLResponse *response = nil;
NSError *error = nil;
NSData *data = [NSURLConnection sendSynchronousRequest:req
returningResponse:&response
error:&error];
if (!data || error) {
[[NSAlert alertWithMessageText:@"Failed to load preferences from URL. Falling back to local copy."
defaultButton:@"OK"
alternateButton:nil
otherButton:nil
informativeTextWithFormat:@"HTTP request failed: %@", [error description] ? [error description] : @"unknown error"] runModal];
return NO;
}
// Write it to disk
NSFileManager *mgr = [NSFileManager defaultManager];
NSString *tempDir = [mgr temporaryDirectory];
NSString *tempFile = [tempDir stringByAppendingPathComponent:@"temp.plist"];
error = nil;
if (![data writeToFile:tempFile options:0 error:&error]) {
[[NSAlert alertWithMessageText:@"Failed to write to temp file while getting remote prefs. Falling back to local copy."
defaultButton:@"OK"
alternateButton:nil
otherButton:nil
informativeTextWithFormat:@"Error on file %@: %@", tempFile, [error localizedFailureReason]] runModal];
return NO;
}
remotePrefs = [NSDictionary dictionaryWithContentsOfFile:tempFile];
[mgr removeItemAtPath:tempFile error:nil];
[mgr removeItemAtPath:tempDir error:nil];
} else {
remotePrefs = [NSDictionary dictionaryWithContentsOfFile:filename];
}
if (remotePrefs && [remotePrefs count]) {
NSDictionary *localPrefs = [NSDictionary dictionaryWithContentsOfFile:[self _prefsFilename]];
// Empty out the current prefs
NSArray *exemptKeys = [NSArray arrayWithObjects:@"LoadPrefsFromCustomFolder",
@"PrefsCustomFolder", nil];
for (NSString *key in localPrefs) {
if (![exemptKeys containsObject:key]) {
[[NSUserDefaults standardUserDefaults] removeObjectForKey:key];
}
}
for (NSString *key in remotePrefs) {
if (![exemptKeys containsObject:key]) {
[[NSUserDefaults standardUserDefaults] setObject:[remotePrefs objectForKey:key]
forKey:key];
}
}
return YES;
} else {
[[NSAlert alertWithMessageText:@"Failed to load preferences from custom directory. Falling back to local copy."
defaultButton:@"OK"
alternateButton:nil
otherButton:nil
informativeTextWithFormat:@"Missing or malformed file at \"%@\"", filename] runModal];
}
return NO;
}
- (NSString *)loadPrefsFromCustomFolder
{
if (defaultLoadPrefsFromCustomFolder) {
return defaultPrefsCustomFolder;
} else {
return nil;
}
}
- (BOOL)checkTestRelease
{
return defaultCheckTestRelease;
@@ -2263,7 +2461,7 @@ static float versionNumber;
[scrollbackWithStatusBar setState:[[dict objectForKey:KEY_SCROLLBACK_WITH_STATUS_BAR] boolValue] ? NSOnState : NSOffState];
[bookmarkGrowlNotifications setState:[[dict objectForKey:KEY_BOOKMARK_GROWL_NOTIFICATIONS] boolValue] ? NSOnState : NSOffState];
[autoLog setState:[[dict objectForKey:KEY_AUTOLOG] boolValue] ? NSOnState : NSOffState];
[logDir setStringValue:[dict objectForKey:KEY_LOGDIR]];
[logDir setStringValue:[dict objectForKey:KEY_LOGDIR] ? [dict objectForKey:KEY_LOGDIR] : @""];
[logDir setEnabled:[autoLog state] == NSOnState];
[changeLogDir setEnabled:[autoLog state] == NSOnState];
[self _updateLogDirWarning];
@@ -2448,6 +2646,52 @@ static float versionNumber;
}
}
 
- (IBAction)browseCustomFolder:(id)sender
{
NSOpenPanel* panel = [NSOpenPanel openPanel];
[panel setCanChooseFiles:NO];
[panel setCanChooseDirectories:YES];
[panel setAllowsMultipleSelection:NO];
if ([panel runModal] == NSOKButton) {
[prefsCustomFolder setStringValue:[panel directory]];
[self settingChanged:prefsCustomFolder];
}
}
- (IBAction)pushToCustomFolder:(id)sender
{
[[NSUserDefaults standardUserDefaults] synchronize];
NSString *folder = [prefs objectForKey:@"PrefsCustomFolder"] ? [prefs objectForKey:@"PrefsCustomFolder"] : @"";
NSString *filename = [self _prefsFilenameWithBaseDir:folder];
NSFileManager *mgr = [NSFileManager defaultManager];
// Copy fails if the destination exists.
[mgr removeItemAtPath:filename error:nil];
[self savePreferences];
NSDictionary *myDict = [[NSUserDefaults standardUserDefaults] persistentDomainForName:[[NSBundle mainBundle] bundleIdentifier]];
BOOL isOk;
if ([filename hasPrefix:@"http://"] ||
[filename hasPrefix:@"https://"]) {
[[NSAlert alertWithMessageText:@"Sorry, preferences cannot be copied to a URL by iTerm2."
defaultButton:@"OK"
alternateButton:nil
otherButton:nil
informativeTextWithFormat:@"To make it available, manually copy ~/Library/Preferences/com.googlecode.iterm2.plist to your hosting provider to be served at %@", folder] runModal];
return;
}
isOk = [myDict writeToFile:filename atomically:YES];
if (!isOk) {
[[NSAlert alertWithMessageText:@"Failed to copy preferences to custom directory."
defaultButton:@"OK"
alternateButton:nil
otherButton:nil
informativeTextWithFormat:@"Copy %@ to %@: %s", [self _prefsFilename], filename, strerror(errno)] runModal];
}
}
- (IBAction)bookmarkSettingChanged:(id)sender
{
NSString* name = [bookmarkName stringValue];
@@ -2620,6 +2864,7 @@ static float versionNumber;
[logDir setEnabled:[autoLog state] == NSOnState];
[changeLogDir setEnabled:[autoLog state] == NSOnState];
[self _updateLogDirWarning];
[self _updatePrefsDirWarning];
[newDict setObject:[NSNumber numberWithUnsignedInt:[[characterEncoding selectedItem] tag]] forKey:KEY_CHARACTER_ENCODING];
[newDict setObject:[NSNumber numberWithInt:[scrollbackLines intValue]] forKey:KEY_SCROLLBACK_LINES];
[newDict setObject:[NSNumber numberWithBool:([unlimitedScrollback state]==NSOnState)] forKey:KEY_UNLIMITED_SCROLLBACK];
@@ -2845,6 +3090,8 @@ static float versionNumber;
[self bookmarkSettingChanged:nil];
} else if (obj == logDir) {
[self _updateLogDirWarning];
} else if (obj == prefsCustomFolder) {
[self settingChanged:prefsCustomFolder];
} else if (obj == tagFilter) {
NSLog(@"Tag filter changed");
}
iTermApplicationDelegate.m
+ 2
− 2
View file @ ec3c3abd
@@ -88,9 +88,9 @@ static BOOL hasBecomeActive = NO;
// set the TERM_PROGRAM environment variable
putenv("TERM_PROGRAM=iTerm.app");
 
[self buildScriptMenu:nil];
[self buildScriptMenu:nil];
 
// read preferences
// read preferences
[PreferencePanel migratePreferences];
[ITAddressBookMgr sharedInstance];
[PreferencePanel sharedInstance];
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