diff options
| author | elijah <elijah@riseup.net> | 2016-04-27 08:48:12 -0300 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2016-04-27 08:48:12 -0300 |
| commit | 64e4a8e4d5ed26014e8542d73a6bc989b8666598 (patch) | |
| tree | aacc8e4816b90ae271641325c62b328c7f1d1d9e /src/leap/bitmask/gui | |
| parent | 68096fa81eebb07165c27648ab804d9e1c695f8e (diff) | |
| parent | 5a1dd49debdcd9a1ce0568217e9411d1e45a3cad (diff) | |
Merge branch 'bug/preferences_keys' of https://github.com/meskio/bitmask_client into develop
Diffstat (limited to 'src/leap/bitmask/gui')
| -rw-r--r-- | src/leap/bitmask/gui/preferences_email_page.py | 6 | ||||
| -rw-r--r-- | src/leap/bitmask/gui/ui/preferences_email_page.ui | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/leap/bitmask/gui/preferences_email_page.py b/src/leap/bitmask/gui/preferences_email_page.py index f6d6f036..7186450d 100644 --- a/src/leap/bitmask/gui/preferences_email_page.py +++ b/src/leap/bitmask/gui/preferences_email_page.py @@ -90,6 +90,8 @@ class PreferencesEmailPage(PreferencesPage): connect signals """ self.app.signaler.keymanager_key_details.connect(self._key_details) + self.app.signaler.keymanager_keys_list.connect( + self._keymanager_keys_list) self.app.signaler.keymanager_export_ok.connect( self._keymanager_export_ok) self.app.signaler.keymanager_export_error.connect( @@ -218,9 +220,9 @@ class PreferencesEmailPage(PreferencesPage): row = self.ui.keys_table.rowCount() self.ui.keys_table.insertRow(row) self.ui.keys_table.setItem( - row, 0, QtGui.QTableWidgetItem(key.address)) + row, 0, QtGui.QTableWidgetItem(" ".join(key["uids"]))) self.ui.keys_table.setItem( - row, 1, QtGui.QTableWidgetItem(key.fingerprint)) + row, 1, QtGui.QTableWidgetItem(key["fingerprint"])) def _toggle_webmail(self, state): value = True if state == QtCore.Qt.Checked else False diff --git a/src/leap/bitmask/gui/ui/preferences_email_page.ui b/src/leap/bitmask/gui/ui/preferences_email_page.ui index 1101d7ba..e4a72951 100644 --- a/src/leap/bitmask/gui/ui/preferences_email_page.ui +++ b/src/leap/bitmask/gui/ui/preferences_email_page.ui @@ -581,7 +581,7 @@ </column> <column> <property name="text"> - <string>Key ID</string> + <string>Fingerprint</string> </property> </column> </widget> |