Bitmessage/PyBitmessage-2024-11-30
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

Merge branch '1148' into upstream-v0.6

Browse Source
This commit is contained in:
Peter Šurda 2018-03-29 07:34:48 +02:00
commit 50ccb897fc
Signed by: PeterSurda
GPG Key ID: 0C5F50C0B5F37D87
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/bitmessageqt/__init__.py
View File

@ -798,22 +798,19 @@ class MyForm(settingsmixin.SMainWindow):
"valueChanged(int)"), self.updateTTL)
self.initSettings()
# Check to see whether we can connect to namecoin. Hide the 'Fetch Namecoin ID' button if we can't.
try:
options = {}
options["type"] = BMConfigParser().get('bitmessagesettings', 'namecoinrpctype')
options["host"] = BMConfigParser().get('bitmessagesettings', 'namecoinrpchost')
options["port"] = BMConfigParser().get('bitmessagesettings', 'namecoinrpcport')
options["user"] = BMConfigParser().get('bitmessagesettings', 'namecoinrpcuser')
options["password"] = BMConfigParser().get('bitmessagesettings', 'namecoinrpcpassword')
nc = namecoinConnection(options)
if nc.test()[0] == 'failed':
self.ui.pushButtonFetchNamecoinID.hide()
except:
logger.error('There was a problem testing for a Namecoin daemon. Hiding the Fetch Namecoin ID button')
self.namecoin = namecoinConnection()
# Check to see whether we can connect to namecoin.
# Hide the 'Fetch Namecoin ID' button if we can't.
if BMConfigParser().safeGetBoolean(
'bitmessagesettings', 'dontconnect'
) or self.namecoin.test()[0] == 'failed':
logger.warning(
'There was a problem testing for a Namecoin daemon. Hiding the'
' Fetch Namecoin ID button')
self.ui.pushButtonFetchNamecoinID.hide()
def updateTTL(self, sliderPosition):
TTL = int(sliderPosition ** 3.199 + 3600)
self.updateHumanFriendlyTTLDescription(TTL)
@ -2691,6 +2688,10 @@ class MyForm(settingsmixin.SMainWindow):
BMConfigParser().save()
self.ui.updateNetworkSwitchMenuLabel(dontconnect_option)
self.ui.pushButtonFetchNamecoinID.setHidden(
dontconnect_option or self.namecoin.test()[0] == 'failed'
)
# Quit selected from menu or application indicator
def quit(self):
'''quit_msg = "Are you sure you want to exit Bitmessage?"