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

Add UI for adjusting dimming amount.

parent c8a247d8
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
English.lproj/PreferencePanel.xib
+ 298
− 62
View file @ a1346d79
@@ -12,7 +12,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="4440"/>
<integer value="1923"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1294,7 +1294,7 @@
<object class="NSButton" id="219255988">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{283, 138}, {178, 18}}</string>
<string key="NSFrame">{{108, 99}, {178, 18}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="893276983">
@@ -1316,7 +1316,7 @@
<object class="NSButton" id="140624317">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{283, 118}, {186, 18}}</string>
<string key="NSFrame">{{108, 79}, {186, 18}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="592396050">
@@ -1335,18 +1335,18 @@
<int key="NSPeriodicInterval">25</int>
</object>
</object>
<object class="NSButton" id="652260021">
<object class="NSButton" id="191657610">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{283, 98}, {298, 18}}</string>
<string key="NSFrame">{{108, 164}, {298, 18}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="438107074">
<object class="NSButtonCell" key="NSCell" id="880963637">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">Dimming affects only text, not background.</string>
<reference key="NSSupport" ref="966507434"/>
<reference key="NSControlView" ref="652260021"/>
<reference key="NSControlView" ref="191657610"/>
<int key="NSButtonFlags">1211912703</int>
<int key="NSButtonFlags2">2</int>
<reference key="NSNormalImage" ref="93419583"/>
@@ -1360,7 +1360,7 @@
<object class="NSButton" id="1009965154">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{283, 158}, {228, 18}}</string>
<string key="NSFrame">{{429, 206}, {228, 18}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="53143667">
@@ -1382,7 +1382,7 @@
<object class="NSButton" id="253372206">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{283, 78}, {228, 18}}</string>
<string key="NSFrame">{{429, 186}, {228, 18}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="651640814">
@@ -1404,19 +1404,108 @@
<object class="NSTextField" id="42775949">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{282, 182}, {54, 17}}</string>
<string key="NSFrame">{{107, 188}, {66, 17}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="685288966">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents">Display</string>
<string key="NSContents">Dimming</string>
<reference key="NSSupport" ref="907832903"/>
<reference key="NSControlView" ref="42775949"/>
<reference key="NSBackgroundColor" ref="303715562"/>
<reference key="NSTextColor" ref="1014689419"/>
</object>
</object>
<object class="NSTextField" id="833616187">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{428, 230}, {57, 17}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="666654923">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents">Window</string>
<reference key="NSSupport" ref="907832903"/>
<reference key="NSControlView" ref="833616187"/>
<reference key="NSBackgroundColor" ref="303715562"/>
<reference key="NSTextColor" ref="1014689419"/>
</object>
</object>
<object class="NSSlider" id="372963516">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{229, 137}, {177, 21}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSSliderCell" key="NSCell" id="131309719">
<int key="NSCellFlags">-2079981824</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents"/>
<reference key="NSControlView" ref="372963516"/>
<double key="NSMaxValue">0.59999999999999998</double>
<double key="NSMinValue">0.10000000000000001</double>
<double key="NSValue">0.40000000000000002</double>
<double key="NSAltIncValue">0.0</double>
<int key="NSNumberOfTickMarks">0</int>
<int key="NSTickMarkPosition">1</int>
<bool key="NSAllowsTickMarkValuesOnly">NO</bool>
<bool key="NSVertical">NO</bool>
</object>
</object>
<object class="NSTextField" id="314478796">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{107, 141}, {119, 17}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="383151208">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents">Dimming amount:</string>
<reference key="NSSupport" ref="966507434"/>
<reference key="NSControlView" ref="314478796"/>
<reference key="NSBackgroundColor" ref="303715562"/>
<reference key="NSTextColor" ref="1014689419"/>
</object>
</object>
<object class="NSTextField" id="132307304">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{228, 125}, {43, 11}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="813387714">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents">Minimal</string>
<object class="NSFont" key="NSSupport" id="288154494">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">9</double>
<int key="NSfFlags">16</int>
</object>
<reference key="NSControlView" ref="132307304"/>
<reference key="NSBackgroundColor" ref="303715562"/>
<reference key="NSTextColor" ref="1014689419"/>
</object>
</object>
<object class="NSTextField" id="688065204">
<reference key="NSNextResponder" ref="1019983678"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{363, 125}, {44, 11}}</string>
<reference key="NSSuperview" ref="1019983678"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="168445037">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents">Very Dim</string>
<reference key="NSSupport" ref="288154494"/>
<reference key="NSControlView" ref="688065204"/>
<reference key="NSBackgroundColor" ref="303715562"/>
<reference key="NSTextColor" ref="1014689419"/>
</object>
</object>
</object>
<string key="NSFrameSize">{767, 383}</string>
<reference key="NSSuperview" ref="415305200"/>
@@ -3498,11 +3587,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents">Low</string>
<object class="NSFont" key="NSSupport" id="288154494">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">9</double>
<int key="NSfFlags">16</int>
</object>
<reference key="NSSupport" ref="288154494"/>
<reference key="NSControlView" ref="309125475"/>
<reference key="NSBackgroundColor" ref="303715562"/>
<reference key="NSTextColor" ref="1014689419"/>
@@ -3982,7 +4067,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTabViewItem" id="262523333">
<string key="NSIdentifier">Item 5</string>
<object class="NSView" key="NSView" id="678134053">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder" ref="551361709"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -4718,6 +4803,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
<string key="NSFrame">{{10, 33}, {433, 353}}</string>
<reference key="NSSuperview" ref="551361709"/>
</object>
<string key="NSLabel">Window</string>
<reference key="NSColor" ref="303715562"/>
@@ -5362,7 +5448,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<object class="NSTabViewItem" id="457157559">
<string key="NSIdentifier">Item 3</string>
<object class="NSView" key="NSView" id="192458284">
<reference key="NSNextResponder" ref="551361709"/>
<nil key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -5529,6 +5615,7 @@ 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">
@@ -5867,21 +5954,20 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
<string key="NSFrame">{{10, 33}, {433, 353}}</string>
<reference key="NSSuperview" ref="551361709"/>
</object>
<string key="NSLabel">Keys</string>
<reference key="NSColor" ref="303715562"/>
<reference key="NSTabView" ref="551361709"/>
</object>
</object>
<reference key="NSSelectedTabViewItem" ref="457157559"/>
<reference key="NSSelectedTabViewItem" ref="262523333"/>
<reference key="NSFont" ref="966507434"/>
<int key="NSTvFlags">0</int>
<bool key="NSAllowTruncatedLabels">YES</bool>
<bool key="NSDrawsBackground">YES</bool>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="192458284"/>
<reference ref="678134053"/>
</object>
</object>
<object class="NSButton" id="1072403251">
@@ -11218,14 +11304,6 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<int key="connectionID">5207</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">nextKeyView</string>
<reference key="source" ref="219255988"/>
<reference key="destination" ref="253372206"/>
</object>
<int key="connectionID">5208</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">initialFirstResponder</string>
@@ -12010,61 +12088,101 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<int key="connectionID">5323</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">settingChanged:</string>
<reference key="source" ref="155244235"/>
<reference key="destination" ref="140624317"/>
</object>
<int key="connectionID">5327</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">nextKeyView</string>
<reference key="source" ref="903914481"/>
<reference key="destination" ref="840263255"/>
<string key="label">dimBackgroundWindows</string>
<reference key="source" ref="155244235"/>
<reference key="destination" ref="140624317"/>
</object>
<int key="connectionID">5324</int>
<int key="connectionID">5329</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">settingChanged:</string>
<reference key="source" ref="155244235"/>
<reference key="destination" ref="140624317"/>
<reference key="destination" ref="191657610"/>
</object>
<int key="connectionID">5327</int>
<int key="connectionID">5332</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">nextKeyView</string>
<reference key="source" ref="140624317"/>
<reference key="destination" ref="253372206"/>
<string key="label">dimOnlyText</string>
<reference key="source" ref="155244235"/>
<reference key="destination" ref="191657610"/>
</object>
<int key="connectionID">5328</int>
<int key="connectionID">5334</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">dimBackgroundWindows</string>
<string key="label">dimmingAmount</string>
<reference key="source" ref="155244235"/>
<reference key="destination" ref="140624317"/>
<reference key="destination" ref="372963516"/>
</object>
<int key="connectionID">5329</int>
<int key="connectionID">5345</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">settingChanged:</string>
<reference key="source" ref="155244235"/>
<reference key="destination" ref="652260021"/>
<reference key="destination" ref="372963516"/>
</object>
<int key="connectionID">5332</int>
<int key="connectionID">5346</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">nextKeyView</string>
<reference key="source" ref="652260021"/>
<reference key="destination" ref="253372206"/>
<reference key="source" ref="903914481"/>
<reference key="destination" ref="191657610"/>
</object>
<int key="connectionID">5333</int>
<int key="connectionID">5347</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">dimOnlyText</string>
<reference key="source" ref="155244235"/>
<reference key="destination" ref="652260021"/>
<string key="label">nextKeyView</string>
<reference key="source" ref="191657610"/>
<reference key="destination" ref="372963516"/>
</object>
<int key="connectionID">5334</int>
<int key="connectionID">5348</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">nextKeyView</string>
<reference key="source" ref="372963516"/>
<reference key="destination" ref="219255988"/>
</object>
<int key="connectionID">5349</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">nextKeyView</string>
<reference key="source" ref="219255988"/>
<reference key="destination" ref="140624317"/>
</object>
<int key="connectionID">5350</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">nextKeyView</string>
<reference key="source" ref="140624317"/>
<reference key="destination" ref="840263255"/>
</object>
<int key="connectionID">5351</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">nextKeyView</string>
<reference key="source" ref="253372206"/>
<reference key="destination" ref="648902570"/>
</object>
<int key="connectionID">5352</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
@@ -15205,12 +15323,17 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<reference ref="906654666"/>
<reference ref="364295538"/>
<reference ref="212605291"/>
<reference ref="219255988"/>
<reference ref="833616187"/>
<reference ref="1009965154"/>
<reference ref="253372206"/>
<reference ref="42775949"/>
<reference ref="219255988"/>
<reference ref="140624317"/>
<reference ref="652260021"/>
<reference ref="191657610"/>
<reference ref="314478796"/>
<reference ref="372963516"/>
<reference ref="132307304"/>
<reference ref="688065204"/>
</object>
<reference key="parent" ref="75732044"/>
</object>
@@ -17221,17 +17344,87 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<object class="IBObjectRecord">
<int key="objectID">5330</int>
<reference key="object" ref="652260021"/>
<reference key="object" ref="191657610"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="438107074"/>
<reference ref="880963637"/>
</object>
<reference key="parent" ref="1019983678"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5331</int>
<reference key="object" ref="438107074"/>
<reference key="parent" ref="652260021"/>
<reference key="object" ref="880963637"/>
<reference key="parent" ref="191657610"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5335</int>
<reference key="object" ref="833616187"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="666654923"/>
</object>
<reference key="parent" ref="1019983678"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5336</int>
<reference key="object" ref="666654923"/>
<reference key="parent" ref="833616187"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5337</int>
<reference key="object" ref="372963516"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="131309719"/>
</object>
<reference key="parent" ref="1019983678"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5338</int>
<reference key="object" ref="131309719"/>
<reference key="parent" ref="372963516"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5339</int>
<reference key="object" ref="314478796"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="383151208"/>
</object>
<reference key="parent" ref="1019983678"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5340</int>
<reference key="object" ref="383151208"/>
<reference key="parent" ref="314478796"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5341</int>
<reference key="object" ref="132307304"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="813387714"/>
</object>
<reference key="parent" ref="1019983678"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5342</int>
<reference key="object" ref="813387714"/>
<reference key="parent" ref="132307304"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5343</int>
<reference key="object" ref="688065204"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="168445037"/>
</object>
<reference key="parent" ref="1019983678"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">5344</int>
<reference key="object" ref="168445037"/>
<reference key="parent" ref="688065204"/>
</object>
</object>
</object>
@@ -18296,6 +18489,20 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>5330.IBPluginDependency</string>
<string>5330.IBViewBoundsToFrameTransform</string>
<string>5331.IBPluginDependency</string>
<string>5335.IBPluginDependency</string>
<string>5335.IBViewBoundsToFrameTransform</string>
<string>5336.IBPluginDependency</string>
<string>5337.IBPluginDependency</string>
<string>5337.IBViewBoundsToFrameTransform</string>
<string>5338.IBPluginDependency</string>
<string>5339.IBPluginDependency</string>
<string>5340.IBPluginDependency</string>
<string>5341.IBPluginDependency</string>
<string>5341.IBViewBoundsToFrameTransform</string>
<string>5342.IBPluginDependency</string>
<string>5343.IBPluginDependency</string>
<string>5343.IBViewBoundsToFrameTransform</string>
<string>5344.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -19219,12 +19426,12 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABD2AAAw2kAAA</bytes>
<bytes key="NSTransformStruct">P4AAAL+AAABDjYAAwy4AAA</bytes>
</object>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABD14AAw4AAAA</bytes>
<bytes key="NSTransformStruct">P4AAAL+AAABDjQAAw0UAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -19539,7 +19746,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABD2AAAw0EAAA</bytes>
<bytes key="NSTransformStruct">P4AAAL+AAABDjYAAwrwAAA</bytes>
</object>
<boolean value="YES"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -19573,7 +19780,29 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABD2AAAw1UAAA</bytes>
<bytes key="NSTransformStruct">P4AAAL+AAABC2AAAwwwAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDj4AAw0AAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDsgAAwwcAAA</bytes>
</object>
<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+AAABDZAAAwwYAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSAffineTransform">
<bytes key="NSTransformStruct">P4AAAL+AAABDy4AAwwYAAA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
@@ -19594,7 +19823,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">5334</int>
<int key="maxID">5352</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -19989,6 +20218,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>dimBackgroundWindows</string>
<string>dimInactiveSplitPanes</string>
<string>dimOnlyText</string>
<string>dimmingAmount</string>
<string>disableSmcupRmcup</string>
<string>disableWindowResizing</string>
<string>displayFontAccessoryView</string>
@@ -20187,6 +20417,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>NSButton</string>
<string>NSButton</string>
<string>NSButton</string>
<string>NSSlider</string>
<string>NSButton</string>
<string>NSButton</string>
<string>NSView</string>
@@ -20388,6 +20619,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string>dimBackgroundWindows</string>
<string>dimInactiveSplitPanes</string>
<string>dimOnlyText</string>
<string>dimmingAmount</string>
<string>disableSmcupRmcup</string>
<string>disableWindowResizing</string>
<string>displayFontAccessoryView</string>
@@ -20832,6 +21064,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
<string key="name">dimOnlyText</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">dimmingAmount</string>
<string key="candidateClassName">NSSlider</string>
</object>
<object class="IBToOneOutletInfo">
<string key="name">disableSmcupRmcup</string>
<string key="candidateClassName">NSButton</string>
Headers/iTerm/PreferencePanel.h
+ 5
− 0
View file @ a1346d79
@@ -184,6 +184,10 @@ typedef enum { CURSOR_UNDERLINE, CURSOR_VERTICAL, CURSOR_BOX } ITermCursorType;
IBOutlet NSButton* dimOnlyText;
BOOL defaultDimOnlyText;
 
