Merge branch 'master' of git://github.com/spesmilo/electrum

This commit is contained in:
ThomasV 2016-01-18 10:08:32 +01:00
commit d9f6e738a4

View file

@ -1,6 +1,5 @@
from functools import partial from functools import partial
import threading import threading
from PIL import Image
from PyQt4.Qt import Qt from PyQt4.Qt import Qt
from PyQt4.Qt import QGridLayout, QInputDialog, QPushButton from PyQt4.Qt import QGridLayout, QInputDialog, QPushButton
@ -360,6 +359,7 @@ class SettingsDialog(WindowModalDialog):
update() update()
def change_homescreen(): def change_homescreen():
from PIL import Image # FIXME
dialog = QFileDialog(self, _("Choose Homescreen")) dialog = QFileDialog(self, _("Choose Homescreen"))
filename = dialog.getOpenFileName() filename = dialog.getOpenFileName()
if filename: if filename: