Merge remote-tracking branch 'origin/4.0'

This commit is contained in:
Lipu Fei 2019-01-31 08:47:01 +01:00
commit 5a196423db
14 changed files with 312 additions and 348 deletions

View file

@ -28,7 +28,7 @@ class FirmwareUpdateCheckerMessage(Message):
"[no_icon]",
"[no_description]",
button_style = Message.ActionButtonStyle.LINK,
button_align = Message.ActionButtonStyle.BUTTON_ALIGN_LEFT)
button_align = Message.ActionButtonAlignment.ALIGN_LEFT)
def getMachineId(self) -> int:
return self._machine_id