Changing around where we issue the messages
This commit is contained in:
parent
00097a23de
commit
175fd47130
19
electrum
19
electrum
|
@ -130,6 +130,7 @@ if __name__ == '__main__':
|
||||||
firstarg = args[1] if len(args) > 1 else ''
|
firstarg = args[1] if len(args) > 1 else ''
|
||||||
|
|
||||||
if cmd == 'gui':
|
if cmd == 'gui':
|
||||||
|
|
||||||
if options.gui=='gtk':
|
if options.gui=='gtk':
|
||||||
try:
|
try:
|
||||||
import lib.gui as gui
|
import lib.gui as gui
|
||||||
|
@ -141,6 +142,24 @@ if __name__ == '__main__':
|
||||||
except ImportError:
|
except ImportError:
|
||||||
import electrum.gui_qt as gui
|
import electrum.gui_qt as gui
|
||||||
elif options.gui == 'lite':
|
elif options.gui == 'lite':
|
||||||
|
# Let's do some dep checking and handle missing ones gracefully
|
||||||
|
try:
|
||||||
|
from PyQt4.QtCore import *
|
||||||
|
from PyQt4.QtGui import *
|
||||||
|
except ImportError:
|
||||||
|
print "You need to have PyQT installed to run Electrum in graphical mode."
|
||||||
|
print "If you have pip installed try 'sudo pip install pyqt' if you are on Debian/Ubuntu try 'sudo apt-get install python-qt4'."
|
||||||
|
sys.exit(0)
|
||||||
|
|
||||||
|
qtVersion = qVersion()
|
||||||
|
if not(int(qtVersion[0]) >= 4 and int(qtVersion[2]) >= 7):
|
||||||
|
app = QApplication(sys.argv)
|
||||||
|
|
||||||
|
error_message = QErrorMessage()
|
||||||
|
error_message.showMessage("<p>Sorry, Electrum requires Qt >= 4.7 to run.</p><p>Check your distributions packages or download it at http://qt.nokia.com/downloads</p>")
|
||||||
|
app.exec_()
|
||||||
|
sys.exit(0)
|
||||||
|
|
||||||
try:
|
try:
|
||||||
import lib.gui_lite as gui
|
import lib.gui_lite as gui
|
||||||
except ImportError:
|
except ImportError:
|
||||||
|
|
|
@ -1,12 +1,7 @@
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
try:
|
from PyQt4.QtCore import *
|
||||||
from PyQt4.QtCore import *
|
from PyQt4.QtGui import *
|
||||||
from PyQt4.QtGui import *
|
|
||||||
except ImportError:
|
|
||||||
print "You need to have PyQT installed to run Electrum"
|
|
||||||
print "If you have pip installed try 'sudo pip install pyqt' if you are on Debian/Ubuntu try 'sudo apt-get install python-qt4'"
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
from decimal import Decimal as D
|
from decimal import Decimal as D
|
||||||
from util import appdata_dir, get_resource_path as rsrc
|
from util import appdata_dir, get_resource_path as rsrc
|
||||||
|
@ -58,12 +53,6 @@ def cd_data_dir():
|
||||||
class ElectrumGui:
|
class ElectrumGui:
|
||||||
|
|
||||||
def __init__(self, wallet):
|
def __init__(self, wallet):
|
||||||
qtVersion = qVersion()
|
|
||||||
if not(int(qtVersion[0]) >= 4 and int(qtVersion[2]) >= 7):
|
|
||||||
print "Sorry, Electrum requires Qt >= 4.7 to run"
|
|
||||||
print "Check your distributions packages or download it at http://qt.nokia.com/downloads"
|
|
||||||
sys.exit(0)
|
|
||||||
|
|
||||||
self.wallet = wallet
|
self.wallet = wallet
|
||||||
self.app = QApplication(sys.argv)
|
self.app = QApplication(sys.argv)
|
||||||
# Should probably not modify the current path but instead
|
# Should probably not modify the current path but instead
|
||||||
|
|
Loading…
Reference in New Issue