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

Add pref to hide tab's activity indicator.

parent 59427df8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
English.lproj/PreferencePanel.xib
+ 86
− 10
View file @ 9c5d04e7
@@ -965,6 +965,28 @@
<int key="NSPeriodicInterval">25</int>
</object>
</object>
<object class="NSButton" id="866978496">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{106, 211}, {263, 18}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1049029954">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Hide tab activity indicator</string>
<reference key="NSSupport" ref="966507434"/>
<reference key="NSControlView" ref="866978496"/>
<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="NSButton" id="883602149">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">256</int>
@@ -1294,7 +1316,7 @@
<object class="NSButton" id="219255988">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{108, 99}, {178, 18}}</string>
<string key="NSFrame">{{108, 89}, {178, 18}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="893276983">
@@ -1316,7 +1338,7 @@
<object class="NSButton" id="140624317">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{108, 79}, {186, 18}}</string>
<string key="NSFrame">{{108, 69}, {186, 18}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="592396050">
@@ -1338,7 +1360,7 @@
<object class="NSButton" id="1021432808">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{108, 164}, {298, 18}}</string>
<string key="NSFrame">{{108, 154}, {298, 18}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="667043283">
@@ -1404,7 +1426,7 @@
<object class="NSTextField" id="42775949">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{107, 188}, {66, 17}}</string>
<string key="NSFrame">{{107, 178}, {66, 17}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="685288966">
@@ -1436,7 +1458,7 @@
<object class="NSSlider" id="364321727">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{229, 137}, {177, 21}}</string>
<string key="NSFrame">{{229, 127}, {177, 21}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSliderCell" key="NSCell" id="749728820">
@@ -1457,7 +1479,7 @@
<object class="NSTextField" id="795654564">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{107, 141}, {119, 17}}</string>
<string key="NSFrame">{{107, 131}, {119, 17}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="357810368">
@@ -1473,7 +1495,7 @@
<object class="NSTextField" id="874344225">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{228, 125}, {43, 11}}</string>
<string key="NSFrame">{{228, 115}, {43, 11}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="740864788">
@@ -1493,7 +1515,7 @@
<object class="NSTextField" id="798848490">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{363, 125}, {44, 11}}</string>
<string key="NSFrame">{{363, 115}, {44, 11}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="254411488">
@@ -12260,6 +12282,30 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<int key="connectionID">5373</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">settingChanged:</string>
<reference key="source" ref="155244235"/>
<reference key="destination" ref="866978496"/>
</object>
<int key="connectionID">5376</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">nextKeyView</string>
<reference key="source" ref="866978496"/>
<reference key="destination" ref="1021432808"/>
</object>
<int key="connectionID">5377</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">hideActivityIndicator</string>
<reference key="source" ref="155244235"/>
<reference key="destination" ref="866978496"/>
</object>
<int key="connectionID">5382</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -15410,6 +15456,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference ref="874344225"/>
<reference ref="798848490"/>
<reference ref="1009965154"/>
<reference ref="866978496"/>
</object>
<reference key="parent" ref="75732044"/>
</object>
@@ -17547,6 +17594,20 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference key="object" ref="1023120314"/>
<reference key="parent" ref="684174978"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5374</int>
<reference key="object" ref="866978496"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="1049029954"/>
</object>
<reference key="parent" ref="1019983678"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5375</int>
<reference key="object" ref="1049029954"/>
<reference key="parent" ref="866978496"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -18634,6 +18695,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>5366.IBPluginDependency</string>
<string>5367.IBPluginDependency</string>
<string>5368.IBPluginDependency</string>
<string>5374.IBPluginDependency</string>
<string>5374.IBViewBoundsToFrameTransform</string>
<string>5375.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -19470,7 +19534,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABCWAAAwykAAA</bytes>
<bytes key="NSTransformStruct">P4AAAL+AAABC1AAAw3cAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -19954,6 +20018,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<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+AAABCWAAAwykAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -19972,7 +20041,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">5373</int>
<int key="maxID">5382</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -20390,6 +20459,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>globalRemoveMappingButton</string>
<string>globalTabViewItem</string>
<string>globalToolbarItem</string>
<string>hideActivityIndicator</string>
<string>hideScrollbar</string>
<string>hideTab</string>
<string>highlightTabLabels</string>
@@ -20591,6 +20661,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>NSTabViewItem</string>
<string>NSToolbarItem</string>
<string>NSButton</string>
<string>NSButton</string>
<string>id</string>
<string>NSButton</string>
<string>NSButton</string>
@@ -20793,6 +20864,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>globalRemoveMappingButton</string>
<string>globalTabViewItem</string>
<string>globalToolbarItem</string>
<string>hideActivityIndicator</string>
<string>hideScrollbar</string>
<string>hideTab</string>
<string>highlightTabLabels</string>
@@ -21308,6 +21380,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="name">globalToolbarItem</string>
<string key="candidateClassName">NSToolbarItem</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">hideActivityIndicator</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">hideScrollbar</string>
<string key="candidateClassName">NSButton</string>
Headers/iTerm/PreferencePanel.h
+ 5
− 0
View file @ 9c5d04e7
@@ -137,6 +137,10 @@ typedef enum { CURSOR_UNDERLINE, CURSOR_VERTICAL, CURSOR_BOX } ITermCursorType;
IBOutlet NSButton *useCompactLabel;
BOOL defaultUseCompactLabel;
 
// hide activity indicator
IBOutlet NSButton *hideActivityIndicator;
BOOL defaultHideActivityIndicator;
// Highlight tab labels on activity
IBOutlet NSButton *highlightTabLabels;
BOOL defaultHighlightTabLabels;
@@ -494,6 +498,7 @@ typedef enum { BulkCopyColors, BulkCopyDisplay, BulkCopyWindow, BulkCopyTerminal
- (BOOL)maxVertically;
- (BOOL)closingHotkeySwitchesSpaces;
- (BOOL)useCompactLabel;
- (BOOL)hideActivityIndicator;
- (BOOL)highlightTabLabels;
- (BOOL)openBookmark;
- (NSString *)wordChars;
PTYTab.h
+ 1
− 0
View file @ 9c5d04e7
@@ -145,6 +145,7 @@ static const int MIN_SESSION_COLUMNS = 2;
- (void)closeSession:(PTYSession*)session;
- (void)terminateAllSessions;
- (NSArray*)sessions;
- (NSArray*)sessionViews;
- (BOOL)allSessionsExited;
- (void)setDvrInSession:(PTYSession*)newSession;
- (void)showLiveSession:(PTYSession*)liveSession inPlaceOf:(PTYSession*)replaySession;
PTYTab.m
+ 3
− 1
View file @ 9c5d04e7
@@ -491,7 +491,9 @@ static const BOOL USE_THIN_SPLITTERS = YES;
 
- (BOOL)isProcessing
{
return isProcessing_ && ![realParentWindow_ disableProgressIndicators];
return ![[PreferencePanel sharedInstance] hideActivityIndicator] &&
isProcessing_ &&
![realParentWindow_ disableProgressIndicators];
}
 
- (void)setIsProcessing:(BOOL)aFlag
PreferencePanel.m
+ 10
− 0
View file @ 9c5d04e7
@@ -894,6 +894,7 @@ static float versionNumber;
defaultMaxVertically = [prefs objectForKey:@"MaxVertically"] ? [[prefs objectForKey:@"MaxVertically"] boolValue] : NO;
defaultClosingHotkeySwitchesSpaces = [prefs objectForKey:@"ClosingHotkeySwitchesSpaces"] ? [[prefs objectForKey:@"ClosingHotkeySwitchesSpaces"] boolValue] : YES;
defaultUseCompactLabel = [prefs objectForKey:@"UseCompactLabel"]?[[prefs objectForKey:@"UseCompactLabel"] boolValue]: YES;
defaultHideActivityIndicator = [prefs objectForKey:@"HideActivityIndicator"]?[[prefs objectForKey:@"HideActivityIndicator"] boolValue]: NO;
defaultHighlightTabLabels = [prefs objectForKey:@"HighlightTabLabels"]?[[prefs objectForKey:@"HighlightTabLabels"] boolValue]: YES;
defaultAdvancedFontRendering = [prefs objectForKey:@"HiddenAdvancedFontRendering"]?[[prefs objectForKey:@"HiddenAdvancedFontRendering"] boolValue] : NO;
defaultStrokeThickness = [prefs objectForKey:@"HiddenAFRStrokeThickness"] ? [[prefs objectForKey:@"HiddenAFRStrokeThickness"] floatValue] : 0;
@@ -1030,6 +1031,7 @@ static float versionNumber;
[prefs setBool:defaultMaxVertically forKey:@"MaxVertically"];
[prefs setBool:defaultClosingHotkeySwitchesSpaces forKey:@"ClosingHotkeySwitchesSpaces"];
[prefs setBool:defaultUseCompactLabel forKey:@"UseCompactLabel"];
[prefs setBool:defaultHideActivityIndicator forKey:@"HideActivityIndicator"];
[prefs setBool:defaultHighlightTabLabels forKey:@"HighlightTabLabels"];
[prefs setBool:defaultAdvancedFontRendering forKey:@"HiddenAdvancedFontRendering"];
[prefs setFloat:defaultStrokeThickness forKey:@"HiddenAFRStrokeThickness"];
@@ -1110,6 +1112,7 @@ static float versionNumber;
[maxVertically setState: defaultMaxVertically?NSOnState:NSOffState];
[closingHotkeySwitchesSpaces setState:defaultClosingHotkeySwitchesSpaces?NSOnState:NSOffState];
[useCompactLabel setState: defaultUseCompactLabel?NSOnState:NSOffState];
[hideActivityIndicator setState:defaultHideActivityIndicator?NSOnState:NSOffState];
[highlightTabLabels setState: defaultHighlightTabLabels?NSOnState:NSOffState];
[advancedFontRendering setState: defaultAdvancedFontRendering?NSOnState:NSOffState];
[strokeThickness setEnabled:defaultAdvancedFontRendering];
@@ -1257,6 +1260,7 @@ static float versionNumber;
sender == tabPosition ||
sender == hideTab ||
sender == useCompactLabel ||
sender == hideActivityIndicator ||
sender == highlightTabLabels ||
sender == hideScrollbar ||
sender == advancedFontRendering ||
@@ -1269,6 +1273,7 @@ static float versionNumber;
defaultWindowStyle = [windowStyle indexOfSelectedItem];
defaultTabViewType=[tabPosition indexOfSelectedItem];
defaultUseCompactLabel = ([useCompactLabel state] == NSOnState);
defaultHideActivityIndicator = ([hideActivityIndicator state] == NSOnState);
defaultHighlightTabLabels = ([highlightTabLabels state] == NSOnState);
defaultAdvancedFontRendering = ([advancedFontRendering state] == NSOnState);
[strokeThickness setEnabled:defaultAdvancedFontRendering];
@@ -1547,6 +1552,11 @@ static float versionNumber;
return defaultUseCompactLabel;
}
 
- (BOOL)hideActivityIndicator
{
return defaultHideActivityIndicator;
}
- (BOOL)highlightTabLabels
{
return defaultHighlightTabLabels;
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