mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-01-05 14:10:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

In Managed Software Update.app, replaced NSTextView that was used to display detail with a WebView.

Browse Source 
appleupdate.py - parseDist() now returns HTML description without trying to convert it to plain text. This HTML description is displayed in Managed Software Update.app's new WebView.

git-svn-id: http://munki.googlecode.com/svn/trunk@456 a4e17f2e-e282-11dd-95e1-755cbddbdd66
This commit is contained in:
Greg Neagle
2010-02-10 18:26:44 +00:00
parent 6b3c47e3e5
commit a4cf1dfb04
5 changed files with 155 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

342
code/ManagedSoftwareUpdate/English.lproj/MainMenu.xib
View File

@@ -8,10 +8,12 @@
<string key="IBDocument.HIToolboxVersion">353.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
<integer value="432"/>
<integer value="284"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>com.apple.WebKitIBPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
@@ -39,7 +41,7 @@
<object class="NSWindowTemplate" id="801548761">
<int key="NSWindowStyleMask">15</int>
<int key="NSWindowBacking">2</int>
<string key="NSWindowRect">{{481, 225}, {512, 562}}</string>
<string key="NSWindowRect">{{481, 236}, {512, 551}}</string>
<int key="NSWTFlags">1886912512</int>
<string key="NSWindowTitle">Managed Software Update</string>
<string key="NSWindowClass">NSWindow</string>
@@ -49,7 +51,7 @@
<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
<string key="NSWindowContentMinSize">{512, 400}</string>
<object class="NSView" key="NSWindowView" id="903778767">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -76,7 +78,7 @@
<object class="NSTableView" id="53497180">
<reference key="NSNextResponder" ref="777307915"/>
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{455, 166}</string>
<string key="NSFrameSize">{455, 161}</string>
<reference key="NSSuperview" ref="777307915"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTableHeaderView" key="NSHeaderView" id="617599729">
@@ -233,8 +235,9 @@
<bool key="NSAllowsTypeSelect">YES</bool>
</object>
</object>
<string key="NSFrame">{{1, 17}, {455, 166}}</string>
<string key="NSFrame">{{1, 17}, {455, 161}}</string>
<reference key="NSSuperview" ref="985502720"/>
<reference key="NSNextKeyView" ref="53497180"/>
<reference key="NSDocView" ref="53497180"/>
<reference key="NSBGColor" ref="109447862"/>
<int key="NScvFlags">4</int>
@@ -242,7 +245,7 @@
<object class="NSScroller" id="227102026">
<reference key="NSNextResponder" ref="985502720"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{456, 17}, {15, 166}}</string>
<string key="NSFrame">{{456, 17}, {15, 161}}</string>
<reference key="NSSuperview" ref="985502720"/>
<reference key="NSTarget" ref="985502720"/>
<string key="NSAction">_doScroller:</string>
@@ -268,14 +271,16 @@
</object>
<string key="NSFrame">{{1, 0}, {455, 17}}</string>
<reference key="NSSuperview" ref="985502720"/>
<reference key="NSNextKeyView" ref="617599729"/>
<reference key="NSDocView" ref="617599729"/>
<reference key="NSBGColor" ref="109447862"/>
<int key="NScvFlags">4</int>
</object>
<reference ref="833021935"/>
</object>
<string key="NSFrameSize">{472, 184}</string>
<string key="NSFrameSize">{472, 179}</string>
<reference key="NSSuperview" ref="295876090"/>
<reference key="NSNextKeyView" ref="777307915"/>
<int key="NSsFlags">18</int>
<reference key="NSVScroller" ref="227102026"/>
<reference key="NSHScroller" ref="327643168"/>
@@ -285,7 +290,7 @@
<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
</object>
</object>
<string key="NSFrameSize">{472, 184}</string>
<string key="NSFrameSize">{472, 179}</string>
<reference key="NSSuperview" ref="472008763"/>
<string key="NSClassName">NSView</string>
</object>
@@ -294,137 +299,79 @@
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSScrollView" id="859465562">
<object class="WebView" id="945652477">
<reference key="NSNextResponder" ref="1071499899"/>
<int key="NSvFlags">274</int>
<object class="NSMutableArray" key="NSSubviews">
<object class="NSMutableSet" key="NSDragTypes">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSClipView" id="805691830">
<reference key="NSNextResponder" ref="859465562"/>
<int key="NSvFlags">2304</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTextView" id="973913323">
<reference key="NSNextResponder" ref="805691830"/>
<int key="NSvFlags">2322</int>
<string key="NSFrameSize">{455, 14}</string>
<reference key="NSSuperview" ref="805691830"/>
<object class="NSTextContainer" key="NSTextContainer" id="415458352">
<object class="NSLayoutManager" key="NSLayoutManager">
<object class="NSTextStorage" key="NSTextStorage">
<object class="NSMutableString" key="NSString">
<characters key="NS.bytes"/>
</object>
<nil key="NSDelegate"/>
</object>
<object class="NSMutableArray" key="NSTextContainers">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="415458352"/>
</object>
<int key="NSLMFlags">6</int>
<nil key="NSDelegate"/>
</object>
<reference key="NSTextView" ref="973913323"/>
<double key="NSWidth">4.550000e+02</double>
<int key="NSTCFlags">1</int>
</object>
<object class="NSTextViewSharedData" key="NSSharedData">
<int key="NSFlags">264453</int>
<reference key="NSBackgroundColor" ref="53165393"/>
<reference key="NSInsertionColor" ref="950032219"/>
<object class="NSDictionary" key="NSSelectedAttributes">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMutableArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSBackgroundColor</string>
<string>NSColor</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSColor">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">selectedTextBackgroundColor</string>
<reference key="NSColor" ref="395828891"/>
</object>
<object class="NSColor">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">selectedTextColor</string>
<reference key="NSColor" ref="950032219"/>
</object>
</object>
</object>
<nil key="NSMarkedAttributes"/>
<object class="NSDictionary" key="NSLinkAttributes">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMutableArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>NSColor</string>
<string>NSUnderline</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MCAwIDEAA</bytes>
</object>
<integer value="1" id="9"/>
</object>
</object>
<nil key="NSDefaultParagraphStyle"/>
</object>
<int key="NSTVFlags">6</int>
<string key="NSMaxSize">{927, 1e+07}</string>
<string key="NSMinize">{223, 0}</string>
<nil key="NSDelegate"/>
</object>
</object>
<string key="NSFrame">{{1, 1}, {455, 201}}</string>
<reference key="NSSuperview" ref="859465562"/>
<reference key="NSDocView" ref="973913323"/>
<reference key="NSBGColor" ref="53165393"/>
<object class="NSCursor" key="NSCursor">
<string key="NSHotSpot">{4, -5}</string>
<int key="NSCursorType">1</int>
</object>
<int key="NScvFlags">4</int>
</object>
<object class="NSScroller" id="175863863">
<reference key="NSNextResponder" ref="859465562"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{456, 1}, {15, 201}}</string>
<reference key="NSSuperview" ref="859465562"/>
<reference key="NSTarget" ref="859465562"/>
<string key="NSAction">_doScroller:</string>
<double key="NSPercent">9.696970e-01</double>
</object>
<object class="NSScroller" id="283795066">
<reference key="NSNextResponder" ref="859465562"/>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
<reference key="NSSuperview" ref="859465562"/>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="859465562"/>
<string key="NSAction">_doScroller:</string>
<double key="NSCurValue">1.000000e+00</double>
<double key="NSPercent">9.456522e-01</double>
<object class="NSMutableArray" key="set.sortedObjects">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>Apple HTML pasteboard type</string>
<string>Apple PDF pasteboard type</string>
<string>Apple PICT pasteboard type</string>
<string>Apple URL pasteboard type</string>
<string>Apple Web Archive pasteboard type</string>
<string>NSColor pasteboard type</string>
<string>NSFilenamesPboardType</string>
<string>NSStringPboardType</string>
<string>NeXT RTFD pasteboard type</string>
<string>NeXT Rich Text Format v1.0 pasteboard type</string>
<string>NeXT TIFF v4.0 pasteboard type</string>
<string>WebURLsWithTitlesPboardType</string>
<string>public.png</string>
<string>public.url</string>
<string>public.url-name</string>
</object>
</object>
<string key="NSFrameSize">{472, 203}</string>
<string key="NSFrameSize">{472, 197}</string>
<reference key="NSSuperview" ref="1071499899"/>
<int key="NSsFlags">18</int>
<reference key="NSVScroller" ref="175863863"/>
<reference key="NSHScroller" ref="283795066"/>
<reference key="NSContentView" ref="805691830"/>
<reference key="NSNextKeyView"/>
<string key="FrameName"/>
<string key="GroupName"/>
<object class="WebPreferences" key="Preferences">
<string key="Identifier"/>
<object class="NSMutableDictionary" key="Values">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSMutableArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>WebKitAllowAnimatedImageLoopingPreferenceKey</string>
<string>WebKitAllowAnimatedImagesPreferenceKey</string>
<string>WebKitDefaultFixedFontSize</string>
<string>WebKitDefaultFontSize</string>
<string>WebKitDisplayImagesKey</string>
<string>WebKitJavaEnabled</string>
<string>WebKitJavaScriptCanOpenWindowsAutomatically</string>
<string>WebKitJavaScriptEnabled</string>
<string>WebKitMinimumFontSize</string>
<string>WebKitPluginsEnabled</string>
<string>WebKitStandardFont</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
<boolean value="NO" id="6"/>
<reference ref="6"/>
<integer value="12" id="680676625"/>
<reference ref="680676625"/>
<reference ref="6"/>
<reference ref="6"/>
<reference ref="6"/>
<reference ref="6"/>
<reference ref="680676625"/>
<reference ref="6"/>
<string>Lucida Sans</string>
</object>
</object>
</object>
<bool key="UseBackForwardList">NO</bool>
<bool key="AllowsUndo">YES</bool>
</object>
</object>
<string key="NSFrame">{{0, 193}, {472, 203}}</string>
<string key="NSFrame">{{0, 188}, {472, 197}}</string>
<reference key="NSSuperview" ref="472008763"/>
<string key="NSClassName">NSView</string>
</object>
</object>
<string key="NSFrame">{{20, 66}, {472, 396}}</string>
<string key="NSFrame">{{20, 66}, {472, 385}}</string>
<reference key="NSSuperview" ref="903778767"/>
</object>
<object class="NSButton" id="910886033">
@@ -470,7 +417,7 @@
<object class="NSTextField" id="51114936">
<reference key="NSNextResponder" ref="903778767"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{104, 521}, {340, 17}}</string>
<string key="NSFrame">{{104, 510}, {340, 17}}</string>
<reference key="NSSuperview" ref="903778767"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1073509984">
@@ -495,7 +442,7 @@
<object class="NSTextField" id="694331522">
<reference key="NSNextResponder" ref="903778767"/>
<int key="NSvFlags">266</int>
<string key="NSFrame">{{104, 479}, {385, 34}}</string>
<string key="NSFrame">{{104, 468}, {385, 34}}</string>
<reference key="NSSuperview" ref="903778767"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="40803293">
@@ -528,7 +475,7 @@ ZHkgdG8gdXBkYXRlIG5vdywgeW91IGNhbiBjaG9vc2UgdG8gdXBkYXRlIGxhdGVyLg</string>
<string>NeXT TIFF v4.0 pasteboard type</string>
</object>
</object>
<string key="NSFrame">{{24, 479}, {64, 64}}</string>
<string key="NSFrame">{{24, 468}, {64, 64}}</string>
<reference key="NSSuperview" ref="903778767"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="1039899895">
@@ -563,7 +510,8 @@ ZHkgdG8gdXBkYXRlIG5vdywgeW91IGNhbiBjaG9vc2UgdG8gdXBkYXRlIGxhdGVyLg</string>
</object>
</object>
</object>
<string key="NSFrameSize">{512, 562}</string>
<string key="NSFrameSize">{512, 551}</string>
<reference key="NSSuperview"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
<string key="NSMinSize">{512, 422}</string>
@@ -879,6 +827,9 @@ ZHkgdG8gdXBkYXRlIG5vdywgeW91IGNhbiBjaG9vc2UgdG8gdXBkYXRlIGxhdGVyLg</string>
</object>
<string key="NSName">_NSMainMenu</string>
</object>
<object class="NSCustomObject" id="1019164612">
<string key="NSClassName">MSUWebViewPolicyDelegate</string>
</object>
</object>
<object class="IBObjectContainer" key="IBDocument.Objects">
<object class="NSMutableArray" key="connectionRecords">
@@ -1003,6 +954,14 @@ ZHkgdG8gdXBkYXRlIG5vdywgeW91IGNhbiBjaG9vc2UgdG8gdXBkYXRlIGxhdGVyLg</string>
</object>
<int key="connectionID">384</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">policyDelegate</string>
<reference key="source" ref="945652477"/>
<reference key="destination" ref="1019164612"/>
</object>
<int key="connectionID">478</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -1321,15 +1280,6 @@ ZHkgdG8gdXBkYXRlIG5vdywgeW91IGNhbiBjaG9vc2UgdG8gdXBkYXRlIGxhdGVyLg</string>
</object>
<reference key="parent" ref="472008763"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">432</int>
<reference key="object" ref="1071499899"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="859465562"/>
</object>
<reference key="parent" ref="472008763"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">433</int>
<reference key="object" ref="910886033"/>
@@ -1480,32 +1430,6 @@ ZHkgdG8gdXBkYXRlIG5vdywgeW91IGNhbiBjaG9vc2UgdG8gdXBkYXRlIGxhdGVyLg</string>
<reference key="object" ref="1039899895"/>
<reference key="parent" ref="1020013803"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">469</int>
<reference key="object" ref="859465562"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="175863863"/>
<reference ref="283795066"/>
<reference ref="973913323"/>
</object>
<reference key="parent" ref="1071499899"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">470</int>
<reference key="object" ref="175863863"/>
<reference key="parent" ref="859465562"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">471</int>
<reference key="object" ref="283795066"/>
<reference key="parent" ref="859465562"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">472</int>
<reference key="object" ref="973913323"/>
<reference key="parent" ref="859465562"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">473</int>
<reference key="object" ref="592213051"/>
@@ -1520,6 +1444,25 @@ ZHkgdG8gdXBkYXRlIG5vdywgeW91IGNhbiBjaG9vc2UgdG8gdXBkYXRlIGxhdGVyLg</string>
<reference key="object" ref="438128796"/>
<reference key="parent" ref="592213051"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">432</int>
<reference key="object" ref="1071499899"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="945652477"/>
</object>
<reference key="parent" ref="472008763"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">475</int>
<reference key="object" ref="945652477"/>
<reference key="parent" ref="1071499899"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">476</int>
<reference key="object" ref="1019164612"/>
<reference key="parent" ref="328754663"/>
</object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -1661,15 +1604,12 @@ ZHkgdG8gdXBkYXRlIG5vdywgeW91IGNhbiBjaG9vc2UgdG8gdXBkYXRlIGxhdGVyLg</string>
<string>454.IBPluginDependency</string>
<string>459.IBPluginDependency</string>
<string>460.IBPluginDependency</string>
<string>469.IBAttributePlaceholdersKey</string>
<string>469.IBPluginDependency</string>
<string>470.IBPluginDependency</string>
<string>471.IBPluginDependency</string>
<string>472.IBAttributePlaceholdersKey</string>
<string>472.IBPluginDependency</string>
<string>473.IBAttributePlaceholdersKey</string>
<string>473.IBPluginDependency</string>
<string>474.IBPluginDependency</string>
<string>475.IBAttributePlaceholdersKey</string>
<string>475.IBPluginDependency</string>
<string>476.IBPluginDependency</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -1704,7 +1644,7 @@ ZHkgdG8gdXBkYXRlIG5vdywgeW91IGNhbiBjaG9vc2UgdG8gdXBkYXRlIGxhdGVyLg</string>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<integer value="1" id="9"/>
<object class="NSMutableDictionary">
<string key="NS.key.0">IBAppleScriptAttributeName</string>
<object class="IBAppleScriptInfoAttribute" key="NS.object.0">
@@ -1722,10 +1662,10 @@ ZHkgdG8gdXBkYXRlIG5vdywgeW91IGNhbiBjaG9vc2UgdG8gdXBkYXRlIGxhdGVyLg</string>
<string key="appleScriptObjectName">mainWindow</string>
</object>
</object>
<string>{{156, 216}, {512, 562}}</string>
<string>{{156, 216}, {512, 562}}</string>
<string>{{174, -129}, {512, 551}}</string>
<string>{{174, -129}, {512, 551}}</string>
<reference ref="9"/>
<boolean value="NO" id="6"/>
<reference ref="6"/>
<string>{{616, 297}, {480, 360}}</string>
<reference ref="6"/>
<reference ref="9"/>
@@ -1998,34 +1938,6 @@ ZHkgdG8gdXBkYXRlIG5vdywgeW91IGNhbiBjaG9vc2UgdG8gdXBkYXRlIGxhdGVyLg</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableDictionary">
<string key="NS.key.0">IBAppleScriptAttributeName</string>
<object class="IBAppleScriptInfoAttribute" key="NS.object.0">
<string key="name">IBAppleScriptAttributeName</string>
<reference key="object" ref="859465562"/>
<int key="appleScriptObjectID">0</int>
<int key="appleScriptScriptScope">0</int>
<nil key="appleScriptEventHandlerNames"/>
<string key="appleScriptScriptName">ManagedSoftwareUpdate.applescript</string>
<string key="appleScriptObjectName">descriptionScrollView</string>
</object>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableDictionary">
<string key="NS.key.0">IBAppleScriptAttributeName</string>
<object class="IBAppleScriptInfoAttribute" key="NS.object.0">
<string key="name">IBAppleScriptAttributeName</string>
<reference key="object" ref="973913323"/>
<int key="appleScriptObjectID">0</int>
<int key="appleScriptScriptScope">0</int>
<nil key="appleScriptEventHandlerNames"/>
<string key="appleScriptScriptName">ManagedSoftwareUpdate.applescript</string>
<string key="appleScriptObjectName">description</string>
</object>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableDictionary">
<string key="NS.key.0">IBAppleScriptAttributeName</string>
<object class="IBAppleScriptInfoAttribute" key="NS.object.0">
@@ -2040,6 +1952,20 @@ ZHkgdG8gdXBkYXRlIG5vdywgeW91IGNhbiBjaG9vc2UgdG8gdXBkYXRlIGxhdGVyLg</string>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<object class="NSMutableDictionary">
<string key="NS.key.0">IBAppleScriptAttributeName</string>
<object class="IBAppleScriptInfoAttribute" key="NS.object.0">
<string key="name">IBAppleScriptAttributeName</string>
<reference key="object" ref="945652477"/>
<int key="appleScriptObjectID">0</int>
<int key="appleScriptScriptScope">0</int>
<nil key="appleScriptEventHandlerNames"/>
<string key="appleScriptScriptName">ManagedSoftwareUpdate.applescript</string>
<string key="appleScriptObjectName">description</string>
</object>
</object>
<string>com.apple.WebKitIBPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</object>
</object>
<object class="NSMutableDictionary" key="unlocalizedProperties">
@@ -2062,7 +1988,7 @@ ZHkgdG8gdXBkYXRlIG5vdywgeW91IGNhbiBjaG9vc2UgdG8gdXBkYXRlIGxhdGVyLg</string>
</object>
</object>
<nil key="sourceID"/>
<int key="maxID">474</int>
<int key="maxID">478</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -2075,6 +2001,14 @@ ZHkgdG8gdXBkYXRlIG5vdywgeW91IGNhbiBjaG9vc2UgdG8gdXBkYXRlIGxhdGVyLg</string>
<string key="minorKey"/>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">MSUWebViewPolicyDelegate</string>
<string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">MSUWebViewPolicyDelegate.h</string>
</object>
</object>
</object>
</object>
<int key="IBDocument.localizationMode">0</int>

