Mercurial Repositories > eric / file comparison
comparison: UI/UserInterface.py
UI/UserInterface.py
- changeset 543
- a558e3cb7b5a
- parent 541
- 00e1a5d060c5
- child 545
- 1538031b5175
equal
deleted
inserted
replaced
| 541:00e1a5d060c5 | 543:a558e3cb7b5a |
|---|---|
| 2997 | 2997 |
| 2998 def __restart(self): | 2998 def __restart(self): |
| 2999 """ | 2999 """ |
| 3000 Private method to restart the application. | 3000 Private method to restart the application. |
| 3001 """ | 3001 """ |
| 3002 res = E5MessageBox.question(self, | 3002 res = E5MessageBox.yesNo(self, |
| 3003 self.trUtf8("Restart application"), | 3003 self.trUtf8("Restart application"), |
| 3004 self.trUtf8("""The application needs to be restarted. Do it now?"""), | 3004 self.trUtf8("""The application needs to be restarted. Do it now?"""), |
| 3005 QMessageBox.StandardButtons(\ | 3005 yesDefault = True) |
| 3006 QMessageBox.No | \ | 3006 |
| 3007 QMessageBox.Yes), | 3007 if res and self.__shutdown(): |
| 3008 QMessageBox.Yes) | |
| 3009 | |
| 3010 if res == QMessageBox.Yes and self.__shutdown(): | |
| 3011 e5App().closeAllWindows() | 3008 e5App().closeAllWindows() |
| 3012 program = sys.executable | 3009 program = sys.executable |
| 3013 eric5 = os.path.join(getConfig("ericDir"), "eric5.py") | 3010 eric5 = os.path.join(getConfig("ericDir"), "eric5.py") |
| 3014 args = [eric5] | 3011 args = [eric5] |
| 3015 args.append("--start-session") | 3012 args.append("--start-session") |
| 5521 url = "" | 5518 url = "" |
| 5522 try: | 5519 try: |
| 5523 if "-snapshot-" in Version: | 5520 if "-snapshot-" in Version: |
| 5524 # check snapshot version | 5521 # check snapshot version |
| 5525 if versions[2] > Version: | 5522 if versions[2] > Version: |
| 5526 res = E5MessageBox.question(self, | 5523 res = E5MessageBox.yesNo(self, |
| 5527 self.trUtf8("Update available"), | 5524 self.trUtf8("Update available"), |
| 5528 self.trUtf8("""The update to <b>{0}</b> of eric5 is available""" | 5525 self.trUtf8("""The update to <b>{0}</b> of eric5 is available""" |
| 5529 """ at <b>{1}</b>. Would you like to get it?""")\ | 5526 """ at <b>{1}</b>. Would you like to get it?""")\ |
| 5530 .format(versions[2], versions[3]), | 5527 .format(versions[2], versions[3]), |
| 5531 QMessageBox.StandardButtons(\ | 5528 yesDefault = True) |
| 5532 QMessageBox.No | \ | 5529 url = res and versions[3] or '' |
| 5533 QMessageBox.Yes), | |
| 5534 QMessageBox.Yes) | |
| 5535 url = res == QMessageBox.Yes and versions[3] or '' | |
| 5536 elif versions[0] > Version: | 5530 elif versions[0] > Version: |
| 5537 res = E5MessageBox.question(self, | 5531 res = E5MessageBox.yesNo(self, |
| 5538 self.trUtf8("Update available"), | 5532 self.trUtf8("Update available"), |
| 5539 self.trUtf8("""The update to <b>{0}</b> of eric5 is available""" | 5533 self.trUtf8("""The update to <b>{0}</b> of eric5 is available""" |
| 5540 """ at <b>{1}</b>. Would you like to get it?""")\ | 5534 """ at <b>{1}</b>. Would you like to get it?""")\ |
| 5541 .format(versions[0], versions[1]), | 5535 .format(versions[0], versions[1]), |
| 5542 QMessageBox.StandardButtons(\ | 5536 yesDefault = True) |
| 5543 QMessageBox.No | \ | 5537 url = res and versions[1] or '' |
| 5544 QMessageBox.Yes), | |
| 5545 QMessageBox.Yes) | |
| 5546 url = res == QMessageBox.Yes and versions[1] or '' | |
| 5547 else: | 5538 else: |
| 5548 if self.manualUpdatesCheck: | 5539 if self.manualUpdatesCheck: |
| 5549 E5MessageBox.information(self, | 5540 E5MessageBox.information(self, |
| 5550 self.trUtf8("Eric5 is up to date"), | 5541 self.trUtf8("Eric5 is up to date"), |
| 5551 self.trUtf8("""You are using the latest version of eric5""")) | 5542 self.trUtf8("""You are using the latest version of eric5""")) |
| 5552 else: | 5543 else: |
| 5553 # check release version | 5544 # check release version |
| 5554 if versions[0] > Version: | 5545 if versions[0] > Version: |
| 5555 res = E5MessageBox.question(self, | 5546 res = E5MessageBox.yesNo(self, |
| 5556 self.trUtf8("Update available"), | 5547 self.trUtf8("Update available"), |
| 5557 self.trUtf8("""The update to <b>{0}</b> of eric5 is available""" | 5548 self.trUtf8("""The update to <b>{0}</b> of eric5 is available""" |
| 5558 """ at <b>{1}</b>. Would you like to get it?""")\ | 5549 """ at <b>{1}</b>. Would you like to get it?""")\ |
| 5559 .format(versions[0], versions[1]), | 5550 .format(versions[0], versions[1]), |
| 5560 QMessageBox.StandardButtons(\ | 5551 yesDefault = True) |
| 5561 QMessageBox.No | \ | 5552 url = res and versions[1] or '' |
| 5562 QMessageBox.Yes), | |
| 5563 QMessageBox.Yes) | |
| 5564 url = res == QMessageBox.Yes and versions[1] or '' | |
| 5565 else: | 5553 else: |
| 5566 if self.manualUpdatesCheck: | 5554 if self.manualUpdatesCheck: |
| 5567 E5MessageBox.information(self, | 5555 E5MessageBox.information(self, |
| 5568 self.trUtf8("Eric5 is up to date"), | 5556 self.trUtf8("Eric5 is up to date"), |
| 5569 self.trUtf8("""You are using the latest version of eric5""")) | 5557 self.trUtf8("""You are using the latest version of eric5""")) |
| 5615 """ | 5603 """ |
| 5616 errorStrings = [] | 5604 errorStrings = [] |
| 5617 for err in sslErrors: | 5605 for err in sslErrors: |
| 5618 errorStrings.append(err.errorString()) | 5606 errorStrings.append(err.errorString()) |
| 5619 errorString = '.<br />'.join(errorStrings) | 5607 errorString = '.<br />'.join(errorStrings) |
| 5620 ret = E5MessageBox.warning(self, | 5608 ret = E5MessageBox.yesNo(self, |
| 5621 self.trUtf8("SSL Errors"), | 5609 self.trUtf8("SSL Errors"), |
| 5622 self.trUtf8("""<p>SSL Errors:</p>""" | 5610 self.trUtf8("""<p>SSL Errors:</p>""" |
| 5623 """<p>{0}</p>""" | 5611 """<p>{0}</p>""" |
| 5624 """<p>Do you want to ignore these errors?</p>""")\ | 5612 """<p>Do you want to ignore these errors?</p>""")\ |
| 5625 .format(errorString), | 5613 .format(errorString), |
| 5626 QMessageBox.StandardButtons(\ | 5614 type_ = E5MessageBox.Warning) |
| 5627 QMessageBox.No | \ | 5615 if ret: |
| 5628 QMessageBox.Yes), | |
| 5629 QMessageBox.No) | |
| 5630 if ret == QMessageBox.Yes: | |
| 5631 reply.ignoreSslErrors() | 5616 reply.ignoreSslErrors() |
| 5632 else: | 5617 else: |
| 5633 self.__downloadCancelled = True | 5618 self.__downloadCancelled = True |
| 5634 reply.abort() | 5619 reply.abort() |
| 5635 | 5620 |
