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 4049662a3a - Show all commits

View File

@ -33,6 +33,7 @@ PyBitmesage version: {}
Operating system: {} Operating system: {}
Architecture: {}bit Architecture: {}bit
Frozen: {} Frozen: {}
Portable mode: {}
C PoW: {} C PoW: {}
OpenCL PoW: {} OpenCL PoW: {}
Locale: {} Locale: {}
@ -87,9 +88,10 @@ def createSupportMessage(myapp):
frozen = "N/A" frozen = "N/A"
if shared.frozen: if shared.frozen:
frozen = shared.frozen frozen = shared.frozen
cpow = "Yes" if bmpow else "No" portablemode = "True" if shared.appdata == shared.lookupExeFolder() else "False"
cpow = "True" if bmpow else "False"
#cpow = QtGui.QApplication.translate("Support", cpow) #cpow = QtGui.QApplication.translate("Support", cpow)
openclpow = "Yes" if shared.safeConfigGetBoolean('bitmessagesettings', 'opencl') and has_opencl() else "No" openclpow = "True" if shared.safeConfigGetBoolean('bitmessagesettings', 'opencl') and has_opencl() else "False"
#openclpow = QtGui.QApplication.translate("Support", openclpow) #openclpow = QtGui.QApplication.translate("Support", openclpow)
locale = getTranslationLanguage() locale = getTranslationLanguage()
try: try:
@ -102,7 +104,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, cpow, openclpow, locale, socks, upnp, connectedhosts)) myapp.ui.textEditMessage.setText(str(QtGui.QApplication.translate("Support", SUPPORT_MESSAGE)).format(version, os, architecture, frozen, portablemode, cpow, openclpow, locale, socks, upnp, connectedhosts))
# single msg tab # single msg tab
myapp.ui.tabWidgetSend.setCurrentIndex(0) myapp.ui.tabWidgetSend.setCurrentIndex(0)