linux wtf is ^M?
This commit is contained in:
parent
fa275a8136
commit
70ed38477b
@ -1643,6 +1643,9 @@ class gui(QtGui.QWidget):
|
||||
setattr(self, bgfile[0], QtGui.QPixmap.fromImage(bgimg.scaled(256, 192, transformMode=QtCore.Qt.SmoothTransformation)))
|
||||
else:
|
||||
setattr(self, bgfile[0], QtGui.QPixmap.fromImage(bgimg))
|
||||
else:
|
||||
setattr(self, bgfile[0], QtGui.QPixmap.fromImage(bgimg))
|
||||
|
||||
|
||||
def netmsg_hp(self, type, health):
|
||||
if type == 1:
|
||||
|
@ -92,7 +92,7 @@ except ImportError:
|
||||
pip_install("Pillow==5.3.0")
|
||||
|
||||
print "installing pyinstaller, six, appdirs, packaging"
|
||||
pip_install('pyinstaller==2.1' if platform.system() == "Darwin" else 'pyinstaller==3.6' + 'six appdirs packaging')
|
||||
pip_install('six appdirs packaging ' + 'pyinstaller==2.1' if platform.system() == "Darwin" else 'pyinstaller==3.6')
|
||||
|
||||
if platform.system() == "Windows":
|
||||
print "downloading pyqt4"
|
||||
|
Loading…
Reference in New Issue
Block a user