Bitmessage/PyBitmessage-2025-02-01
Archived
2
0
Fork 0
Code Issues 167 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

Merge remote-tracking branch 'origin/patch-2' into v0.6

Browse Source 
Conflicts:
	src/bitmessageqt/__init__.py

Signed-off-by: sigoa <si@goat.si>
This commit is contained in:
sigoa 2017-12-22 22:11:30 +01:00
commit 02c51e516a
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/bitmessageqt/__init__.py
View File

@ -1294,7 +1294,6 @@ class MyForm(settingsmixin.SMainWindow):
try: try:
self.indicatorUpdate = get_plugin('indicator')(self) self.indicatorUpdate = get_plugin('indicator')(self)
except (NameError, TypeError): except (NameError, TypeError):
logger.warning("No indicator plugin found")
self.indicatorUpdate = _noop_update self.indicatorUpdate = _noop_update
# initialise the message notifier # initialise the message notifier
@ -2619,7 +2618,7 @@ class MyForm(settingsmixin.SMainWindow):
QtGui.QMessageBox.Yes|QtGui.QMessageBox.No|QtGui.QMessageBox.Cancel, QtGui.QMessageBox.Cancel) QtGui.QMessageBox.Yes|QtGui.QMessageBox.No|QtGui.QMessageBox.Cancel, QtGui.QMessageBox.Cancel)
if reply == QtGui.QMessageBox.No: if reply == QtGui.QMessageBox.No:
waitForPow = False waitForPow = False
elif reply == QtGui.QMessageBox.Cancel: elif reply == QtGui.QMessage.Cancel:
return return
if PendingDownloadQueue.totalSize() > 0: if PendingDownloadQueue.totalSize() > 0:
@ -3874,11 +3873,7 @@ class MyForm(settingsmixin.SMainWindow):
else: else:
data = self.getCurrentMessageId() data = self.getCurrentMessageId()
if data != False: if data != False:
<<<<<<< v0.6 message = "Error occurred: could not load message from disk."
message = "Error occurred: could not load message from disk. THIS IS NOT A BM but an error message." ## vvvv translate ! _translate
=======
message = "Error occurred: could not load message from disk." #### TODO: _translate( this ! happens frequently
>>>>>>> bde2d1a translate: could not load message from disk
messageTextedit.setCurrentFont(QtGui.QFont()) messageTextedit.setCurrentFont(QtGui.QFont())
messageTextedit.setTextColor(QtGui.QColor()) messageTextedit.setTextColor(QtGui.QColor())
messageTextedit.setContent(message) messageTextedit.setContent(message)