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

Don't display on battery power warning unless charge is less than 50%. Reverse buttons in warning dialog to match those in Apple Software Update.

Browse Source
This commit is contained in:
Greg Neagle
2011-12-07 14:00:38 -08:00
parent 69419d939b
commit 2be63ee00a
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/Managed Software Update/MSUAppDelegate.py
+10 -4
View File
@@ -639,20 +639,26 @@ class MSUAppDelegate(NSObject):
def alertIfRunnningOnBattery(self):
power_info = munki.getPowerInfo()
if power_info.get('PowerSource') == 'Battery Power':
if (power_info.get('PowerSource') == 'Battery Power'
and power_info.get('BatteryCharge', 0) < 50):
alert = NSAlert.alertWithMessageText_defaultButton_alternateButton_otherButton_informativeTextWithFormat_(
NSLocalizedString(u"Your computer is not connected to a power source.", None),
NSLocalizedString(u"Cancel", None),
NSLocalizedString(u"Continue", None),
NSLocalizedString(u"Cancel", None),
objc.nil,
NSLocalizedString(u"For best results, you should connect your computer to a power source before updating. Are you sure you want to continue the update?", None))
munki.log("MSU", "alert_on_battery_power")
# making UI consistent with Apple Software Update...
# set Cancel button to be activated by return key
alert.buttons()[1].setKeyEquivalent_('\r')
# set Ccontinue button to be activated by Escape key
alert.buttons()[0].setKeyEquivalent_(chr(27))
buttonPressed = alert.runModal()
if buttonPressed == NSAlertDefaultReturn:
if buttonPressed == NSAlertAlternateReturn:
return True
return False
def installSessionErrorAlert(self):
alert = NSAlert.alertWithMessageText_defaultButton_alternateButton_otherButton_informativeTextWithFormat_(
NSLocalizedString(u"Cannot start installation session", None),