mirror/munki
1
0
Fork 0
mirror of https://github.com/munki/munki.git synced 2026-03-20 18:30:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merging forced_install_after_date branch to trunk.

Browse Source 
This adds Force Install Notifications support to the MSU GUI, and logouthelper support to managedsoftwareupdate/launchd. Documentation on using the pkginfo force_install_after_date key to come....

This merge also includes localization fixes and on-the-fly updating of the MSU GUI when managedsoftwareupdate runs in the background while the GUI is open, changing InstallInfo.

With this merge, the Munki version is increased to 0.8.0 and MSU GUI version to 3.2.


git-svn-id: http://munki.googlecode.com/svn/trunk@1270 a4e17f2e-e282-11dd-95e1-755cbddbdd66
This commit is contained in:
Justin McWilliams
2011-08-04 19:23:19 +00:00
parent 0e858b098a
commit d03b2ba11f
13 changed files with 510 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/Managed Software Update/MSUStatusWindowController.py
View File

@@ -214,7 +214,7 @@ class MSUStatusWindowController(NSObject):
del pool
def socketEnded_(self, socketSessionResult):
NSApp.delegate().munkiStatusSessionEnded_(socketSessionResult)
NSApp.delegate().munkiStatusSessionEnded_(socketSessionResult)
def processSocketMsg_(self, message):
if message.startswith(u"ACTIVATE: "):
@@ -227,11 +227,10 @@ class MSUStatusWindowController(NSObject):
self.window.orderFront_(self)
return ""
if message.startswith(u"TITLE: "):
self.window.setTitle_(NSLocalizedString(message[7:], None))
self.window.setTitle_(message[7:])
return ""
if message.startswith(u"MESSAGE: "):
self.messageFld.setStringValue_(
NSLocalizedString(message[9:], None))
self.messageFld.setStringValue_(message[9:])
return ""
if message.startswith(u"DETAIL: "):
self.detailFld.setStringValue_(message[8:])
@@ -280,10 +279,10 @@ class MSUStatusWindowController(NSObject):
def doRestartAlert(self):
self.restartAlertDismissed = 0
alert = NSAlert.alertWithMessageText_defaultButton_alternateButton_otherButton_informativeTextWithFormat_(
NSLocalizedString(u"Restart Required", None),
NSLocalizedString(u"Restart", None),
objc.nil,
objc.nil,
NSLocalizedString(u"Restart Required", None),
NSLocalizedString(u"Restart", None),
objc.nil,
objc.nil,
NSLocalizedString(u"Software installed or removed requires a restart. You will have a chance to save open documents.", None))
alert.beginSheetModalForWindow_modalDelegate_didEndSelector_contextInfo_(
self.window, self, self.alertDidEnd_returnCode_contextInfo_, objc.nil)