// Dimming amount
IBOutlet NSSlider* dimmingAmount;
float defaultDimmingAmount;
// Window border
IBOutlet NSButton* showWindowBorder;
BOOL defaultShowWindowBorder;
@@ -512,6 +516,7 @@ typedef enum { BulkCopyColors, BulkCopyDisplay, BulkCopyWindow, BulkCopyTerminal
- (BOOL)dimInactiveSplitPanes;
- (BOOL)dimBackgroundWindows;
- (BOOL)dimOnlyText;
- (float)dimmingAmount;
- (BOOL)checkTestRelease;
- (BOOL)legacySmartCursorColor;
- (float)legacyMinimumContrast;
PreferencePanel.m
+ 10
− 0
View file @ a1346d79
@@ -917,6 +917,7 @@ static float versionNumber;
defaultDimInactiveSplitPanes = [prefs objectForKey:@"DimInactiveSplitPanes"]?[[prefs objectForKey:@"DimInactiveSplitPanes"] boolValue]: YES;
defaultDimBackgroundWindows = [prefs objectForKey:@"DimBackgroundWindows"]?[[prefs objectForKey:@"DimBackgroundWindows"] boolValue]: NO;
defaultDimOnlyText = [prefs objectForKey:@"DimOnlyText"]?[[prefs objectForKey:@"DimOnlyText"] boolValue]: NO;
defaultDimmingAmount = [prefs objectForKey:@"SplitPaneDimmingAmount"] ? [[prefs objectForKey:@"SplitPaneDimmingAmount"] floatValue] : 0.4;
defaultShowWindowBorder = [[prefs objectForKey:@"UseBorder"] boolValue];
defaultLionStyleFullscreen = [prefs objectForKey:@"UseLionStyleFullscreen"] ? [[prefs objectForKey:@"UseLionStyleFullscreen"] boolValue] : YES;
 
@@ -1048,6 +1049,7 @@ static float versionNumber;
[prefs setBool:defaultDimInactiveSplitPanes forKey:@"DimInactiveSplitPanes"];
[prefs setBool:defaultDimBackgroundWindows forKey:@"DimBackgroundWindows"];
[prefs setBool:defaultDimOnlyText forKey:@"DimOnlyText"];
[prefs setFloat:defaultDimmingAmount forKey:@"SplitPaneDimmingAmount"];
[prefs setBool:defaultShowWindowBorder forKey:@"UseBorder"];
[prefs setBool:defaultLionStyleFullscreen forKey:@"UseLionStyleFullscreen"];
 
@@ -1142,6 +1144,7 @@ static float versionNumber;
[dimInactiveSplitPanes setState:defaultDimInactiveSplitPanes?NSOnState:NSOffState];
[dimBackgroundWindows setState:defaultDimBackgroundWindows?NSOnState:NSOffState];
[dimOnlyText setState:defaultDimOnlyText?NSOnState:NSOffState];
[dimmingAmount setFloatValue:defaultDimmingAmount];
[showWindowBorder setState:defaultShowWindowBorder?NSOnState:NSOffState];
[lionStyleFullscreen setState:defaultLionStyleFullscreen?NSOnState:NSOffState];
 
@@ -1255,6 +1258,7 @@ static float versionNumber;
sender == dimInactiveSplitPanes ||
sender == dimBackgroundWindows ||
sender == dimOnlyText ||
sender == dimmingAmount ||
sender == showWindowBorder) {
defaultWindowStyle = [windowStyle indexOfSelectedItem];
defaultTabViewType=[tabPosition indexOfSelectedItem];
@@ -1270,6 +1274,7 @@ static float versionNumber;
defaultDimInactiveSplitPanes = ([dimInactiveSplitPanes state] == NSOnState);
defaultDimBackgroundWindows = ([dimBackgroundWindows state] == NSOnState);
defaultDimOnlyText = ([dimOnlyText state] == NSOnState);
defaultDimmingAmount = [dimmingAmount floatValue];
defaultShowWindowBorder = ([showWindowBorder state] == NSOnState);
defaultHideScrollbar = ([hideScrollbar state] == NSOnState);
[[NSNotificationCenter defaultCenter] postNotificationName:@"iTermRefreshTerminal"
@@ -1694,6 +1699,11 @@ static float versionNumber;
return defaultDimOnlyText;
}
 
- (float)dimmingAmount
{
return defaultDimmingAmount;
}
- (BOOL)showWindowBorder
{
return defaultShowWindowBorder;
PseudoTerminal.m
+ 3
− 0
View file @ a1346d79
@@ -2991,6 +2991,9 @@ NSString *sessionsKey = @"sessions";
[[aSession view] setDimmed:NO];
}
[[aSession view] setBackgroundDimmed:![[self window] isKeyWindow]];
// In case dimming amount slider moved update the dimming amount.
[[aSession view] updateDim];
}
}
}
SessionView.h
+ 1
− 0
View file @ a1346d79
@@ -60,6 +60,7 @@
- (int)viewId;
- (void)setViewId:(int)id;
- (void)setBackgroundDimmed:(BOOL)backgroundDimmed;
- (void)updateDim;
- (BOOL)backgroundDimmed;
 
