Merge branch 'v0.6' into qt5-wip #2237

Open
kashikoibumi wants to merge 38 commits from kashikoibumi/qt5-wip into v0.6
Showing only changes of commit c5de33d626 - Show all commits

View File

@ -6,8 +6,6 @@ import ssl
import sys import sys
import time import time
from qtpy import QtCore
import account import account
import defaults import defaults
import network.stats import network.stats
@ -117,9 +115,11 @@ def createSupportMessage(myapp):
return return
myapp.ui.lineEditSubject.setText(SUPPORT_SUBJECT) myapp.ui.lineEditSubject.setText(SUPPORT_SUBJECT)
addrIndex = myapp.ui.comboBoxSendFrom.findData( # addrIndex = myapp.ui.comboBoxSendFrom.findData(
address, QtCore.Qt.UserRole, # address, QtCore.Qt.UserRole,
QtCore.Qt.MatchFixedString | QtCore.Qt.MatchCaseSensitive) # QtCore.Qt.MatchFixedString | QtCore.Qt.MatchCaseSensitive
# )
addrIndex = myapp.ui.comboBoxSendFrom.findData(address)
if addrIndex == -1: # something is very wrong if addrIndex == -1: # something is very wrong
return return
myapp.ui.comboBoxSendFrom.setCurrentIndex(addrIndex) myapp.ui.comboBoxSendFrom.setCurrentIndex(addrIndex)