V0.6 #852

Merged
Atheros1 merged 399 commits from v0.6 into master 2016-05-03 01:58:38 +02:00
Showing only changes of commit c137e334d2 - Show all commits

View File

@ -1,5 +1,6 @@
import ctypes import ctypes
from PyQt4 import QtCore, QtGui from PyQt4 import QtCore, QtGui
import ssl
import sys import sys
import time import time
@ -10,6 +11,7 @@ from helper_sql import *
from l10n import getTranslationLanguage from l10n import getTranslationLanguage
from openclpow import has_opencl from openclpow import has_opencl
from proofofwork import bmpow from proofofwork import bmpow
from pyelliptic.openssl import OpenSSL
import shared import shared
# this is BM support address going to Peter Surda # this is BM support address going to Peter Surda
@ -32,6 +34,8 @@ Please write above this line and if possible, keep the information about your en
PyBitmesage version: {} PyBitmesage version: {}
Operating system: {} Operating system: {}
Architecture: {}bit Architecture: {}bit
Python Version: {}
OpenSSL Version: {}
Frozen: {} Frozen: {}
Portable mode: {} Portable mode: {}
C PoW: {} C PoW: {}
@ -89,6 +93,14 @@ def createSupportMessage(myapp):
except: except:
pass pass
architecture = "32" if ctypes.sizeof(ctypes.c_voidp) == 4 else "64" architecture = "32" if ctypes.sizeof(ctypes.c_voidp) == 4 else "64"
pythonversion = sys.version
SSLEAY_VERSION = 0
OpenSSL._lib.SSLeay.restype = ctypes.c_long
OpenSSL._lib.SSLeay_version.restype = ctypes.c_char_p
OpenSSL._lib.SSLeay_version.argtypes = [ctypes.c_int]
opensslversion = "%s (Python internal), %s (external for PyElliptic)" % (ssl.OPENSSL_VERSION, OpenSSL._lib.SSLeay_version(SSLEAY_VERSION))
frozen = "N/A" frozen = "N/A"
if shared.frozen: if shared.frozen:
frozen = shared.frozen frozen = shared.frozen
@ -108,7 +120,7 @@ def createSupportMessage(myapp):
upnp = "N/A" upnp = "N/A"
connectedhosts = len(shared.connectedHostsList) connectedhosts = len(shared.connectedHostsList)
myapp.ui.textEditMessage.setText(str(QtGui.QApplication.translate("Support", SUPPORT_MESSAGE)).format(version, os, architecture, frozen, portablemode, cpow, openclpow, locale, socks, upnp, connectedhosts)) myapp.ui.textEditMessage.setText(str(QtGui.QApplication.translate("Support", SUPPORT_MESSAGE)).format(version, os, architecture, pythonversion, opensslversion, frozen, portablemode, cpow, openclpow, locale, socks, upnp, connectedhosts))
# single msg tab # single msg tab
myapp.ui.tabWidgetSend.setCurrentIndex(0) myapp.ui.tabWidgetSend.setCurrentIndex(0)