@end
SessionView.m
+ 17
− 12
View file @ a1346d79
@@ -148,19 +148,24 @@ static NSDate* lastResizeDate_;
 
- (double)dimmedDimmingAmount
{
NSNumber* n = [[NSUserDefaults standardUserDefaults] objectForKey:@"SplitPaneDimmingAmount"];
return n ? [n doubleValue] : 0.4;
return [[PreferencePanel sharedInstance] dimmingAmount];
}
 
- (void)_updateDim
- (void)updateDim
{
double x= 0;
if (dim_) x += 1;
if (backgroundDimmed_) x += 1;
// 0 -> 0
// 1 -> dimmedDimmingAmount
// 2 -> 4/3 * dimmedDimmingAmount
double amount = (1 - 1 / (1 + x)) * [self dimmedDimmingAmount] * 2;
int x = 0;
if (dim_) {
x++;
}
if (backgroundDimmed_) {
x++;
}
double scale[] = { 0, 1.0, 1.5 };
double amount = scale[x] * [self dimmedDimmingAmount];
// Cap amount within reasonable bounds. Before 1.1, dimming amount was only changed by
// twiddling the prefs file so it could have all kinds of crazy values.
amount = MIN(0.9, amount);
amount = MAX(0.1, amount);
 
[self _dimShadeToDimmingAmount:amount];
}
@@ -174,7 +179,7 @@ static NSDate* lastResizeDate_;
return;
}
dim_ = isDimmed;
[self _updateDim];
[self updateDim];
}
 
- (void)setBackgroundDimmed:(BOOL)backgroundDimmed
@@ -186,7 +191,7 @@ static NSDate* lastResizeDate_;
backgroundDimmed_ = NO;
}
if (backgroundDimmed_ != orig) {
[self _updateDim];
[self updateDim];
}
}
 
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