4
code/ManagedSoftwareUpdate/Info.plist
View File

@@ -17,11 +17,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.4.0</string>
<string>1.5.0</string>
<key>CFBundleSignature</key>
<string>mMSU</string>
<key>CFBundleVersion</key>
<string>1.4.0</string>
<string>1.5.0</string>
<key>NSAppleScriptEnabled</key>
<string>YES</string>
<key>NSMainNibFile</key>

13
code/ManagedSoftwareUpdate/ManagedSoftwareUpdate.applescript
View File

@@ -259,18 +259,11 @@ on selection changed theObject
if selected data rows of theObject is not {} then
set theDataRow to selected data row of theObject
set theDescription to the contents of data cell "description" of theDataRow
set theRestartAction to the contents of data cell "restartaction" of theDataRow
if theRestartAction is "RequireRestart" or theRestartAction is "RecommendRestart" then
set theRestartAction to return & "Restart required after install."
else if theRestartAction is "RequireLogout" then
set theRestartAction to return & "Logout required before install."
end if
set theText to theDescription & return & theRestartAction
else
set theText to ""
set theDescription to ""
end if
set contents of text view "description" of scroll view ¬
"descriptionScrollView" of view "splitViewBottom" of split view "splitView" of window id 1 to theText
set webview to call method "mainFrame" of object (view "description" of view "splitViewBottom" of split view "splitView" of window id 1)
call method "loadHTMLString:baseURL:" of webview with parameter theDescription
end if
end selection changed

