Skip to content

Commit

Permalink
Added QR icon.
Browse files Browse the repository at this point in the history
  • Loading branch information
dainnilsson committed Aug 17, 2015
1 parent 4278f31 commit 7d26532
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 4 deletions.
Binary file added qt_resources/qr.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions yubioath/gui/messages.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@
overwrite_slot = "Overwrite slot?"
overwrite_slot_desc_1 = "This will overwrite the credential currently stored " \
"in slot %d. This action cannot be undone."
qr_scan = "Scan a QR code"
qr_scanning = "Scanning for QR code..."
qr_not_found = "QR code not found"
qr_not_found_desc = "No usable QR code detected. Make sure the QR code is " \
Expand Down
4 changes: 2 additions & 2 deletions yubioath/gui/view/add_cred.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@ def __init__(self, worker, parent=None):
def _build_ui(self):
layout = QtGui.QFormLayout(self)

self._qr_btn = QtGui.QPushButton('[QR ICON]')
self._qr_btn = QtGui.QPushButton(QtGui.QIcon(':/qr.png'), m.qr_scan)
self._qr_btn.clicked.connect(self._scan_qr)
layout.addRow('Scan QR code', self._qr_btn)
layout.addRow(self._qr_btn)

self._cred_name = QtGui.QLineEdit()
self._cred_name.setValidator(NAME_VALIDATOR)
Expand Down
4 changes: 2 additions & 2 deletions yubioath/gui/view/add_cred_legacy.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,9 @@ def __init__(self, worker, otp_slots=(0, 0), url=None, parent=None):
def _build_ui(self):
layout = QtGui.QFormLayout(self)

self._qr_btn = QtGui.QPushButton('[QR ICON]')
self._qr_btn = QtGui.QPushButton(QtGui.QIcon(':/qr.png'), m.qr_scan)
self._qr_btn.clicked.connect(self._scan_qr)
layout.addRow('Scan QR code', self._qr_btn)
layout.addRow(self._qr_btn)

self._cred_key = QtGui.QLineEdit()
self._cred_key.setValidator(B32Validator())
Expand Down

0 comments on commit 7d26532

Please sign in to comment.