diff options
| author | Kali Kaneko <kali@leap.se> | 2015-12-16 15:33:25 -0400 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2015-12-18 11:20:21 -0400 |
| commit | 7b80dd1fca9828331f3327c418913539a3a303c0 (patch) | |
| tree | cc4e73f25cecb2d286fcbb12b664f2eb42f12e76 /src/leap/bitmask/gui/mainwindow.py | |
| parent | 98384361a7c49ad4e0ff0127fd923a8b72cc910a (diff) | |
[feat] adapt to use cred-based authentication for smtp
Diffstat (limited to 'src/leap/bitmask/gui/mainwindow.py')
| -rw-r--r-- | src/leap/bitmask/gui/mainwindow.py | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index 189a6295..759b454f 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -1075,11 +1075,14 @@ class MainWindow(QtGui.QMainWindow, SignalTracker): manual_smtp = self.tr("SMTP: localhost, port {0}".format(smtp_port)) manual_username = self.tr("Username: your full email address") - # TODO this should be a widget that allows to be copied to the - # clipboard. - imap_token = (self._service_tokens.get('imap', None) - or "??? (log in to unlock)") - manual_password = self.tr("Password: ") + "%s" % (imap_token, ) + # FIXME on i3, this doens't allow to mouse-select. + # Switch to a dialog in which we can set the QLabel + imap_token = (self._service_tokens.get('imap', None) or + "??? (log in to unlock)") + smtp_token = (self._service_tokens.get('smtp', None) or + "??? (log in to unlock)") + imap_password = self.tr("IMAP Password:") + " %s" % (imap_token,) + smtp_password = self.tr("SMTP Password:") + " %s" % (smtp_token,) msg = help_url + self.tr( "<p><strong>{0}</strong></p>" @@ -1090,9 +1093,10 @@ class MainWindow(QtGui.QMainWindow, SignalTracker): "<li> {4}</li>" "<li> {5}</li>" "<li> {6}</li>" + "<li> {7}</li>" "</ul></p>").format(email_quick_reference, thunderbird_text, manual_text, manual_imap, manual_smtp, - manual_username, manual_password) + manual_username, imap_password, smtp_password) QtGui.QMessageBox.about(self, self.tr("Bitmask Help"), msg) def _needs_update(self): |