12
code/ManagedSoftwareUpdate/ManagedSoftwareUpdate.xcodeproj/project.pbxproj
View File

@@ -35,6 +35,9 @@
C0ACDAAC0FB4A387006D30B3 /* package.tiff in Resources */ = {isa = PBXBuildFile; fileRef = C0ACDA9F0FB4A386006D30B3 /* package.tiff */; };
C0ACDAAD0FB4A387006D30B3 /* Restart.tif in Resources */ = {isa = PBXBuildFile; fileRef = C0ACDAA00FB4A386006D30B3 /* Restart.tif */; };
C0ACDAB00FB4A387006D30B3 /* RestartReq.tif in Resources */ = {isa = PBXBuildFile; fileRef = C0ACDAA30FB4A386006D30B3 /* RestartReq.tif */; };
C0B5D690112260A6009453BD /* MSUWebViewPolicyDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = C0B5D68E112260A6009453BD /* MSUWebViewPolicyDelegate.h */; };
C0B5D691112260A6009453BD /* MSUWebViewPolicyDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = C0B5D68F112260A6009453BD /* MSUWebViewPolicyDelegate.m */; };
C0B5D6F0112266FF009453BD /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C0B5D6EF112266FF009453BD /* WebKit.framework */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
@@ -56,6 +59,9 @@
C0ACDA9F0FB4A386006D30B3 /* package.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = package.tiff; sourceTree = "<group>"; };
C0ACDAA00FB4A386006D30B3 /* Restart.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = Restart.tif; sourceTree = "<group>"; };
C0ACDAA30FB4A386006D30B3 /* RestartReq.tif */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; path = RestartReq.tif; sourceTree = "<group>"; };
C0B5D68E112260A6009453BD /* MSUWebViewPolicyDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MSUWebViewPolicyDelegate.h; sourceTree = "<group>"; };
C0B5D68F112260A6009453BD /* MSUWebViewPolicyDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MSUWebViewPolicyDelegate.m; sourceTree = "<group>"; };
C0B5D6EF112266FF009453BD /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = System/Library/Frameworks/WebKit.framework; sourceTree = SDKROOT; };
DA206CF1015C4E2903C91932 /* AppleScriptKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppleScriptKit.framework; path = /System/Library/Frameworks/AppleScriptKit.framework; sourceTree = "<absolute>"; };
DA206CF3015C4E8B03C91932 /* ManagedSoftwareUpdate.applescript */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.applescript; path = ManagedSoftwareUpdate.applescript; sourceTree = "<group>"; };
/* End PBXFileReference section */
@@ -67,6 +73,7 @@
files = (
257572CC072881A4000BE9CA /* Cocoa.framework in Frameworks */,
257572CD072881A4000BE9CA /* AppleScriptKit.framework in Frameworks */,
C0B5D6F0112266FF009453BD /* WebKit.framework in Frameworks */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -124,6 +131,8 @@
isa = PBXGroup;
children = (
29B97316FDCFA39411CA2CEA /* main.m */,
C0B5D68E112260A6009453BD /* MSUWebViewPolicyDelegate.h */,
C0B5D68F112260A6009453BD /* MSUWebViewPolicyDelegate.m */,
);
name = "Other Sources";
sourceTree = "<group>";
@@ -150,6 +159,7 @@
29B97323FDCFA39411CA2CEA /* Frameworks */ = {
isa = PBXGroup;
children = (
C0B5D6EF112266FF009453BD /* WebKit.framework */,
1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
);
@@ -163,6 +173,7 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
C0B5D690112260A6009453BD /* MSUWebViewPolicyDelegate.h in Headers */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -233,6 +244,7 @@
buildActionMask = 2147483647;
files = (
257572CA072881A4000BE9CA /* main.m in Sources */,
C0B5D691112260A6009453BD /* MSUWebViewPolicyDelegate.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

27
code/client/munkilib/appleupdates.py
View File

@@ -315,33 +315,6 @@ def parseDist(filename):
# append the line to the description
description += line + "\n"
if description:
# low-brow convert from HTML to plain text
# get rid of embedded styles:
p = re.compile('<style[^<>]*>[^<>]*</style>')
description = p.sub('',description)
# replace <li> with '• '
p = re.compile('<li>')
description = p.sub(u'• ',description)
# then get rid of all HTML tags
p = re.compile('<[^<>]*>')
description = p.sub('',description)
# then get entities
p = re.compile('&nbsp;')
description = p.sub(' ',description)
p = re.compile('&lt;')
description = p.sub('<',description)
p = re.compile('&gt;')
description = p.sub('>',description)
# fix escaped single quotes
p = re.compile("\\\\'")
description = p.sub("'",description)
# replace two or more consecutive blank lines with one
p = re.compile('\\n{3,}')
description = p.sub("\\n\\n",description)
# get rid of leading blank lines, tabs, and spaces
description = description.lstrip("\n \t").rstrip("\n \t")
return title, vers, description