commit 86898074006231886acb30a1d005f6d4643f2918
parent 9fbbef4d171bc310c5263c994356bd08cd0acfc4
Author: ThomasV <thomasv@gitorious>
Date: Fri, 24 Apr 2015 09:10:03 +0200
add file button to text edits
Diffstat:
4 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/gui/qt/installwizard.py b/gui/qt/installwizard.py
@@ -128,7 +128,6 @@ class InstallWizard(QDialog):
if func is None:
func = self.is_any
vbox, seed_e = seed_dialog.enter_seed_box(msg, self, sid)
- seed_e.addButton(":icons/copy.png", seed_e.file_input, _("Read file"))
vbox.addStretch(1)
button = OkButton(self, _('Next'))
vbox.addLayout(Buttons(CancelButton(self), button))
diff --git a/gui/qt/qrtextedit.py b/gui/qt/qrtextedit.py
@@ -35,6 +35,7 @@ class ScanQRTextEdit(ButtonsTextEdit):
assert win, "You must pass a window with access to the config to ScanQRTextEdit constructor."
if win:
assert hasattr(win,"config"), "You must pass a window with access to the config to ScanQRTextEdit constructor."
+ self.addButton(":icons/file.png", self.file_input, _("Read file"))
self.addButton(":icons/qrcode.png", self.qr_input, _("Read QR code"))
run_hook('scan_text_edit', self)
diff --git a/icons.qrc b/icons.qrc
@@ -9,6 +9,7 @@
<file>icons/confirmed.png</file>
<file>icons/copy.png</file>
<file>icons/expired.png</file>
+ <file>icons/file.png</file>
<file>icons/key.png</file>
<file>icons/lock.png</file>
<file>icons/unlock.png</file>
diff --git a/icons/file.png b/icons/file.png
Binary files differ.