diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index 940a0dc3..208923fc 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -1,9 +1,5 @@ -# pylint: disable=too-many-lines,broad-except,too-many-instance-attributes,global-statement,too-few-public-methods -# pylint: disable=too-many-statements,too-many-branches,attribute-defined-outside-init,too-many-arguments,no-member -# pylint: disable=unused-argument,no-self-use,too-many-locals,unused-variable,too-many-nested-blocks -# pylint: disable=too-many-return-statements,protected-access,super-init-not-called,non-parent-init-called """ -Initialise the QT interface +PyQt based UI for bitmessage, the main module """ import hashlib @@ -15,64 +11,51 @@ import sys import textwrap import time from datetime import datetime, timedelta +from sqlite3 import register_adapter + +from PyQt4 import QtCore, QtGui +from PyQt4.QtNetwork import QLocalSocket, QLocalServer -import debug from debug import logger - - -try: - from PyQt4 import QtCore, QtGui - from PyQt4.QtNetwork import QLocalSocket, QLocalServer -except ImportError: - logmsg = ( - 'PyBitmessage requires PyQt unless you want to run it as a daemon and interact with it using the API. You can' - ' download it from http://www.riverbankcomputing.com/software/pyqt/download or by searching Google for ' - '\'PyQt Download\' (without quotes).' - ) - logger.critical(logmsg, exc_info=True) - sys.exit() - - -from sqlite3 import register_adapter # pylint: disable=wrong-import-order - +from tr import _translate +from addresses import decodeAddress, addBMIfNotPresent +import shared +from bitmessageui import Ui_MainWindow +from bmconfigparser import BMConfigParser import defaults +from namecoin import namecoinConnection +from messageview import MessageView +from migrationwizard import Ui_MigrationWizard +from foldertree import ( + AccountMixin, Ui_FolderWidget, Ui_AddressWidget, Ui_SubscriptionWidget, + MessageList_AddressWidget, MessageList_SubjectWidget, + Ui_AddressBookWidgetItemLabel, Ui_AddressBookWidgetItemAddress) +from settings import Ui_settingsDialog +import settingsmixin +import support +import debug +from helper_ackPayload import genAckPayload +from helper_sql import sqlQuery, sqlExecute, sqlExecuteChunked, sqlStoredProcedure import helper_search -import knownnodes import l10n import openclpow +from utils import str_broadcast_subscribers, avatarize +from account import ( + getSortedAccounts, getSortedSubscriptions, accountClass, BMAccount, + GatewayAccount, MailchuckAccount, AccountColor) +import dialogs +from helper_generic import powQueueSize +from network.stats import pendingDownload, pendingUpload +from uisignaler import UISignaler +import knownnodes import paths +from proofofwork import getPowType import queues -import shared import shutdown import state -import upnp - -from bitmessageqt import sound, support, dialogs -from bitmessageqt.foldertree import ( - AccountMixin, Ui_FolderWidget, Ui_AddressWidget, Ui_SubscriptionWidget, MessageList_AddressWidget, - MessageList_SubjectWidget, Ui_AddressBookWidgetItemLabel, Ui_AddressBookWidgetItemAddress, -) -from bitmessageqt.account import ( - getSortedAccounts, getSortedSubscriptions, accountClass, BMAccount, GatewayAccount, MailchuckAccount, AccountColor, -) -from bitmessageqt.bitmessageui import Ui_MainWindow, settingsmixin -from bitmessageqt.messageview import MessageView -from bitmessageqt.migrationwizard import Ui_MigrationWizard -from bitmessageqt.settings import Ui_settingsDialog -from bitmessageqt.utils import str_broadcast_subscribers, avatarize -from bitmessageqt.uisignaler import UISignaler -from bitmessageqt.statusbar import BMStatusBar - -from addresses import decodeAddress, addBMIfNotPresent -from bmconfigparser import BMConfigParser -from namecoin import namecoinConnection -from helper_ackPayload import genAckPayload -from helper_generic import powQueueSize -from helper_sql import sqlQuery, sqlExecute, sqlExecuteChunked, sqlStoredProcedure -from network.stats import pendingDownload, pendingUpload +from statusbar import BMStatusBar from network.asyncore_pollchoose import set_rates -from proofofwork import getPowType -from tr import _translate +import sound try: @@ -81,15 +64,8 @@ except ImportError: get_plugins = False -qmytranslator = None -qsystranslator = None - - def change_translation(newlocale): - """Change a translation to a new locale""" - global qmytranslator, qsystranslator - try: if not qmytranslator.isEmpty(): QtGui.QApplication.removeTranslator(qmytranslator) @@ -102,16 +78,15 @@ def change_translation(newlocale): pass qmytranslator = QtCore.QTranslator() - translationpath = os.path.join(paths.codePath(), 'translations', 'bitmessage_' + newlocale) + translationpath = os.path.join (paths.codePath(), 'translations', 'bitmessage_' + newlocale) qmytranslator.load(translationpath) QtGui.QApplication.installTranslator(qmytranslator) qsystranslator = QtCore.QTranslator() if paths.frozen: - translationpath = os.path.join(paths.codePath(), 'translations', 'qt_' + newlocale) + translationpath = os.path.join (paths.codePath(), 'translations', 'qt_' + newlocale) else: - translationpath = os.path.join(str(QtCore.QLibraryInfo.location( - QtCore.QLibraryInfo.TranslationsPath)), 'qt_' + newlocale) + translationpath = os.path.join (str(QtCore.QLibraryInfo.location(QtCore.QLibraryInfo.TranslationsPath)), 'qt_' + newlocale) qsystranslator.load(translationpath) QtGui.QApplication.installTranslator(qsystranslator) @@ -132,8 +107,7 @@ def change_translation(newlocale): logger.error("Failed to set locale to %s", lang, exc_info=True) -class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-methods - """TBC""" +class MyForm(settingsmixin.SMainWindow): # the last time that a message arrival sound was played lastSoundTime = datetime.now() - timedelta(days=1) @@ -145,8 +119,6 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth REPLY_TYPE_CHAN = 1 def init_file_menu(self): - """Initialise the file menu""" - QtCore.QObject.connect(self.ui.actionExit, QtCore.SIGNAL( "triggered()"), self.quit) QtCore.QObject.connect(self.ui.actionNetworkSwitch, QtCore.SIGNAL( @@ -161,10 +133,9 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth QtCore.SIGNAL( "triggered()"), self.click_actionRegenerateDeterministicAddresses) - QtCore.QObject.connect( - self.ui.pushButtonAddChan, - QtCore.SIGNAL("clicked()"), - self.click_actionJoinChan) # also used for creating chans. + QtCore.QObject.connect(self.ui.pushButtonAddChan, QtCore.SIGNAL( + "clicked()"), + self.click_actionJoinChan) # also used for creating chans. QtCore.QObject.connect(self.ui.pushButtonNewAddress, QtCore.SIGNAL( "clicked()"), self.click_NewAddressDialog) QtCore.QObject.connect(self.ui.pushButtonAddAddressBook, QtCore.SIGNAL( @@ -189,8 +160,7 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth "triggered()"), self.click_actionHelp) def init_inbox_popup_menu(self, connectSignal=True): - """Popup menu for the Inbox tab""" - + # Popup menu for the Inbox tab self.ui.inboxContextMenuToolbar = QtGui.QToolBar() # Actions self.actionReply = self.ui.inboxContextMenuToolbar.addAction(_translate( @@ -227,28 +197,24 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.ui.tableWidgetInbox.setContextMenuPolicy( QtCore.Qt.CustomContextMenu) if connectSignal: - self.connect( - self.ui.tableWidgetInbox, - QtCore.SIGNAL('customContextMenuRequested(const QPoint&)'), - self.on_context_menuInbox) + self.connect(self.ui.tableWidgetInbox, QtCore.SIGNAL( + 'customContextMenuRequested(const QPoint&)'), + self.on_context_menuInbox) self.ui.tableWidgetInboxSubscriptions.setContextMenuPolicy( QtCore.Qt.CustomContextMenu) if connectSignal: - self.connect( - self.ui.tableWidgetInboxSubscriptions, - QtCore.SIGNAL('customContextMenuRequested(const QPoint&)'), - self.on_context_menuInbox) + self.connect(self.ui.tableWidgetInboxSubscriptions, QtCore.SIGNAL( + 'customContextMenuRequested(const QPoint&)'), + self.on_context_menuInbox) self.ui.tableWidgetInboxChans.setContextMenuPolicy( QtCore.Qt.CustomContextMenu) if connectSignal: - self.connect( - self.ui.tableWidgetInboxChans, - QtCore.SIGNAL('customContextMenuRequested(const QPoint&)'), - self.on_context_menuInbox) + self.connect(self.ui.tableWidgetInboxChans, QtCore.SIGNAL( + 'customContextMenuRequested(const QPoint&)'), + self.on_context_menuInbox) def init_identities_popup_menu(self, connectSignal=True): - """Popup menu for the Your Identities tab""" - + # Popup menu for the Your Identities tab self.ui.addressContextMenuToolbarYourIdentities = QtGui.QToolBar() # Actions self.actionNewYourIdentities = self.ui.addressContextMenuToolbarYourIdentities.addAction(_translate( @@ -283,10 +249,9 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.ui.treeWidgetYourIdentities.setContextMenuPolicy( QtCore.Qt.CustomContextMenu) if connectSignal: - self.connect( - self.ui.treeWidgetYourIdentities, - QtCore.SIGNAL('customContextMenuRequested(const QPoint&)'), - self.on_context_menuYourIdentities) + self.connect(self.ui.treeWidgetYourIdentities, QtCore.SIGNAL( + 'customContextMenuRequested(const QPoint&)'), + self.on_context_menuYourIdentities) # load all gui.menu plugins with prefix 'address' self.menu_plugins = {'address': []} @@ -301,8 +266,7 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth )) def init_chan_popup_menu(self, connectSignal=True): - """Popup menu for the Channels tab""" - + # Popup menu for the Channels tab self.ui.addressContextMenuToolbar = QtGui.QToolBar() # Actions self.actionNew = self.ui.addressContextMenuToolbar.addAction(_translate( @@ -332,14 +296,12 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.ui.treeWidgetChans.setContextMenuPolicy( QtCore.Qt.CustomContextMenu) if connectSignal: - self.connect( - self.ui.treeWidgetChans, - QtCore.SIGNAL('customContextMenuRequested(const QPoint&)'), - self.on_context_menuChan) + self.connect(self.ui.treeWidgetChans, QtCore.SIGNAL( + 'customContextMenuRequested(const QPoint&)'), + self.on_context_menuChan) def init_addressbook_popup_menu(self, connectSignal=True): - """Popup menu for the Address Book page""" - + # Popup menu for the Address Book page self.ui.addressBookContextMenuToolbar = QtGui.QToolBar() # Actions self.actionAddressBookSend = self.ui.addressBookContextMenuToolbar.addAction( @@ -371,14 +333,12 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.ui.tableWidgetAddressBook.setContextMenuPolicy( QtCore.Qt.CustomContextMenu) if connectSignal: - self.connect( - self.ui.tableWidgetAddressBook, - QtCore.SIGNAL('customContextMenuRequested(const QPoint&)'), - self.on_context_menuAddressBook) + self.connect(self.ui.tableWidgetAddressBook, QtCore.SIGNAL( + 'customContextMenuRequested(const QPoint&)'), + self.on_context_menuAddressBook) def init_subscriptions_popup_menu(self, connectSignal=True): - """Popup menu for the Subscriptions page""" - + # Popup menu for the Subscriptions page self.ui.subscriptionsContextMenuToolbar = QtGui.QToolBar() # Actions self.actionsubscriptionsNew = self.ui.subscriptionsContextMenuToolbar.addAction( @@ -401,14 +361,12 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.ui.treeWidgetSubscriptions.setContextMenuPolicy( QtCore.Qt.CustomContextMenu) if connectSignal: - self.connect( - self.ui.treeWidgetSubscriptions, - QtCore.SIGNAL('customContextMenuRequested(const QPoint&)'), - self.on_context_menuSubscriptions) + self.connect(self.ui.treeWidgetSubscriptions, QtCore.SIGNAL( + 'customContextMenuRequested(const QPoint&)'), + self.on_context_menuSubscriptions) def init_sent_popup_menu(self, connectSignal=True): - """Popup menu for the Sent page""" - + # Popup menu for the Sent page self.ui.sentContextMenuToolbar = QtGui.QToolBar() # Actions self.actionTrashSentMessage = self.ui.sentContextMenuToolbar.addAction( @@ -421,10 +379,11 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.actionForceSend = self.ui.sentContextMenuToolbar.addAction( _translate( "MainWindow", "Force send"), self.on_action_ForceSend) + # self.popMenuSent = QtGui.QMenu( self ) + # self.popMenuSent.addAction( self.actionSentClipboard ) + # self.popMenuSent.addAction( self.actionTrashSentMessage ) def rerenderTabTreeSubscriptions(self): - """TBC""" - treeWidget = self.ui.treeWidgetSubscriptions folders = Ui_FolderWidget.folderWeight.keys() folders.remove("new") @@ -434,16 +393,17 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth treeWidget.header().setSortIndicator( 0, QtCore.Qt.AscendingOrder) # init dictionary - + db = getSortedSubscriptions(True) for address in db: for folder in folders: - if folder not in db[address]: + if not folder in db[address]: db[address][folder] = {} - + if treeWidget.isSortingEnabled(): treeWidget.setSortingEnabled(False) + widgets = {} i = 0 while i < treeWidget.topLevelItemCount(): widget = treeWidget.topLevelItem(i) @@ -451,8 +411,8 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth toAddress = widget.address else: toAddress = None - - if toAddress not in db: + + if not toAddress in db: treeWidget.takeTopLevelItem(i) # no increment continue @@ -471,7 +431,7 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth j += 1 # add missing folders - if db[toAddress]: + if len(db[toAddress]) > 0: j = 0 for f, c in db[toAddress].iteritems(): try: @@ -482,14 +442,10 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth widget.setUnreadCount(unread) db.pop(toAddress, None) i += 1 - + i = 0 for toAddress in db: - widget = Ui_SubscriptionWidget( - treeWidget, i, toAddress, - db[toAddress]["inbox"]['count'], - db[toAddress]["inbox"]['label'], - db[toAddress]["inbox"]['enabled']) + widget = Ui_SubscriptionWidget(treeWidget, i, toAddress, db[toAddress]["inbox"]['count'], db[toAddress]["inbox"]['label'], db[toAddress]["inbox"]['enabled']) j = 0 unread = 0 for folder in folders: @@ -501,28 +457,23 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth j += 1 widget.setUnreadCount(unread) i += 1 - + treeWidget.setSortingEnabled(True) - def rerenderTabTreeMessages(self): - """TBC""" + def rerenderTabTreeMessages(self): self.rerenderTabTree('messages') def rerenderTabTreeChans(self): - """TBC""" - self.rerenderTabTree('chan') - + def rerenderTabTree(self, tab): - """TBC""" - if tab == 'messages': treeWidget = self.ui.treeWidgetYourIdentities elif tab == 'chan': treeWidget = self.ui.treeWidgetChans folders = Ui_FolderWidget.folderWeight.keys() - + # sort ascending when creating if treeWidget.topLevelItemCount() == 0: treeWidget.header().setSortIndicator( @@ -530,12 +481,14 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth # init dictionary db = {} enabled = {} - + for toAddress in getSortedAccounts(): isEnabled = BMConfigParser().getboolean( toAddress, 'enabled') isChan = BMConfigParser().safeGetBoolean( toAddress, 'chan') + isMaillinglist = BMConfigParser().safeGetBoolean( + toAddress, 'mailinglist') if treeWidget == self.ui.treeWidgetYourIdentities: if isChan: @@ -547,13 +500,12 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth db[toAddress] = {} for folder in folders: db[toAddress][folder] = 0 - + enabled[toAddress] = isEnabled # get number of (unread) messages total = 0 - queryreturn = sqlQuery( - 'SELECT toaddress, folder, count(msgid) as cnt FROM inbox WHERE read = 0 GROUP BY toaddress, folder') + queryreturn = sqlQuery('SELECT toaddress, folder, count(msgid) as cnt FROM inbox WHERE read = 0 GROUP BY toaddress, folder') for row in queryreturn: toaddress, folder, cnt = row total += cnt @@ -566,10 +518,11 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth db[None]["sent"] = 0 db[None]["trash"] = 0 enabled[None] = True - + if treeWidget.isSortingEnabled(): treeWidget.setSortingEnabled(False) - + + widgets = {} i = 0 while i < treeWidget.topLevelItemCount(): widget = treeWidget.topLevelItem(i) @@ -577,8 +530,8 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth toAddress = widget.address else: toAddress = None - - if toAddress not in db: + + if not toAddress in db: treeWidget.takeTopLevelItem(i) # no increment continue @@ -598,7 +551,7 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth j += 1 # add missing folders - if db[toAddress]: + if len(db[toAddress]) > 0: j = 0 for f, c in db[toAddress].iteritems(): if toAddress is not None and tab == 'messages' and folder == "new": @@ -610,7 +563,7 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth widget.setUnreadCount(unread) db.pop(toAddress, None) i += 1 - + i = 0 for toAddress in db: widget = Ui_AddressWidget(treeWidget, i, toAddress, db[toAddress]["inbox"], enabled[toAddress]) @@ -625,12 +578,10 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth j += 1 widget.setUnreadCount(unread) i += 1 - + treeWidget.setSortingEnabled(True) def __init__(self, parent=None): - """TBC""" - QtGui.QWidget.__init__(self, parent) self.ui = Ui_MainWindow() self.ui.setupUi(self) @@ -638,14 +589,12 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth # Ask the user if we may delete their old version 1 addresses if they # have any. for addressInKeysFile in getSortedAccounts(): - status, addressVersionNumber, streamNumber, addressHash = decodeAddress( + status, addressVersionNumber, streamNumber, hash = decodeAddress( addressInKeysFile) if addressVersionNumber == 1: displayMsg = _translate( - "MainWindow", - 'One of your addresses, %1, is an old version 1 address. Version 1 addresses are no longer ' - 'supported. May we delete it now?' - ).arg(addressInKeysFile) + "MainWindow", "One of your addresses, %1, is an old version 1 address. Version 1 addresses are no longer supported. " + + "May we delete it now?").arg(addressInKeysFile) reply = QtGui.QMessageBox.question( self, 'Message', displayMsg, QtGui.QMessageBox.Yes, QtGui.QMessageBox.No) if reply == QtGui.QMessageBox.Yes: @@ -655,13 +604,11 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth # Configure Bitmessage to start on startup (or remove the # configuration) based on the setting in the keys.dat file if 'win32' in sys.platform or 'win64' in sys.platform: - # Auto-startup for Windows RUN_PATH = "HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Run" self.settings = QtCore.QSettings(RUN_PATH, QtCore.QSettings.NativeFormat) - # In case the user moves the program and the registry entry is no longer - # valid, this will delete the old registry entry. - self.settings.remove("PyBitmessage") + self.settings.remove( + "PyBitmessage") # In case the user moves the program and the registry entry is no longer valid, this will delete the old registry entry. if BMConfigParser().getboolean('bitmessagesettings', 'startonlogon'): self.settings.setValue("PyBitmessage", sys.argv[0]) elif 'darwin' in sys.platform: @@ -673,13 +620,13 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth # e.g. for editing labels self.recurDepth = 0 - + # switch back to this when replying self.replyFromTab = None # so that quit won't loop self.quitAccepted = False - + self.init_file_menu() self.init_inbox_popup_menu() self.init_identities_popup_menu() @@ -775,13 +722,13 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.unreadCount = 0 # Set the icon sizes for the identicons - identicon_size = 3 * 7 + identicon_size = 3*7 self.ui.tableWidgetInbox.setIconSize(QtCore.QSize(identicon_size, identicon_size)) self.ui.treeWidgetChans.setIconSize(QtCore.QSize(identicon_size, identicon_size)) self.ui.treeWidgetYourIdentities.setIconSize(QtCore.QSize(identicon_size, identicon_size)) self.ui.treeWidgetSubscriptions.setIconSize(QtCore.QSize(identicon_size, identicon_size)) self.ui.tableWidgetAddressBook.setIconSize(QtCore.QSize(identicon_size, identicon_size)) - + self.UISignalThread = UISignaler.get() QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL( "writeNewAddressToTable(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"), self.writeNewAddressToTable) @@ -791,15 +738,10 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth "updateSentItemStatusByToAddress(PyQt_PyObject,PyQt_PyObject)"), self.updateSentItemStatusByToAddress) QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL( "updateSentItemStatusByAckdata(PyQt_PyObject,PyQt_PyObject)"), self.updateSentItemStatusByAckdata) - QtCore.QObject.connect( - self.UISignalThread, QtCore.SIGNAL( - "displayNewInboxMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"), - self.displayNewInboxMessage) - QtCore.QObject.connect( - self.UISignalThread, QtCore.SIGNAL( - ("displayNewSentMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject," - "PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)")), - self.displayNewSentMessage) + QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL( + "displayNewInboxMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"), self.displayNewInboxMessage) + QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL( + "displayNewSentMessage(PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject,PyQt_PyObject)"), self.displayNewSentMessage) QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL( "setStatusIcon(PyQt_PyObject)"), self.setStatusIcon) QtCore.QObject.connect(self.UISignalThread, QtCore.SIGNAL( @@ -840,16 +782,16 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.rerenderComboBoxSendFrom() self.rerenderComboBoxSendFromBroadcast() - + # Put the TTL slider in the correct spot TTL = BMConfigParser().getint('bitmessagesettings', 'ttl') - if TTL < 3600: # an hour + if TTL < 3600: # an hour TTL = 3600 - elif TTL > 28 * 24 * 60 * 60: # 28 days - TTL = 28 * 24 * 60 * 60 - self.ui.horizontalSliderTTL.setSliderPosition((TTL - 3600) ** (1 / 3.199)) + elif TTL > 28*24*60*60: # 28 days + TTL = 28*24*60*60 + self.ui.horizontalSliderTTL.setSliderPosition((TTL - 3600) ** (1/3.199)) self.updateHumanFriendlyTTLDescription(TTL) - + QtCore.QObject.connect(self.ui.horizontalSliderTTL, QtCore.SIGNAL( "valueChanged(int)"), self.updateTTL) @@ -861,24 +803,20 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth # Hide the 'Fetch Namecoin ID' button if we can't. if BMConfigParser().safeGetBoolean( 'bitmessagesettings', 'dontconnect' - ) or self.namecoin.test()[0] == 'failed': + ) 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): - """TBC""" - TTL = int(sliderPosition ** 3.199 + 3600) self.updateHumanFriendlyTTLDescription(TTL) BMConfigParser().set('bitmessagesettings', 'ttl', str(TTL)) BMConfigParser().save() - + def updateHumanFriendlyTTLDescription(self, TTL): - """TBC""" - - numberOfHours = int(round(TTL / (60 * 60))) + numberOfHours = int(round(TTL / (60*60))) font = QtGui.QFont() stylesheet = "" @@ -887,28 +825,19 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth _translate("MainWindow", "%n hour(s)", None, QtCore.QCoreApplication.CodecForTr, numberOfHours) + ", " + _translate("MainWindow", "not recommended for chans", None, QtCore.QCoreApplication.CodecForTr) - ) + ) stylesheet = "QLabel { color : red; }" font.setBold(True) else: - numberOfDays = int(round(TTL / (24 * 60 * 60))) - self.ui.labelHumanFriendlyTTLDescription.setText( - _translate( - "MainWindow", - "%n day(s)", - None, - QtCore.QCoreApplication.CodecForTr, - numberOfDays)) + numberOfDays = int(round(TTL / (24*60*60))) + self.ui.labelHumanFriendlyTTLDescription.setText(_translate("MainWindow", "%n day(s)", None, QtCore.QCoreApplication.CodecForTr, numberOfDays)) font.setBold(False) self.ui.labelHumanFriendlyTTLDescription.setStyleSheet(stylesheet) self.ui.labelHumanFriendlyTTLDescription.setFont(font) + # Show or hide the application window after clicking an item within the + # tray icon or, on Windows, the try icon itself. def appIndicatorShowOrHideWindow(self): - """ - Show or hide the application window after clicking an item within the tray icon or, on Windows, - the try icon itself. - """ - if not self.actionShow.isChecked(): self.hide() else: @@ -918,18 +847,16 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.raise_() self.activateWindow() + # show the application window def appIndicatorShow(self): - """show the application window""" - if self.actionShow is None: return if not self.actionShow.isChecked(): self.actionShow.setChecked(True) self.appIndicatorShowOrHideWindow() + # unchecks the show item on the application indicator def appIndicatorHide(self): - """unchecks the show item on the application indicator""" - if self.actionShow is None: return if self.actionShow.isChecked(): @@ -937,16 +864,25 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.appIndicatorShowOrHideWindow() def appIndicatorSwitchQuietMode(self): - """TBC""" - BMConfigParser().set( 'bitmessagesettings', 'showtraynotifications', str(not self.actionQuiet.isChecked()) ) - def appIndicatorInbox(self, item=None): - """Show the program window and select inbox tab""" + # application indicator show or hide + """# application indicator show or hide + def appIndicatorShowBitmessage(self): + #if self.actionShow == None: + # return + print self.actionShow.isChecked() + if not self.actionShow.isChecked(): + self.hide() + #self.setWindowState(self.windowState() & QtCore.Qt.WindowMinimized) + else: + self.appIndicatorShowOrHideWindow()""" + # Show the program window and select inbox tab + def appIndicatorInbox(self, item=None): self.appIndicatorShow() # select inbox self.ui.tabWidget.setCurrentIndex( @@ -962,24 +898,22 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth else: self.ui.tableWidgetInbox.setCurrentCell(0, 0) + # Show the program window and select send tab def appIndicatorSend(self): - """Show the program window and select send tab""" self.appIndicatorShow() self.ui.tabWidget.setCurrentIndex( self.ui.tabWidget.indexOf(self.ui.send) ) + # Show the program window and select subscriptions tab def appIndicatorSubscribe(self): - """Show the program window and select subscriptions tab""" - self.appIndicatorShow() self.ui.tabWidget.setCurrentIndex( self.ui.tabWidget.indexOf(self.ui.subscriptions) ) + # Show the program window and select channels tab def appIndicatorChannel(self): - """Show the program window and select channels tab""" - self.appIndicatorShow() self.ui.tabWidget.setCurrentIndex( self.ui.tabWidget.indexOf(self.ui.chans) @@ -1025,12 +959,9 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth for col in (0, 1, 2): related.item(rrow, col).setUnread(not status) - def propagateUnreadCount(self, address=None, folder="inbox", widget=None, type_arg=1): - """TBC""" - + def propagateUnreadCount(self, address = None, folder = "inbox", widget = None, type = 1): widgets = [self.ui.treeWidgetYourIdentities, self.ui.treeWidgetSubscriptions, self.ui.treeWidgetChans] - queryReturn = sqlQuery( - "SELECT toaddress, folder, COUNT(msgid) AS cnt FROM inbox WHERE read = 0 GROUP BY toaddress, folder") + queryReturn = sqlQuery("SELECT toaddress, folder, COUNT(msgid) AS cnt FROM inbox WHERE read = 0 GROUP BY toaddress, folder") totalUnread = {} normalUnread = {} for row in queryReturn: @@ -1042,15 +973,12 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth totalUnread[row[1]] += row[2] else: totalUnread[row[1]] = row[2] - queryReturn = sqlQuery( - "SELECT fromaddress, folder, COUNT(msgid) AS cnt FROM inbox " - "WHERE read = 0 AND toaddress = ? GROUP BY fromaddress, folder", - str_broadcast_subscribers) + queryReturn = sqlQuery("SELECT fromaddress, folder, COUNT(msgid) AS cnt FROM inbox WHERE read = 0 AND toaddress = ? GROUP BY fromaddress, folder", str_broadcast_subscribers) broadcastsUnread = {} for row in queryReturn: broadcastsUnread[row[0]] = {} broadcastsUnread[row[0]][row[1]] = row[2] - + for treeWidget in widgets: root = treeWidget.invisibleRootItem() for i in range(root.childCount()): @@ -1077,8 +1005,7 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth if addressItem.type == AccountMixin.ALL and folderName in totalUnread: newCount = totalUnread[folderName] elif addressItem.type == AccountMixin.SUBSCRIPTION: - if addressItem.address in broadcastsUnread and folderName in broadcastsUnread[ - addressItem.address]: + if addressItem.address in broadcastsUnread and folderName in broadcastsUnread[addressItem.address]: newCount = broadcastsUnread[addressItem.address][folderName] elif addressItem.address in normalUnread and folderName in normalUnread[addressItem.address]: newCount = normalUnread[addressItem.address][folderName] @@ -1086,20 +1013,16 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth folderItem.setUnreadCount(newCount) def addMessageListItem(self, tableWidget, items): - """TBC""" - sortingEnabled = tableWidget.isSortingEnabled() if sortingEnabled: tableWidget.setSortingEnabled(False) tableWidget.insertRow(0) - for i, _ in enumerate(items): + for i in range(len(items)): tableWidget.setItem(0, i, items[i]) if sortingEnabled: tableWidget.setSortingEnabled(True) def addMessageListItemSent(self, tableWidget, toAddress, fromAddress, subject, status, ackdata, lastactiontime): - """TBC""" - acct = accountClass(fromAddress) if acct is None: acct = BMAccount(fromAddress) @@ -1138,19 +1061,14 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth statusText = _translate( "MainWindow", "Doing work necessary to send broadcast.") elif status == 'broadcastsent': - statusText = _translate( - "MainWindow", "Broadcast on %1").arg( - l10n.formatTimestamp(lastactiontime)) + statusText = _translate("MainWindow", "Broadcast on %1").arg( + l10n.formatTimestamp(lastactiontime)) elif status == 'toodifficult': - statusText = _translate( - "MainWindow", - "Problem: The work demanded by the recipient is more difficult than you are willing to do. %1").arg( - l10n.formatTimestamp(lastactiontime)) + statusText = _translate("MainWindow", "Problem: The work demanded by the recipient is more difficult than you are willing to do. %1").arg( + l10n.formatTimestamp(lastactiontime)) elif status == 'badkey': - statusText = _translate( - "MainWindow", - "Problem: The recipient\'s encryption key is no good. Could not encrypt message. %1").arg( - l10n.formatTimestamp(lastactiontime)) + statusText = _translate("MainWindow", "Problem: The recipient\'s encryption key is no good. Could not encrypt message. %1").arg( + l10n.formatTimestamp(lastactiontime)) elif status == 'forcepow': statusText = _translate( "MainWindow", "Forced difficulty override. Send should start soon.") @@ -1168,8 +1086,6 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth return acct def addMessageListItemInbox(self, tableWidget, msgfolder, msgid, toAddress, fromAddress, subject, received, read): - """TBC""" - font = QtGui.QFont() font.setBold(True) if toAddress == str_broadcast_subscribers: @@ -1181,9 +1097,9 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth if acct is None: acct = BMAccount(fromAddress) acct.parseMessage(toAddress, fromAddress, subject, "") - + items = [] - # to + #to MessageList_AddressWidget(items, toAddress, unicode(acct.toLabel, 'utf-8'), not read) # from MessageList_AddressWidget(items, fromAddress, unicode(acct.fromLabel, 'utf-8'), not read) @@ -1202,9 +1118,8 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.addMessageListItem(tableWidget, items) return acct + # Load Sent items from database def loadSent(self, tableWidget, account, where="", what=""): - """Load Sent items from database""" - if tableWidget == self.ui.tableWidgetInboxSubscriptions: tableWidget.setColumnHidden(0, True) tableWidget.setColumnHidden(1, False) @@ -1236,9 +1151,8 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth tableWidget.horizontalHeaderItem(3).setText(_translate("MainWindow", "Sent", None)) tableWidget.setUpdatesEnabled(True) - def loadMessagelist(self, tableWidget, account, folder="inbox", where="", what="", unreadOnly=False): - """Load messages from database file""" - + # Load messages from database file + def loadMessagelist(self, tableWidget, account, folder="inbox", where="", what="", unreadOnly = False): if folder == 'sent': self.loadSent(tableWidget, account, where, what) return @@ -1259,11 +1173,10 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth tableWidget.setRowCount(0) queryreturn = helper_search.search_sql(xAddress, account, folder, where, what, unreadOnly) - + for row in queryreturn: msgfolder, msgid, toAddress, fromAddress, subject, received, read = row - self.addMessageListItemInbox(tableWidget, msgfolder, msgid, toAddress, - fromAddress, subject, received, read) + self.addMessageListItemInbox(tableWidget, msgfolder, msgid, toAddress, fromAddress, subject, received, read) tableWidget.horizontalHeader().setSortIndicator( 3, QtCore.Qt.DescendingOrder) @@ -1272,10 +1185,9 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth tableWidget.horizontalHeaderItem(3).setText(_translate("MainWindow", "Received", None)) tableWidget.setUpdatesEnabled(True) - def appIndicatorInit(self, this_app): - """create application indicator""" - - self.initTrayIcon("can-icon-24px-red.png", this_app) + # create application indicator + def appIndicatorInit(self, app): + self.initTrayIcon("can-icon-24px-red.png", app) traySignal = "activated(QSystemTrayIcon::ActivationReason)" QtCore.QObject.connect(self.tray, QtCore.SIGNAL( traySignal), self.__icon_activated) @@ -1297,7 +1209,7 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.actionShow.setChecked(not BMConfigParser().getboolean( 'bitmessagesettings', 'startintray')) self.actionShow.triggered.connect(self.appIndicatorShowOrHideWindow) - if sys.platform[0:3] != 'win': + if not sys.platform[0:3] == 'win': m.addAction(self.actionShow) # quiet mode @@ -1338,9 +1250,8 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.tray.setContextMenu(m) self.tray.show() + # returns the number of unread messages and subscriptions def getUnread(self): - """returns the number of unread messages and subscriptions""" - counters = [0, 0] queryreturn = sqlQuery(''' @@ -1355,15 +1266,12 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth return counters - def playSound(self, category, label): # pylint: disable=inconsistent-return-statements - """play a sound""" - + # play a sound + def playSound(self, category, label): # filename of the sound to be played soundFilename = None - def _choose_ext(basename): # pylint: disable=inconsistent-return-statements - """TBC""" - + def _choose_ext(basename): for ext in sound.extensions: if os.path.isfile(os.extsep.join([basename, ext])): return os.extsep + ext @@ -1385,23 +1293,24 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth # elapsed time since the last sound was played dt = datetime.now() - self.lastSoundTime # suppress sounds which are more frequent than the threshold - if not dt.total_seconds() < self.maxSoundFrequencySec: + if dt.total_seconds() < self.maxSoundFrequencySec: + return - # the sound is for an address which exists in the address book - if category is sound.SOUND_KNOWN: - soundFilename = state.appdata + 'sounds/known' - # the sound is for an unknown address - elif category is sound.SOUND_UNKNOWN: - soundFilename = state.appdata + 'sounds/unknown' - # initial connection sound - elif category is sound.SOUND_CONNECTED: - soundFilename = state.appdata + 'sounds/connected' - # disconnected sound - elif category is sound.SOUND_DISCONNECTED: - soundFilename = state.appdata + 'sounds/disconnected' - # sound when the connection status becomes green - elif category is sound.SOUND_CONNECTION_GREEN: - soundFilename = state.appdata + 'sounds/green' + # the sound is for an address which exists in the address book + if category is sound.SOUND_KNOWN: + soundFilename = state.appdata + 'sounds/known' + # the sound is for an unknown address + elif category is sound.SOUND_UNKNOWN: + soundFilename = state.appdata + 'sounds/unknown' + # initial connection sound + elif category is sound.SOUND_CONNECTED: + soundFilename = state.appdata + 'sounds/connected' + # disconnected sound + elif category is sound.SOUND_DISCONNECTED: + soundFilename = state.appdata + 'sounds/disconnected' + # sound when the connection status becomes green + elif category is sound.SOUND_CONNECTION_GREEN: + soundFilename = state.appdata + 'sounds/green' if soundFilename is None: logger.warning("Probably wrong category number in playSound()") @@ -1425,14 +1334,13 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self._player(soundFilename) + # Adapters and converters for QT <-> sqlite def sqlInit(self): - """Adapters and converters for QT <-> sqlite""" - register_adapter(QtCore.QByteArray, str) + # Try init the distro specific appindicator, + # for example the Ubuntu MessagingMenu def indicatorInit(self): - """ Try init the distro specific appindicator, for example the Ubuntu MessagingMenu""" - def _noop_update(*args, **kwargs): pass @@ -1442,9 +1350,8 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth logger.warning("No indicator plugin found") self.indicatorUpdate = _noop_update + # initialise the message notifier def notifierInit(self): - """initialise the message notifier""" - def _simple_notify( title, subtitle, category, label=None, icon=None): self.tray.showMessage(title, subtitle, 1, 2000) @@ -1474,34 +1381,27 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth def notifierShow( self, title, subtitle, category, label=None, icon=None): - """TBC""" - self.playSound(category, label) self._notifier( unicode(title), unicode(subtitle), category, label, icon) + # tree def treeWidgetKeyPressEvent(self, event): - """tree""" - return self.handleKeyPress(event, self.getCurrentTreeWidget()) + # inbox / sent def tableWidgetKeyPressEvent(self, event): - """inbox / sent""" - return self.handleKeyPress(event, self.getCurrentMessagelist()) + # messageview def textEditKeyPressEvent(self, event): - """messageview""" - return self.handleKeyPress(event, self.getCurrentMessageTextedit()) - def handleKeyPress(self, event, focus=None): # pylint: disable=inconsistent-return-statements - """TBC""" - + def handleKeyPress(self, event, focus = None): messagelist = self.getCurrentMessagelist() folder = self.getCurrentFolder() if event.key() == QtCore.Qt.Key_Delete: - if isinstance(focus, (MessageView, QtGui.QTableWidget)): + if isinstance (focus, MessageView) or isinstance(focus, QtGui.QTableWidget): if folder == "sent": self.on_action_SentTrash() else: @@ -1537,116 +1437,60 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.ui.lineEditTo.setFocus() event.ignore() elif event.key() == QtCore.Qt.Key_F: - searchline = self.getCurrentSearchLine(retObj=True) + searchline = self.getCurrentSearchLine(retObj = True) if searchline: searchline.setFocus() event.ignore() if not event.isAccepted(): return - if isinstance(focus, MessageView): + if isinstance (focus, MessageView): return MessageView.keyPressEvent(focus, event) - elif isinstance(focus, QtGui.QTableWidget): + elif isinstance (focus, QtGui.QTableWidget): return QtGui.QTableWidget.keyPressEvent(focus, event) - elif isinstance(focus, QtGui.QTreeWidget): + elif isinstance (focus, QtGui.QTreeWidget): return QtGui.QTreeWidget.keyPressEvent(focus, event) + # menu button 'manage keys' def click_actionManageKeys(self): - """menu button 'manage keys'""" - if 'darwin' in sys.platform or 'linux' in sys.platform: if state.appdata == '': # reply = QtGui.QMessageBox.information(self, 'keys.dat?','You # may manage your keys by editing the keys.dat file stored in # the same directory as this program. It is important that you # back up this file.', QMessageBox.Ok) - reply = QtGui.QMessageBox.information( - self, - 'keys.dat?', - _translate( - "MainWindow", - ("You may manage your keys by editing the keys.dat file stored in the same directory as this " - "program. It is important that you back up this file.")), - QtGui.QMessageBox.Ok) + reply = QtGui.QMessageBox.information(self, 'keys.dat?', _translate( + "MainWindow", "You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file."), QtGui.QMessageBox.Ok) else: - QtGui.QMessageBox.information( - self, - 'keys.dat?', - _translate( - "MainWindow", - ("You may manage your keys by editing the keys.dat file stored in\n %1 \nIt is important " - "that you back up this file.")).arg( - state.appdata), - QtGui.QMessageBox.Ok) + QtGui.QMessageBox.information(self, 'keys.dat?', _translate( + "MainWindow", "You may manage your keys by editing the keys.dat file stored in\n %1 \nIt is important that you back up this file.").arg(state.appdata), QtGui.QMessageBox.Ok) elif sys.platform == 'win32' or sys.platform == 'win64': if state.appdata == '': - reply = QtGui.QMessageBox.question( - self, - _translate( - "MainWindow", - "Open keys.dat?"), - _translate( - "MainWindow", - ("You may manage your keys by editing the keys.dat file stored in the same directory as this " - "program. It is important that you back up this file. Would you like to open the file now? " - "(Be sure to close Bitmessage before making any changes.)")), - QtGui.QMessageBox.Yes, - QtGui.QMessageBox.No) + reply = QtGui.QMessageBox.question(self, _translate("MainWindow", "Open keys.dat?"), _translate( + "MainWindow", "You may manage your keys by editing the keys.dat file stored in the same directory as this program. It is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.)"), QtGui.QMessageBox.Yes, QtGui.QMessageBox.No) else: - reply = QtGui.QMessageBox.question( - self, - _translate( - "MainWindow", - "Open keys.dat?"), - _translate( - "MainWindow", - ("You may manage your keys by editing the keys.dat file stored in\n %1 \nIt is important " - "that you back up this file. Would you like to open the file now? (Be sure to close " - "Bitmessage before making any changes.)")).arg( - state.appdata), - QtGui.QMessageBox.Yes, - QtGui.QMessageBox.No) + reply = QtGui.QMessageBox.question(self, _translate("MainWindow", "Open keys.dat?"), _translate( + "MainWindow", "You may manage your keys by editing the keys.dat file stored in\n %1 \nIt is important that you back up this file. Would you like to open the file now? (Be sure to close Bitmessage before making any changes.)").arg(state.appdata), QtGui.QMessageBox.Yes, QtGui.QMessageBox.No) if reply == QtGui.QMessageBox.Yes: shared.openKeysFile() + # menu button 'delete all treshed messages' def click_actionDeleteAllTrashedMessages(self): - """menu button 'delete all treshed messages'""" - - if QtGui.QMessageBox.question( - self, - _translate( - "MainWindow", - "Delete trash?"), - _translate( - "MainWindow", - "Are you sure you want to delete all trashed messages?"), - QtGui.QMessageBox.Yes, - QtGui.QMessageBox.No) == QtGui.QMessageBox.No: + if QtGui.QMessageBox.question(self, _translate("MainWindow", "Delete trash?"), _translate("MainWindow", "Are you sure you want to delete all trashed messages?"), QtGui.QMessageBox.Yes, QtGui.QMessageBox.No) == QtGui.QMessageBox.No: return sqlStoredProcedure('deleteandvacuume') self.rerenderTabTreeMessages() self.rerenderTabTreeSubscriptions() self.rerenderTabTreeChans() if self.getCurrentFolder(self.ui.treeWidgetYourIdentities) == "trash": - self.loadMessagelist( - self.ui.tableWidgetInbox, self.getCurrentAccount( - self.ui.treeWidgetYourIdentities), "trash") + self.loadMessagelist(self.ui.tableWidgetInbox, self.getCurrentAccount(self.ui.treeWidgetYourIdentities), "trash") elif self.getCurrentFolder(self.ui.treeWidgetSubscriptions) == "trash": - self.loadMessagelist( - self.ui.tableWidgetInboxSubscriptions, - self.getCurrentAccount( - self.ui.treeWidgetSubscriptions), - "trash") + self.loadMessagelist(self.ui.tableWidgetInboxSubscriptions, self.getCurrentAccount(self.ui.treeWidgetSubscriptions), "trash") elif self.getCurrentFolder(self.ui.treeWidgetChans) == "trash": - self.loadMessagelist( - self.ui.tableWidgetInboxChans, - self.getCurrentAccount( - self.ui.treeWidgetChans), - "trash") + self.loadMessagelist(self.ui.tableWidgetInboxChans, self.getCurrentAccount(self.ui.treeWidgetChans), "trash") + # menu button 'regenerate deterministic addresses' def click_actionRegenerateDeterministicAddresses(self): - """menu button 'regenerate deterministic addresses'""" - dialog = dialogs.RegenerateAddressesDialog(self) if dialog.exec_(): if dialog.lineEditPassphrase.text() == "": @@ -1693,14 +1537,11 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.ui.tabWidget.indexOf(self.ui.chans) ) + # opens 'join chan' dialog def click_actionJoinChan(self): - """opens 'join chan' dialog""" - dialogs.NewChanDialog(self) def showConnectDialog(self): - """TBC""" - dialog = dialogs.ConnectDialog(self) if dialog.exec_(): if dialog.radioButtonConnectNow.isChecked(): @@ -1713,8 +1554,6 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self._firstrun = False def showMigrationWizard(self, level): - """TBC""" - self.migrationWizardInstance = Ui_MigrationWizard(["a"]) if self.migrationWizardInstance.exec_(): pass @@ -1722,8 +1561,6 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth pass def changeEvent(self, event): - """TBC""" - if event.type() == QtCore.QEvent.LanguageChange: self.ui.retranslateUi(self) self.init_inbox_popup_menu(False) @@ -1735,17 +1572,15 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.ui.blackwhitelist.init_blacklist_popup_menu(False) if event.type() == QtCore.QEvent.WindowStateChange: if self.windowState() & QtCore.Qt.WindowMinimized: - if BMConfigParser().getboolean('bitmessagesettings', 'minimizetotray'): - if 'darwin' not in sys.platform: - QtCore.QTimer.singleShot(0, self.appIndicatorHide) + if BMConfigParser().getboolean('bitmessagesettings', 'minimizetotray') and not 'darwin' in sys.platform: + QtCore.QTimer.singleShot(0, self.appIndicatorHide) elif event.oldState() & QtCore.Qt.WindowMinimized: # The window state has just been changed to # Normal/Maximised/FullScreen pass + # QtGui.QWidget.changeEvent(self, event) def __icon_activated(self, reason): - """TBC""" - if reason == QtGui.QSystemTrayIcon.Trigger: self.actionShow.setChecked(not self.actionShow.isChecked()) self.appIndicatorShowOrHideWindow() @@ -1754,8 +1589,7 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth connected = False def setStatusIcon(self, color): - """Set the status icon""" - + # print 'setting status icon color' _notifications_enabled = not BMConfigParser().getboolean( 'bitmessagesettings', 'hidetrayconnectionnotifications') if color == 'red': @@ -1769,7 +1603,7 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth _translate("MainWindow", "Connection lost"), sound.SOUND_DISCONNECTED) if not BMConfigParser().safeGetBoolean('bitmessagesettings', 'upnp') and \ - BMConfigParser().get('bitmessagesettings', 'socksproxytype') == "none": + BMConfigParser().get('bitmessagesettings', 'socksproxytype') == "none": self.updateStatusBar( _translate( "MainWindow", @@ -1783,9 +1617,7 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth "MainWindow", "Not Connected")) self.setTrayIconFile("can-icon-24px-red.png") if color == 'yellow': - if self.statusbar.currentMessage() == ('Warning: You are currently not connected. Bitmessage will do ' - 'the work necessary to send the message but it won\'t send until ' - 'you connect.'): + if self.statusbar.currentMessage() == 'Warning: You are currently not connected. Bitmessage will do the work necessary to send the message but it won\'t send until you connect.': self.statusbar.clearMessage() self.pushButtonStatusIcon.setIcon( QtGui.QIcon(":/newPrefix/images/yellowicon.png")) @@ -1803,9 +1635,7 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth "MainWindow", "Connected")) self.setTrayIconFile("can-icon-24px-yellow.png") if color == 'green': - if self.statusbar.currentMessage() == ('Warning: You are currently not connected. Bitmessage will do the ' - 'work necessary to send the message but it won\'t send until you ' - 'connect.'): + if self.statusbar.currentMessage() == 'Warning: You are currently not connected. Bitmessage will do the work necessary to send the message but it won\'t send until you connect.': self.statusbar.clearMessage() self.pushButtonStatusIcon.setIcon( QtGui.QIcon(":/newPrefix/images/greenicon.png")) @@ -1822,23 +1652,17 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth "MainWindow", "Connected")) self.setTrayIconFile("can-icon-24px-green.png") - def initTrayIcon(self, iconFileName, this_app): - """TBC""" - + def initTrayIcon(self, iconFileName, app): self.currentTrayIconFileName = iconFileName self.tray = QtGui.QSystemTrayIcon( - self.calcTrayIcon(iconFileName, self.findInboxUnreadCount()), this_app) + self.calcTrayIcon(iconFileName, self.findInboxUnreadCount()), app) def setTrayIconFile(self, iconFileName): - """TBC""" - self.currentTrayIconFileName = iconFileName self.drawTrayIcon(iconFileName, self.findInboxUnreadCount()) def calcTrayIcon(self, iconFileName, inboxUnreadCount): - """TBC""" - - pixmap = QtGui.QPixmap(":/newPrefix/images/" + iconFileName) + pixmap = QtGui.QPixmap(":/newPrefix/images/"+iconFileName) if inboxUnreadCount > 0: # choose font and calculate font parameters fontName = "Lucida" @@ -1850,7 +1674,7 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth rect = fontMetrics.boundingRect(txt) # margins that we add in the top-right corner marginX = 2 - marginY = 0 # it looks like -2 is also ok due to the error of metric + marginY = 0 # it looks like -2 is also ok due to the error of metric # if it renders too wide we need to change it to a plus symbol if rect.width() > 20: txt = "+" @@ -1864,18 +1688,14 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth painter.setPen( QtGui.QPen(QtGui.QColor(255, 0, 0), QtCore.Qt.SolidPattern)) painter.setFont(font) - painter.drawText(24 - rect.right() - marginX, -rect.top() + marginY, txt) + painter.drawText(24-rect.right()-marginX, -rect.top()+marginY, txt) painter.end() return QtGui.QIcon(pixmap) def drawTrayIcon(self, iconFileName, inboxUnreadCount): - """TBC""" - self.tray.setIcon(self.calcTrayIcon(iconFileName, inboxUnreadCount)) def changedInboxUnread(self, row=None): - """TBC""" - self.drawTrayIcon( self.currentTrayIconFileName, self.findInboxUnreadCount()) self.rerenderTabTreeMessages() @@ -1883,8 +1703,6 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.rerenderTabTreeChans() def findInboxUnreadCount(self, count=None): - """TBC""" - if count is None: queryreturn = sqlQuery('''SELECT count(*) from inbox WHERE folder='inbox' and read=0''') cnt = 0 @@ -1896,14 +1714,11 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth return self.unreadCount def updateSentItemStatusByToAddress(self, toAddress, textToDisplay): - """TBC""" - for sent in [self.ui.tableWidgetInbox, self.ui.tableWidgetInboxSubscriptions, self.ui.tableWidgetInboxChans]: treeWidget = self.widgetConvert(sent) if self.getCurrentFolder(treeWidget) != "sent": continue - if treeWidget in [self.ui.treeWidgetSubscriptions, - self.ui.treeWidgetChans] and self.getCurrentAccount(treeWidget) != toAddress: + if treeWidget in [self.ui.treeWidgetSubscriptions, self.ui.treeWidgetChans] and self.getCurrentAccount(treeWidget) != toAddress: continue for i in range(sent.rowCount()): @@ -1912,7 +1727,7 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth sent.item(i, 3).setToolTip(textToDisplay) try: newlinePosition = textToDisplay.indexOf('\n') - except: # If no "_translate" appended to string before passing in, there's no qstring + except: # If someone misses adding a "_translate" to a string before passing it to this function, this function won't receive a qstring which will cause an exception. newlinePosition = 0 if newlinePosition > 1: sent.item(i, 3).setText( @@ -1921,9 +1736,7 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth sent.item(i, 3).setText(textToDisplay) def updateSentItemStatusByAckdata(self, ackdata, textToDisplay): - """TBC""" - - if isinstance(ackdata, str): + if type(ackdata) is str: ackdata = QtCore.QByteArray(ackdata) for sent in [self.ui.tableWidgetInbox, self.ui.tableWidgetInboxSubscriptions, self.ui.tableWidgetInboxChans]: treeWidget = self.widgetConvert(sent) @@ -1940,7 +1753,7 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth sent.item(i, 3).setToolTip(textToDisplay) try: newlinePosition = textToDisplay.indexOf('\n') - except: # If no "_translate" appended to string before passing in, there's no qstring + except: # If someone misses adding a "_translate" to a string before passing it to this function, this function won't receive a qstring which will cause an exception. newlinePosition = 0 if newlinePosition > 1: sent.item(i, 3).setText( @@ -1949,80 +1762,50 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth sent.item(i, 3).setText(textToDisplay) def removeInboxRowByMsgid(self, msgid): # msgid and inventoryHash are the same thing - """TBC""" - for inbox in ([ - self.ui.tableWidgetInbox, - self.ui.tableWidgetInboxSubscriptions, - self.ui.tableWidgetInboxChans]): + self.ui.tableWidgetInbox, + self.ui.tableWidgetInboxSubscriptions, + self.ui.tableWidgetInboxChans]): for i in range(inbox.rowCount()): if msgid == str(inbox.item(i, 3).data(QtCore.Qt.UserRole).toPyObject()): self.updateStatusBar( _translate("MainWindow", "Message trashed")) treeWidget = self.widgetConvert(inbox) - self.propagateUnreadCount( - inbox.item( - i, - 1 if inbox.item( - i, - 1).type == AccountMixin.SUBSCRIPTION else 0).data( - QtCore.Qt.UserRole), - self.getCurrentFolder(treeWidget), - treeWidget, - 0) + self.propagateUnreadCount(inbox.item(i, 1 if inbox.item(i, 1).type == AccountMixin.SUBSCRIPTION else 0).data(QtCore.Qt.UserRole), self.getCurrentFolder(treeWidget), treeWidget, 0) inbox.removeRow(i) break def newVersionAvailable(self, version): - """TBC""" - self.notifiedNewVersion = ".".join(str(n) for n in version) - self.updateStatusBar( - _translate( - "MainWindow", - "New version of PyBitmessage is available: %1. Download it" - " from https://github.com/Bitmessage/PyBitmessage/releases/latest" + self.updateStatusBar(_translate( + "MainWindow", + "New version of PyBitmessage is available: %1. Download it" + " from https://github.com/Bitmessage/PyBitmessage/releases/latest" ).arg(self.notifiedNewVersion) ) def displayAlert(self, title, text, exitAfterUserClicksOk): - """TBC""" - self.updateStatusBar(text) QtGui.QMessageBox.critical(self, title, text, QtGui.QMessageBox.Ok) if exitAfterUserClicksOk: - sys.exit(0) + os._exit(0) def rerenderMessagelistFromLabels(self): - """TBC""" - - for messagelist in ( - self.ui.tableWidgetInbox, - self.ui.tableWidgetInboxChans, - self.ui.tableWidgetInboxSubscriptions): + for messagelist in (self.ui.tableWidgetInbox, self.ui.tableWidgetInboxChans, self.ui.tableWidgetInboxSubscriptions): for i in range(messagelist.rowCount()): messagelist.item(i, 1).setLabel() def rerenderMessagelistToLabels(self): - """TBC""" - - for messagelist in ( - self.ui.tableWidgetInbox, - self.ui.tableWidgetInboxChans, - self.ui.tableWidgetInboxSubscriptions): + for messagelist in (self.ui.tableWidgetInbox, self.ui.tableWidgetInboxChans, self.ui.tableWidgetInboxSubscriptions): for i in range(messagelist.rowCount()): messagelist.item(i, 0).setLabel() def rerenderAddressBook(self): - """TBC""" - - def addRow(address, label, arg_type): - """TBC""" - + def addRow (address, label, type): self.ui.tableWidgetAddressBook.insertRow(0) - newItem = Ui_AddressBookWidgetItemLabel(address, unicode(label, 'utf-8'), arg_type) + newItem = Ui_AddressBookWidgetItemLabel(address, unicode(label, 'utf-8'), type) self.ui.tableWidgetAddressBook.setItem(0, 0, newItem) - newItem = Ui_AddressBookWidgetItemAddress(address, unicode(label, 'utf-8'), arg_type) + newItem = Ui_AddressBookWidgetItemAddress(address, unicode(label, 'utf-8'), type) self.ui.tableWidgetAddressBook.setItem(0, 1, newItem) oldRows = {} @@ -2054,7 +1837,7 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth newRows[address] = [label, AccountMixin.NORMAL] completerList = [] - for address in sorted(oldRows, key=lambda x: oldRows[x][2], reverse=True): + for address in sorted(oldRows, key = lambda x: oldRows[x][2], reverse = True): if address in newRows: completerList.append(unicode(newRows[address][0], encoding="UTF-8") + " <" + address + ">") newRows.pop(address) @@ -2071,42 +1854,22 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.ui.lineEditTo.completer().model().setStringList(completerList) def rerenderSubscriptions(self): - """TBC""" - self.rerenderTabTreeSubscriptions() def click_pushButtonTTL(self): - """TBC""" - QtGui.QMessageBox.information(self, 'Time To Live', _translate( - "MainWindow", - ("The TTL, or Time-To-Live is the length of time that the network will hold the message." - "The recipient must get it during this time. If your Bitmessage client does not hear an " - "acknowledgement, it will resend the message automatically. The longer the Time-To-Live, " - "the more work your computer must do to send the message. A Time-To-Live of four or five " - "days is often appropriate.")), QtGui.QMessageBox.Ok) + "MainWindow", """The TTL, or Time-To-Live is the length of time that the network will hold the message. + The recipient must get it during this time. If your Bitmessage client does not hear an acknowledgement, it + will resend the message automatically. The longer the Time-To-Live, the + more work your computer must do to send the message. A Time-To-Live of four or five days is often appropriate."""), QtGui.QMessageBox.Ok) def click_pushButtonClear(self): - """TBC""" - self.ui.lineEditSubject.setText("") self.ui.lineEditTo.setText("") self.ui.textEditMessage.setText("") self.ui.comboBoxSendFrom.setCurrentIndex(0) def click_pushButtonSend(self): - """ - TBC - - Regarding the line below `if len(message) > (2 ** 18 - 500):`: - - The whole network message must fit in 2^18 bytes. - Let's assume 500 bytes of overhead. If someone wants to get that - too an exact number you are welcome to but I think that it would - be a better use of time to support message continuation so that - users can send messages of any length. - """ - encoding = 3 if QtGui.QApplication.queryKeyboardModifiers() & QtCore.Qt.ShiftModifier else 2 self.statusbar.clearMessage() @@ -2131,6 +1894,13 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth subject = str(self.ui.lineEditSubjectBroadcast.text().toUtf8()) message = str( self.ui.textEditMessageBroadcast.document().toPlainText().toUtf8()) + """ + The whole network message must fit in 2^18 bytes. + Let's assume 500 bytes of overhead. If someone wants to get that + too an exact number you are welcome to but I think that it would + be a better use of time to support message continuation so that + users can send messages of any length. + """ if len(message) > (2 ** 18 - 500): QtGui.QMessageBox.about( self, _translate("MainWindow", "Message too long"), @@ -2144,13 +1914,11 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth acct = accountClass(fromAddress) - if sendMessageToPeople: # To send a message to specific people (rather than broadcast) + if sendMessageToPeople: # To send a message to specific people (rather than broadcast) toAddressesList = [s.strip() for s in toAddresses.replace(',', ';').split(';')] - # remove duplicate addresses. If the user has one address with a BM- and - # the same address without the BM-, this will not catch it. They'll send - # the message to the person twice. - toAddressesList = list(set(toAddressesList)) + toAddressesList = list(set( + toAddressesList)) # remove duplicate addresses. If the user has one address with a BM- and the same address without the BM-, this will not catch it. They'll send the message to the person twice. for toAddress in toAddressesList: if toAddress != '': # label plus address @@ -2163,30 +1931,25 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth subject = acct.subject toAddress = acct.toAddress else: - if QtGui.QMessageBox.question( - self, "Sending an email?", - _translate( - "MainWindow", - ("You are trying to send an email instead of a bitmessage. This requires " - "registering with a gateway. Attempt to register?")), - QtGui.QMessageBox.Yes | QtGui.QMessageBox.No) != QtGui.QMessageBox.Yes: + if QtGui.QMessageBox.question(self, "Sending an email?", _translate("MainWindow", + "You are trying to send an email instead of a bitmessage. This requires registering with a gateway. Attempt to register?"), + QtGui.QMessageBox.Yes|QtGui.QMessageBox.No) != QtGui.QMessageBox.Yes: continue email = acct.getLabel() - if email[-14:] != "@mailchuck.com": # attempt register + if email[-14:] != "@mailchuck.com": #attempt register # 12 character random email address - email = ''.join(random.SystemRandom().choice(string.ascii_lowercase) - for _ in range(12)) + "@mailchuck.com" + email = ''.join(random.SystemRandom().choice(string.ascii_lowercase) for _ in range(12)) + "@mailchuck.com" acct = MailchuckAccount(fromAddress) acct.register(email) BMConfigParser().set(fromAddress, 'label', email) BMConfigParser().set(fromAddress, 'gateway', 'mailchuck') BMConfigParser().save() - self.updateStatusBar( - _translate( - "MainWindow", - ("Error: Your account wasn't registered at an email gateway. Sending registration" - " now as %1, please wait for the registration to be processed before retrying " - "sending.") + self.updateStatusBar(_translate( + "MainWindow", + "Error: Your account wasn't registered at" + " an email gateway. Sending registration" + " now as %1, please wait for the registration" + " to be processed before retrying sending." ).arg(email) ) return @@ -2204,19 +1967,19 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth "MainWindow", "Error: Bitmessage addresses start with" " BM- Please check the recipient address %1" - ).arg(toAddress)) + ).arg(toAddress)) elif status == 'checksumfailed': self.updateStatusBar(_translate( "MainWindow", "Error: The recipient address %1 is not" " typed or copied correctly. Please check it." - ).arg(toAddress)) + ).arg(toAddress)) elif status == 'invalidcharacters': self.updateStatusBar(_translate( "MainWindow", "Error: The recipient address %1 contains" " invalid characters. Please check it." - ).arg(toAddress)) + ).arg(toAddress)) elif status == 'versiontoohigh': self.updateStatusBar(_translate( "MainWindow", @@ -2224,7 +1987,7 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth " %1 is too high. Either you need to upgrade" " your Bitmessage software or your" " acquaintance is being clever." - ).arg(toAddress)) + ).arg(toAddress)) elif status == 'ripetooshort': self.updateStatusBar(_translate( "MainWindow", @@ -2232,7 +1995,7 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth " address %1 is too short. There might be" " something wrong with the software of" " your acquaintance." - ).arg(toAddress)) + ).arg(toAddress)) elif status == 'ripetoolong': self.updateStatusBar(_translate( "MainWindow", @@ -2240,7 +2003,7 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth " address %1 is too long. There might be" " something wrong with the software of" " your acquaintance." - ).arg(toAddress)) + ).arg(toAddress)) elif status == 'varintmalformed': self.updateStatusBar(_translate( "MainWindow", @@ -2248,55 +2011,39 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth " address %1 is malformed. There might be" " something wrong with the software of" " your acquaintance." - ).arg(toAddress)) + ).arg(toAddress)) else: self.updateStatusBar(_translate( "MainWindow", "Error: Something is wrong with the" " recipient address %1." - ).arg(toAddress)) + ).arg(toAddress)) elif fromAddress == '': self.updateStatusBar(_translate( "MainWindow", - ("Error: You must specify a From address. If you don\'t have one, go to the" - " \'Your Identities\' tab."))) + "Error: You must specify a From address. If you" + " don\'t have one, go to the" + " \'Your Identities\' tab.") + ) else: toAddress = addBMIfNotPresent(toAddress) if addressVersionNumber > 4 or addressVersionNumber <= 1: - QtGui.QMessageBox.about( - self, - _translate( - "MainWindow", - "Address version number"), - _translate( - "MainWindow", - ("Concerning the address %1, Bitmessage cannot understand address version " - "numbers of %2. Perhaps upgrade Bitmessage to the latest version.") - ).arg(toAddress).arg( - str(addressVersionNumber))) + QtGui.QMessageBox.about(self, _translate("MainWindow", "Address version number"), _translate( + "MainWindow", "Concerning the address %1, Bitmessage cannot understand address version numbers of %2. Perhaps upgrade Bitmessage to the latest version.").arg(toAddress).arg(str(addressVersionNumber))) continue if streamNumber > 1 or streamNumber == 0: - QtGui.QMessageBox.about( - self, - _translate( - "MainWindow", - "Stream number"), - _translate( - "MainWindow", - ("Concerning the address %1, Bitmessage cannot handle stream numbers of %2. " - "Perhaps upgrade Bitmessage to the latest version.") - ).arg(toAddress).arg( - str(streamNumber))) + QtGui.QMessageBox.about(self, _translate("MainWindow", "Stream number"), _translate( + "MainWindow", "Concerning the address %1, Bitmessage cannot handle stream numbers of %2. Perhaps upgrade Bitmessage to the latest version.").arg(toAddress).arg(str(streamNumber))) continue self.statusbar.clearMessage() if shared.statusIconColor == 'red': - self.updateStatusBar( - _translate( - "MainWindow", - ("Warning: You are currently not connected. Bitmessage will do the work necessary" - " to send the message but it won\'t send until you connect.") - ) + self.updateStatusBar(_translate( + "MainWindow", + "Warning: You are currently not connected." + " Bitmessage will do the work necessary to" + " send the message but it won\'t send until" + " you connect.") ) stealthLevel = BMConfigParser().safeGetInt( 'bitmessagesettings', 'ackstealthlevel') @@ -2311,15 +2058,15 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth subject, message, ackdata, - int(time.time()), # sentTime (this will never change) - int(time.time()), # lastActionTime - 0, # sleepTill time. This will get set when the POW gets done. + int(time.time()), # sentTime (this will never change) + int(time.time()), # lastActionTime + 0, # sleepTill time. This will get set when the POW gets done. 'msgqueued', - 0, # retryNumber - 'sent', # folder - encoding, # encodingtype + 0, # retryNumber + 'sent', # folder + encoding, # encodingtype BMConfigParser().getint('bitmessagesettings', 'ttl') - ) + ) toLabel = '' queryreturn = sqlQuery('''select label from addressbook where address=?''', @@ -2361,28 +2108,27 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth ackdata = genAckPayload(streamNumber, 0) toAddress = str_broadcast_subscribers ripe = '' - t = ( - '', # msgid. We don't know what this will be until the POW is done. - toAddress, - ripe, - fromAddress, - subject, - message, - ackdata, - int(time.time()), # sentTime (this will never change) - int(time.time()), # lastActionTime - 0, # sleepTill time. This will get set when the POW gets done. - 'broadcastqueued', - 0, # retryNumber - 'sent', # folder - encoding, # encoding type - BMConfigParser().getint('bitmessagesettings', 'ttl') - ) + t = ('', # msgid. We don't know what this will be until the POW is done. + toAddress, + ripe, + fromAddress, + subject, + message, + ackdata, + int(time.time()), # sentTime (this will never change) + int(time.time()), # lastActionTime + 0, # sleepTill time. This will get set when the POW gets done. + 'broadcastqueued', + 0, # retryNumber + 'sent', # folder + encoding, # encoding type + BMConfigParser().getint('bitmessagesettings', 'ttl') + ) sqlExecute( '''INSERT INTO sent VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)''', *t) toLabel = str_broadcast_subscribers - + self.displayNewSentMessage( toAddress, toLabel, fromAddress, subject, message, ackdata) @@ -2399,8 +2145,6 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth "MainWindow", "Broadcast queued.")) def click_pushButtonLoadFromAddressBook(self): - """TBC""" - self.ui.tabWidget.setCurrentIndex(5) for i in range(4): time.sleep(0.1) @@ -2413,8 +2157,6 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth )) def click_pushButtonFetchNamecoinID(self): - """TBC""" - nc = namecoinConnection() identities = str(self.ui.lineEditTo.text().toUtf8()).split(";") err, addr = nc.query(identities[-1].strip()) @@ -2428,8 +2170,8 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth "MainWindow", "Fetched address from namecoin identity.")) def setBroadcastEnablementDependingOnWhetherThisIsAMailingListAddress(self, address): - """If this is a chan then don't let people broadcast because no one should subscribe to chan addresses.""" - + # If this is a chan then don't let people broadcast because no one + # should subscribe to chan addresses. self.ui.tabWidgetSend.setCurrentIndex( self.ui.tabWidgetSend.indexOf( self.ui.sendBroadcast @@ -2438,20 +2180,17 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth )) def rerenderComboBoxSendFrom(self): - """TBC""" - self.ui.comboBoxSendFrom.clear() for addressInKeysFile in getSortedAccounts(): - - # I realize that this is poor programming practice but I don't care. It's easier for others to read. - isEnabled = BMConfigParser().getboolean(addressInKeysFile, 'enabled') + isEnabled = BMConfigParser().getboolean( + addressInKeysFile, 'enabled') # I realize that this is poor programming practice but I don't care. It's easier for others to read. isMaillinglist = BMConfigParser().safeGetBoolean(addressInKeysFile, 'mailinglist') if isEnabled and not isMaillinglist: label = unicode(BMConfigParser().get(addressInKeysFile, 'label'), 'utf-8', 'ignore').strip() if label == "": label = addressInKeysFile self.ui.comboBoxSendFrom.addItem(avatarize(addressInKeysFile), label, addressInKeysFile) - +# self.ui.comboBoxSendFrom.model().sort(1, Qt.AscendingOrder) for i in range(self.ui.comboBoxSendFrom.count()): address = str(self.ui.comboBoxSendFrom.itemData( i, QtCore.Qt.UserRole).toString()) @@ -2459,26 +2198,22 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth i, AccountColor(address).accountColor(), QtCore.Qt.ForegroundRole) self.ui.comboBoxSendFrom.insertItem(0, '', '') - if self.ui.comboBoxSendFrom.count() == 2: + if(self.ui.comboBoxSendFrom.count() == 2): self.ui.comboBoxSendFrom.setCurrentIndex(1) else: self.ui.comboBoxSendFrom.setCurrentIndex(0) def rerenderComboBoxSendFromBroadcast(self): - """TBC""" - self.ui.comboBoxSendFromBroadcast.clear() for addressInKeysFile in getSortedAccounts(): - - # I realize that this is poor programming practice but I don't care. It's easier for others to read. - isEnabled = BMConfigParser().getboolean(addressInKeysFile, 'enabled') + isEnabled = BMConfigParser().getboolean( + addressInKeysFile, 'enabled') # I realize that this is poor programming practice but I don't care. It's easier for others to read. isChan = BMConfigParser().safeGetBoolean(addressInKeysFile, 'chan') if isEnabled and not isChan: label = unicode(BMConfigParser().get(addressInKeysFile, 'label'), 'utf-8', 'ignore').strip() if label == "": label = addressInKeysFile self.ui.comboBoxSendFromBroadcast.addItem(avatarize(addressInKeysFile), label, addressInKeysFile) - for i in range(self.ui.comboBoxSendFromBroadcast.count()): address = str(self.ui.comboBoxSendFromBroadcast.itemData( i, QtCore.Qt.UserRole).toString()) @@ -2486,19 +2221,16 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth i, AccountColor(address).accountColor(), QtCore.Qt.ForegroundRole) self.ui.comboBoxSendFromBroadcast.insertItem(0, '', '') - if self.ui.comboBoxSendFromBroadcast.count() == 2: + if(self.ui.comboBoxSendFromBroadcast.count() == 2): self.ui.comboBoxSendFromBroadcast.setCurrentIndex(1) else: self.ui.comboBoxSendFromBroadcast.setCurrentIndex(0) + # This function is called by the processmsg function when that function + # receives a message to an address that is acting as a + # pseudo-mailing-list. The message will be broadcast out. This function + # puts the message on the 'Sent' tab. def displayNewSentMessage(self, toAddress, toLabel, fromAddress, subject, message, ackdata): - """ - This function is called by the processmsg function when that function - receives a message to an address that is acting as a - pseudo-mailing-list. The message will be broadcast out. This function - puts the message on the 'Sent' tab. - """ - acct = accountClass(fromAddress) acct.parseMessage(toAddress, fromAddress, subject, message) tab = -1 @@ -2509,37 +2241,18 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth treeWidget = self.widgetConvert(sent) if self.getCurrentFolder(treeWidget) != "sent": continue - if all( - [ - treeWidget == self.ui.treeWidgetYourIdentities, - self.getCurrentAccount(treeWidget) not in (fromAddress, None, False), - ] - ): + if treeWidget == self.ui.treeWidgetYourIdentities and self.getCurrentAccount(treeWidget) not in (fromAddress, None, False): continue - elif all( - [ - treeWidget in [self.ui.treeWidgetSubscriptions, self.ui.treeWidgetChans], - self.getCurrentAccount(treeWidget) != toAddress, - ] - ): + elif treeWidget in [self.ui.treeWidgetSubscriptions, self.ui.treeWidgetChans] and self.getCurrentAccount(treeWidget) != toAddress: continue - elif not helper_search.check_match( - toAddress, - fromAddress, - subject, - message, - self.getCurrentSearchOption(tab), - self.getCurrentSearchLine(tab), - ): + elif not helper_search.check_match(toAddress, fromAddress, subject, message, self.getCurrentSearchOption(tab), self.getCurrentSearchLine(tab)): continue - + self.addMessageListItemSent(sent, toAddress, fromAddress, subject, "msgqueued", ackdata, time.time()) self.getAccountTextedit(acct).setPlainText(unicode(message, 'utf-8', 'replace')) sent.setCurrentCell(0, 0) def displayNewInboxMessage(self, inventoryHash, toAddress, fromAddress, subject, message): - """TBC""" - if toAddress == str_broadcast_subscribers: acct = accountClass(fromAddress) else: @@ -2547,58 +2260,17 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth inbox = self.getAccountMessagelist(acct) ret = None tab = -1 - for treeWidget in [ - self.ui.treeWidgetYourIdentities, - self.ui.treeWidgetSubscriptions, - self.ui.treeWidgetChans, - ]: + for treeWidget in [self.ui.treeWidgetYourIdentities, self.ui.treeWidgetSubscriptions, self.ui.treeWidgetChans]: tab += 1 if tab == 1: tab = 2 tableWidget = self.widgetConvert(treeWidget) - if not helper_search.check_match( - toAddress, - fromAddress, - subject, - message, - self.getCurrentSearchOption(tab), - self.getCurrentSearchLine(tab), - ): + if not helper_search.check_match(toAddress, fromAddress, subject, message, self.getCurrentSearchOption(tab), self.getCurrentSearchLine(tab)): continue - if all( - [ - tableWidget == inbox, - self.getCurrentAccount(treeWidget) == acct.address, - self.getCurrentFolder(treeWidget) in ["inbox", None], - ] - ): - ret = self.addMessageListItemInbox( - inbox, - "inbox", - inventoryHash, - toAddress, - fromAddress, - subject, - time.time(), - 0, - ) - elif treeWidget == all( - [ - self.ui.treeWidgetYourIdentities, - self.getCurrentAccount(treeWidget) is None, - self.getCurrentFolder(treeWidget) in ["inbox", "new", None] - ] - ): - ret = self.addMessageListItemInbox( - tableWidget, - "inbox", - inventoryHash, - toAddress, - fromAddress, - subject, - time.time(), - 0, - ) + if tableWidget == inbox and self.getCurrentAccount(treeWidget) == acct.address and self.getCurrentFolder(treeWidget) in ["inbox", None]: + ret = self.addMessageListItemInbox(inbox, "inbox", inventoryHash, toAddress, fromAddress, subject, time.time(), 0) + elif treeWidget == self.ui.treeWidgetYourIdentities and self.getCurrentAccount(treeWidget) is None and self.getCurrentFolder(treeWidget) in ["inbox", "new", None]: + ret = self.addMessageListItemInbox(tableWidget, "inbox", inventoryHash, toAddress, fromAddress, subject, time.time(), 0) if ret is None: acct.parseMessage(toAddress, fromAddress, subject, "") else: @@ -2612,30 +2284,18 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth unicode(acct.fromLabel, 'utf-8')), sound.SOUND_UNKNOWN ) - if any( - [ - all( - [ - self.getCurrentAccount() is not None, - self.getCurrentFolder(treeWidget) != "inbox", # pylint: disable=undefined-loop-variable - self.getCurrentFolder(treeWidget) is not None, # pylint: disable=undefined-loop-variable - ] - ), - self.getCurrentAccount(treeWidget) != acct.address # pylint: disable=undefined-loop-variable - ] - ): + if self.getCurrentAccount() is not None and ((self.getCurrentFolder(treeWidget) != "inbox" and self.getCurrentFolder(treeWidget) is not None) or self.getCurrentAccount(treeWidget) != acct.address): # Ubuntu should notify of new message irespective of # whether it's in current message list or not self.indicatorUpdate(True, to_label=acct.toLabel) # cannot find item to pass here ): - if hasattr(acct, "feedback") and acct.feedback != GatewayAccount.ALL_OK: + if hasattr(acct, "feedback") \ + and acct.feedback != GatewayAccount.ALL_OK: if acct.feedback == GatewayAccount.REGISTRATION_DENIED: dialogs.EmailGatewayDialog( self, BMConfigParser(), acct).exec_() def click_pushButtonAddAddressBook(self, dialog=None): - """TBC""" - if not dialog: dialog = dialogs.AddAddressDialog(self) dialog.exec_() @@ -2659,8 +2319,6 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.addEntryToAddressBook(address, label) def addEntryToAddressBook(self, address, label): - """TBC""" - if shared.isAddressInMyAddressBook(address): return sqlExecute('''INSERT INTO addressbook VALUES (?,?)''', label, address) @@ -2669,8 +2327,6 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.rerenderAddressBook() def addSubscription(self, address, label): - """TBC""" - # This should be handled outside of this function, for error displaying # and such, but it must also be checked here. if shared.isAddressInMySubscriptionsList(address): @@ -2686,8 +2342,6 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.rerenderTabTreeSubscriptions() def click_pushButtonAddSubscription(self): - """TBC""" - dialog = dialogs.NewSubscriptionDialog(self) dialog.exec_() try: @@ -2718,28 +2372,18 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth )) def click_pushButtonStatusIcon(self): - """TBC""" - dialogs.IconGlossaryDialog(self, config=BMConfigParser()).exec_() def click_actionHelp(self): - """TBC""" - dialogs.HelpDialog(self).exec_() def click_actionSupport(self): - """TBC""" - support.createSupportMessage(self) def click_actionAbout(self): - """TBC""" - dialogs.AboutDialog(self).exec_() def click_actionSettings(self): - """TBC""" - self.settingsDialogInstance = settingsDialog(self) if self._firstrun: self.settingsDialogInstance.ui.tabWidgetSettings.setCurrentIndex(1) @@ -2765,57 +2409,32 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.settingsDialogInstance.ui.checkBoxUseIdenticons.isChecked())) BMConfigParser().set('bitmessagesettings', 'replybelow', str( self.settingsDialogInstance.ui.checkBoxReplyBelow.isChecked())) - - lang = str(self.settingsDialogInstance.ui.languageComboBox.itemData( - self.settingsDialogInstance.ui.languageComboBox.currentIndex()).toString()) + + lang = str(self.settingsDialogInstance.ui.languageComboBox.itemData(self.settingsDialogInstance.ui.languageComboBox.currentIndex()).toString()) BMConfigParser().set('bitmessagesettings', 'userlocale', lang) change_translation(l10n.getTranslationLanguage()) - - if int(BMConfigParser().get('bitmessagesettings', 'port')) != int( - self.settingsDialogInstance.ui.lineEditTCPPort.text()): + + if int(BMConfigParser().get('bitmessagesettings', 'port')) != int(self.settingsDialogInstance.ui.lineEditTCPPort.text()): if not BMConfigParser().safeGetBoolean('bitmessagesettings', 'dontconnect'): QtGui.QMessageBox.about(self, _translate("MainWindow", "Restart"), _translate( "MainWindow", "You must restart Bitmessage for the port number change to take effect.")) BMConfigParser().set('bitmessagesettings', 'port', str( self.settingsDialogInstance.ui.lineEditTCPPort.text())) - if self.settingsDialogInstance.ui.checkBoxUPnP.isChecked() != BMConfigParser().safeGetBoolean( - 'bitmessagesettings', 'upnp' - ): - - BMConfigParser().set( - 'bitmessagesettings', 'upnp', - str(self.settingsDialogInstance.ui.checkBoxUPnP.isChecked())) + if self.settingsDialogInstance.ui.checkBoxUPnP.isChecked() != BMConfigParser().safeGetBoolean('bitmessagesettings', 'upnp'): + BMConfigParser().set('bitmessagesettings', 'upnp', str(self.settingsDialogInstance.ui.checkBoxUPnP.isChecked())) if self.settingsDialogInstance.ui.checkBoxUPnP.isChecked(): + import upnp upnpThread = upnp.uPnPThread() upnpThread.start() - - if all( - [ - BMConfigParser().get( - 'bitmessagesettings', - 'socksproxytype') == 'none', - self.settingsDialogInstance.ui.comboBoxProxyType.currentText()[0:5] == 'SOCKS', - ] - ): + #print 'self.settingsDialogInstance.ui.comboBoxProxyType.currentText()', self.settingsDialogInstance.ui.comboBoxProxyType.currentText() + #print 'self.settingsDialogInstance.ui.comboBoxProxyType.currentText())[0:5]', self.settingsDialogInstance.ui.comboBoxProxyType.currentText()[0:5] + if BMConfigParser().get('bitmessagesettings', 'socksproxytype') == 'none' and self.settingsDialogInstance.ui.comboBoxProxyType.currentText()[0:5] == 'SOCKS': if shared.statusIconColor != 'red': - QtGui.QMessageBox.about( - self, - _translate( - "MainWindow", - "Restart"), - _translate( - "MainWindow", - ("Bitmessage will use your proxy from now on but you may want to manually restart " - "Bitmessage now to close existing connections (if any)."))) - - if all( - [ - BMConfigParser().get('bitmessagesettings', 'socksproxytype')[0:5] == 'SOCKS', - self.settingsDialogInstance.ui.comboBoxProxyType.currentText()[0:5] != 'SOCKS', - ] - ): + QtGui.QMessageBox.about(self, _translate("MainWindow", "Restart"), _translate( + "MainWindow", "Bitmessage will use your proxy from now on but you may want to manually restart Bitmessage now to close existing connections (if any).")) + if BMConfigParser().get('bitmessagesettings', 'socksproxytype')[0:5] == 'SOCKS' and self.settingsDialogInstance.ui.comboBoxProxyType.currentText()[0:5] != 'SOCKS': self.statusbar.clearMessage() - state.resetNetworkProtocolAvailability() # just in case we changed something in the network connectivity + state.resetNetworkProtocolAvailability() # just in case we changed something in the network connectivity if self.settingsDialogInstance.ui.comboBoxProxyType.currentText()[0:5] == 'SOCKS': BMConfigParser().set('bitmessagesettings', 'socksproxytype', str( self.settingsDialogInstance.ui.comboBoxProxyType.currentText())) @@ -2844,13 +2463,13 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth "MainWindow", "Your maximum download and upload rate must be numbers. Ignoring what you typed.")) else: set_rates(BMConfigParser().safeGetInt("bitmessagesettings", "maxdownloadrate"), - BMConfigParser().safeGetInt("bitmessagesettings", "maxuploadrate")) + BMConfigParser().safeGetInt("bitmessagesettings", "maxuploadrate")) BMConfigParser().set('bitmessagesettings', 'maxoutboundconnections', str( int(float(self.settingsDialogInstance.ui.lineEditMaxOutboundConnections.text())))) BMConfigParser().set('bitmessagesettings', 'namecoinrpctype', - self.settingsDialogInstance.getNamecoinType()) + self.settingsDialogInstance.getNamecoinType()) BMConfigParser().set('bitmessagesettings', 'namecoinrpchost', str( self.settingsDialogInstance.ui.lineEditNamecoinHost.text())) BMConfigParser().set('bitmessagesettings', 'namecoinrpcport', str( @@ -2859,85 +2478,46 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.settingsDialogInstance.ui.lineEditNamecoinUser.text())) BMConfigParser().set('bitmessagesettings', 'namecoinrpcpassword', str( self.settingsDialogInstance.ui.lineEditNamecoinPassword.text())) - + # Demanded difficulty tab if float(self.settingsDialogInstance.ui.lineEditTotalDifficulty.text()) >= 1: BMConfigParser().set('bitmessagesettings', 'defaultnoncetrialsperbyte', str(int(float( - self.settingsDialogInstance.ui.lineEditTotalDifficulty.text() - ) * defaults.networkDefaultProofOfWorkNonceTrialsPerByte))) + self.settingsDialogInstance.ui.lineEditTotalDifficulty.text()) * defaults.networkDefaultProofOfWorkNonceTrialsPerByte))) if float(self.settingsDialogInstance.ui.lineEditSmallMessageDifficulty.text()) >= 1: BMConfigParser().set('bitmessagesettings', 'defaultpayloadlengthextrabytes', str(int(float( - self.settingsDialogInstance.ui.lineEditSmallMessageDifficulty.text() - ) * defaults.networkDefaultPayloadLengthExtraBytes))) + self.settingsDialogInstance.ui.lineEditSmallMessageDifficulty.text()) * defaults.networkDefaultPayloadLengthExtraBytes))) - if self.settingsDialogInstance.ui.comboBoxOpenCL.currentText().toUtf8( - ) != BMConfigParser().safeGet("bitmessagesettings", "opencl"): - BMConfigParser().set( - 'bitmessagesettings', 'opencl', - str(self.settingsDialogInstance.ui.comboBoxOpenCL.currentText())) + if self.settingsDialogInstance.ui.comboBoxOpenCL.currentText().toUtf8() != BMConfigParser().safeGet("bitmessagesettings", "opencl"): + BMConfigParser().set('bitmessagesettings', 'opencl', str(self.settingsDialogInstance.ui.comboBoxOpenCL.currentText())) queues.workerQueue.put(('resetPoW', '')) acceptableDifficultyChanged = False - - if any( - [ - float(self.settingsDialogInstance.ui.lineEditMaxAcceptableTotalDifficulty.text()) >= 1, - float(self.settingsDialogInstance.ui.lineEditMaxAcceptableTotalDifficulty.text()) == 0, - ] - ): - if BMConfigParser().get( - 'bitmessagesettings', - 'maxacceptablenoncetrialsperbyte', - ) != str( - int( - float( - self.settingsDialogInstance.ui.lineEditMaxAcceptableTotalDifficulty.text() - ) * defaults.networkDefaultProofOfWorkNonceTrialsPerByte - ) - ): + + if float(self.settingsDialogInstance.ui.lineEditMaxAcceptableTotalDifficulty.text()) >= 1 or float(self.settingsDialogInstance.ui.lineEditMaxAcceptableTotalDifficulty.text()) == 0: + if BMConfigParser().get('bitmessagesettings','maxacceptablenoncetrialsperbyte') != str(int(float( + self.settingsDialogInstance.ui.lineEditMaxAcceptableTotalDifficulty.text()) * defaults.networkDefaultProofOfWorkNonceTrialsPerByte)): # the user changed the max acceptable total difficulty acceptableDifficultyChanged = True BMConfigParser().set('bitmessagesettings', 'maxacceptablenoncetrialsperbyte', str(int(float( - self.settingsDialogInstance.ui.lineEditMaxAcceptableTotalDifficulty.text() - ) * defaults.networkDefaultProofOfWorkNonceTrialsPerByte))) - - if any( - [ - float(self.settingsDialogInstance.ui.lineEditMaxAcceptableSmallMessageDifficulty.text()) >= 1, - float(self.settingsDialogInstance.ui.lineEditMaxAcceptableSmallMessageDifficulty.text()) == 0, - ] - ): - if BMConfigParser().get( - 'bitmessagesettings', - 'maxacceptablepayloadlengthextrabytes', - ) != str( - int( - float( - self.settingsDialogInstance.ui.lineEditMaxAcceptableSmallMessageDifficulty.text() - ) * defaults.networkDefaultPayloadLengthExtraBytes - ) - ): + self.settingsDialogInstance.ui.lineEditMaxAcceptableTotalDifficulty.text()) * defaults.networkDefaultProofOfWorkNonceTrialsPerByte))) + if float(self.settingsDialogInstance.ui.lineEditMaxAcceptableSmallMessageDifficulty.text()) >= 1 or float(self.settingsDialogInstance.ui.lineEditMaxAcceptableSmallMessageDifficulty.text()) == 0: + if BMConfigParser().get('bitmessagesettings','maxacceptablepayloadlengthextrabytes') != str(int(float( + self.settingsDialogInstance.ui.lineEditMaxAcceptableSmallMessageDifficulty.text()) * defaults.networkDefaultPayloadLengthExtraBytes)): # the user changed the max acceptable small message difficulty acceptableDifficultyChanged = True BMConfigParser().set('bitmessagesettings', 'maxacceptablepayloadlengthextrabytes', str(int(float( - self.settingsDialogInstance.ui.lineEditMaxAcceptableSmallMessageDifficulty.text() - ) * defaults.networkDefaultPayloadLengthExtraBytes))) + self.settingsDialogInstance.ui.lineEditMaxAcceptableSmallMessageDifficulty.text()) * defaults.networkDefaultPayloadLengthExtraBytes))) if acceptableDifficultyChanged: - # It might now be possible to send msgs which were previously marked as toodifficult. + # It might now be possible to send msgs which were previously marked as toodifficult. # Let us change them to 'msgqueued'. The singleWorker will try to send them and will again # mark them as toodifficult if the receiver's required difficulty is still higher than # we are willing to do. sqlExecute('''UPDATE sent SET status='msgqueued' WHERE status='toodifficult' ''') queues.workerQueue.put(('sendmessage', '')) - - # start:UI setting to stop trying to send messages after X days/months + + #start:UI setting to stop trying to send messages after X days/months # I'm open to changing this UI to something else if someone has a better idea. - if all( - [ - self.settingsDialogInstance.ui.lineEditDays.text() == '', - self.settingsDialogInstance.ui.lineEditMonths.text() == '', - ] - ): # We need to handle this special case. Bitmessage has its default behavior. The input is blank/blank + if ((self.settingsDialogInstance.ui.lineEditDays.text()=='') and (self.settingsDialogInstance.ui.lineEditMonths.text()=='')):#We need to handle this special case. Bitmessage has its default behavior. The input is blank/blank BMConfigParser().set('bitmessagesettings', 'stopresendingafterxdays', '') BMConfigParser().set('bitmessagesettings', 'stopresendingafterxmonths', '') shared.maximumLengthOfTimeToBotherResendingMessages = float('inf') @@ -2956,41 +2536,24 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth if lineEditMonthsIsValidFloat and not lineEditDaysIsValidFloat: self.settingsDialogInstance.ui.lineEditDays.setText("0") if lineEditDaysIsValidFloat or lineEditMonthsIsValidFloat: - if all( - [ - float(self.settingsDialogInstance.ui.lineEditDays.text()) >= 0, - float(self.settingsDialogInstance.ui.lineEditMonths.text()) >= 0, - ] - ): - shared.maximumLengthOfTimeToBotherResendingMessages = sum( - float(str(self.settingsDialogInstance.ui.lineEditDays.text())) * 24 * 60 * 60, - float(str(self.settingsDialogInstance.ui.lineEditMonths.text())) * (60 * 60 * 24 * 365) / 12, - ) - # If the time period is less than 5 hours, we give zero values to all - # fields. No message will be sent again. - if shared.maximumLengthOfTimeToBotherResendingMessages < 432000: - QtGui.QMessageBox.about( - self, - _translate( - "MainWindow", - "Will not resend ever"), - _translate( - "MainWindow", - ("Note that the time limit you entered is less than the amount of time Bitmessage " - "waits for the first resend attempt therefore your messages will never be resent."))) + if (float(self.settingsDialogInstance.ui.lineEditDays.text()) >=0 and float(self.settingsDialogInstance.ui.lineEditMonths.text()) >=0): + shared.maximumLengthOfTimeToBotherResendingMessages = (float(str(self.settingsDialogInstance.ui.lineEditDays.text())) * 24 * 60 * 60) + (float(str(self.settingsDialogInstance.ui.lineEditMonths.text())) * (60 * 60 * 24 *365)/12) + if shared.maximumLengthOfTimeToBotherResendingMessages < 432000: # If the time period is less than 5 hours, we give zero values to all fields. No message will be sent again. + QtGui.QMessageBox.about(self, _translate("MainWindow", "Will not resend ever"), _translate( + "MainWindow", "Note that the time limit you entered is less than the amount of time Bitmessage waits for the first resend attempt therefore your messages will never be resent.")) BMConfigParser().set('bitmessagesettings', 'stopresendingafterxdays', '0') BMConfigParser().set('bitmessagesettings', 'stopresendingafterxmonths', '0') shared.maximumLengthOfTimeToBotherResendingMessages = 0 else: BMConfigParser().set('bitmessagesettings', 'stopresendingafterxdays', str(float( - self.settingsDialogInstance.ui.lineEditDays.text()))) + self.settingsDialogInstance.ui.lineEditDays.text()))) BMConfigParser().set('bitmessagesettings', 'stopresendingafterxmonths', str(float( - self.settingsDialogInstance.ui.lineEditMonths.text()))) + self.settingsDialogInstance.ui.lineEditMonths.text()))) BMConfigParser().save() if 'win32' in sys.platform or 'win64' in sys.platform: - # Auto-startup for Windows + # Auto-startup for Windows RUN_PATH = "HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Run" self.settings = QtCore.QSettings(RUN_PATH, QtCore.QSettings.NativeFormat) if BMConfigParser().getboolean('bitmessagesettings', 'startonlogon'): @@ -3004,56 +2567,46 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth # startup for linux pass - # If we are NOT using portable mode now but the user selected that we should... - if state.appdata != paths.lookupExeFolder(): - if self.settingsDialogInstance.ui.checkBoxPortableMode.isChecked(): + if state.appdata != paths.lookupExeFolder() and self.settingsDialogInstance.ui.checkBoxPortableMode.isChecked(): # If we are NOT using portable mode now but the user selected that we should... + # Write the keys.dat file to disk in the new location + sqlStoredProcedure('movemessagstoprog') + with open(paths.lookupExeFolder() + 'keys.dat', 'wb') as configfile: + BMConfigParser().write(configfile) + # Write the knownnodes.dat file to disk in the new location + knownnodes.saveKnownNodes(paths.lookupExeFolder()) + os.remove(state.appdata + 'keys.dat') + os.remove(state.appdata + 'knownnodes.dat') + previousAppdataLocation = state.appdata + state.appdata = paths.lookupExeFolder() + debug.restartLoggingInUpdatedAppdataLocation() + try: + os.remove(previousAppdataLocation + 'debug.log') + os.remove(previousAppdataLocation + 'debug.log.1') + except: + pass - # Write the keys.dat file to disk in the new location - sqlStoredProcedure('movemessagstoprog') - with open(paths.lookupExeFolder() + 'keys.dat', 'wb') as configfile: - BMConfigParser().write(configfile) - # Write the knownnodes.dat file to disk in the new location - knownnodes.saveKnownNodes(paths.lookupExeFolder()) - os.remove(state.appdata + 'keys.dat') - os.remove(state.appdata + 'knownnodes.dat') - previousAppdataLocation = state.appdata - state.appdata = paths.lookupExeFolder() - debug.restartLoggingInUpdatedAppdataLocation() - try: - os.remove(previousAppdataLocation + 'debug.log') - os.remove(previousAppdataLocation + 'debug.log.1') - except: - pass - - # If we ARE using portable mode now but the user selected that we shouldn't... - if state.appdata == paths.lookupExeFolder(): - if not self.settingsDialogInstance.ui.checkBoxPortableMode.isChecked(): - - state.appdata = paths.lookupAppdataFolder() - if not os.path.exists(state.appdata): - os.makedirs(state.appdata) - sqlStoredProcedure('movemessagstoappdata') - # Write the keys.dat file to disk in the new location - BMConfigParser().save() - # Write the knownnodes.dat file to disk in the new location - knownnodes.saveKnownNodes(state.appdata) - os.remove(paths.lookupExeFolder() + 'keys.dat') - os.remove(paths.lookupExeFolder() + 'knownnodes.dat') - debug.restartLoggingInUpdatedAppdataLocation() - try: - os.remove(paths.lookupExeFolder() + 'debug.log') - os.remove(paths.lookupExeFolder() + 'debug.log.1') - except: - pass + if state.appdata == paths.lookupExeFolder() and not self.settingsDialogInstance.ui.checkBoxPortableMode.isChecked(): # If we ARE using portable mode now but the user selected that we shouldn't... + state.appdata = paths.lookupAppdataFolder() + if not os.path.exists(state.appdata): + os.makedirs(state.appdata) + sqlStoredProcedure('movemessagstoappdata') + # Write the keys.dat file to disk in the new location + BMConfigParser().save() + # Write the knownnodes.dat file to disk in the new location + knownnodes.saveKnownNodes(state.appdata) + os.remove(paths.lookupExeFolder() + 'keys.dat') + os.remove(paths.lookupExeFolder() + 'knownnodes.dat') + debug.restartLoggingInUpdatedAppdataLocation() + try: + os.remove(paths.lookupExeFolder() + 'debug.log') + os.remove(paths.lookupExeFolder() + 'debug.log.1') + except: + pass def on_action_SpecialAddressBehaviorDialog(self): - """TBC""" - dialogs.SpecialAddressBehaviorDialog(self, BMConfigParser()) def on_action_EmailGatewayDialog(self): - """TBC""" - dialog = dialogs.EmailGatewayDialog(self, config=BMConfigParser()) # For Modal dialogs dialog.exec_() @@ -3084,8 +2637,6 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.ui.textEditMessage.setFocus() def on_action_MarkAllRead(self): - """TBC""" - if QtGui.QMessageBox.question( self, "Marking all messages as read?", _translate( @@ -3122,16 +2673,12 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth if markread > 0: self.propagateUnreadCount() - # addressAtCurrentRow, self.getCurrentFolder(), None, 0) + # addressAtCurrentRow, self.getCurrentFolder(), None, 0) def click_NewAddressDialog(self): - """TBC""" - dialogs.NewAddressDialog(self) def network_switch(self): - """TBC""" - dontconnect_option = not BMConfigParser().safeGetBoolean( 'bitmessagesettings', 'dontconnect') BMConfigParser().set( @@ -3143,8 +2690,15 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth dontconnect_option or self.namecoin.test()[0] == 'failed' ) + # Quit selected from menu or application indicator def quit(self): - """Quit selected from menu or application indicator""" + '''quit_msg = "Are you sure you want to exit Bitmessage?" + reply = QtGui.QMessageBox.question(self, 'Message', + quit_msg, QtGui.QMessageBox.Yes, QtGui.QMessageBox.No) + + if reply is QtGui.QMessageBox.No: + return + ''' if self.quitAccepted: return @@ -3159,50 +2713,20 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth # C PoW currently doesn't support interrupting and OpenCL is untested if getPowType() == "python" and (powQueueSize() > 0 or pendingUpload() > 0): - reply = QtGui.QMessageBox.question( - self, - _translate( - "MainWindow", - "Proof of work pending"), - _translate( - "MainWindow", - "%n object(s) pending proof of work", - None, - QtCore.QCoreApplication.CodecForTr, - powQueueSize()) + - ", " + - _translate( - "MainWindow", - "%n object(s) waiting to be distributed", - None, - QtCore.QCoreApplication.CodecForTr, - pendingUpload()) + - "\n\n" + - _translate( - "MainWindow", - "Wait until these tasks finish?"), - QtGui.QMessageBox.Yes | QtGui.QMessageBox.No | QtGui.QMessageBox.Cancel, - QtGui.QMessageBox.Cancel) + reply = QtGui.QMessageBox.question(self, _translate("MainWindow", "Proof of work pending"), + _translate("MainWindow", "%n object(s) pending proof of work", None, QtCore.QCoreApplication.CodecForTr, powQueueSize()) + ", " + + _translate("MainWindow", "%n object(s) waiting to be distributed", None, QtCore.QCoreApplication.CodecForTr, pendingUpload()) + "\n\n" + + _translate("MainWindow", "Wait until these tasks finish?"), + QtGui.QMessageBox.Yes|QtGui.QMessageBox.No|QtGui.QMessageBox.Cancel, QtGui.QMessageBox.Cancel) if reply == QtGui.QMessageBox.No: waitForPow = False elif reply == QtGui.QMessageBox.Cancel: return if pendingDownload() > 0: - reply = QtGui.QMessageBox.question( - self, - _translate( - "MainWindow", - "Synchronisation pending"), - _translate( - "MainWindow", - ("Bitmessage hasn't synchronised with the network, %n object(s) to be downloaded. If you quit " - "now, it may cause delivery delays. Wait until the synchronisation finishes?"), - None, - QtCore.QCoreApplication.CodecForTr, - pendingDownload()), - QtGui.QMessageBox.Yes | QtGui.QMessageBox.No | QtGui.QMessageBox.Cancel, - QtGui.QMessageBox.Cancel) + reply = QtGui.QMessageBox.question(self, _translate("MainWindow", "Synchronisation pending"), + _translate("MainWindow", "Bitmessage hasn't synchronised with the network, %n object(s) to be downloaded. If you quit now, it may cause delivery delays. Wait until the synchronisation finishes?", None, QtCore.QCoreApplication.CodecForTr, pendingDownload()), + QtGui.QMessageBox.Yes|QtGui.QMessageBox.No|QtGui.QMessageBox.Cancel, QtGui.QMessageBox.Cancel) if reply == QtGui.QMessageBox.Yes: waitForSync = True elif reply == QtGui.QMessageBox.Cancel: @@ -3210,17 +2734,9 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth if shared.statusIconColor == 'red' and not BMConfigParser().safeGetBoolean( 'bitmessagesettings', 'dontconnect'): - reply = QtGui.QMessageBox.question( - self, - _translate( - "MainWindow", - "Not connected"), - _translate( - "MainWindow", - ("Bitmessage isn't connected to the network. If you quit now, it may cause delivery delays. " - "Wait until connected and the synchronisation finishes?")), - QtGui.QMessageBox.Yes | QtGui.QMessageBox.No | QtGui.QMessageBox.Cancel, - QtGui.QMessageBox.Cancel) + reply = QtGui.QMessageBox.question(self, _translate("MainWindow", "Not connected"), + _translate("MainWindow", "Bitmessage isn't connected to the network. If you quit now, it may cause delivery delays. Wait until connected and the synchronisation finishes?"), + QtGui.QMessageBox.Yes|QtGui.QMessageBox.No|QtGui.QMessageBox.Cancel, QtGui.QMessageBox.Cancel) if reply == QtGui.QMessageBox.Yes: waitForConnection = True waitForSync = True @@ -3241,9 +2757,7 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth QtCore.QEventLoop.AllEvents, 1000 ) - # this probably will not work correctly, because there is a delay between - # the status icon turning red and inventory exchange, but it's better than - # nothing. + # this probably will not work correctly, because there is a delay between the status icon turning red and inventory exchange, but it's better than nothing. if waitForSync: self.updateStatusBar(_translate( "MainWindow", "Waiting for finishing synchronisation...")) @@ -3263,11 +2777,10 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth if curWorkerQueue > maxWorkerQueue: maxWorkerQueue = curWorkerQueue if curWorkerQueue > 0: - self.updateStatusBar( - _translate( - "MainWindow", - "Waiting for PoW to finish... %1%", - ).arg(50 * (maxWorkerQueue - curWorkerQueue) / maxWorkerQueue) + self.updateStatusBar(_translate( + "MainWindow", "Waiting for PoW to finish... %1%" + ).arg(50 * (maxWorkerQueue - curWorkerQueue) + / maxWorkerQueue) ) time.sleep(0.5) QtCore.QCoreApplication.processEvents( @@ -3291,13 +2804,12 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.updateStatusBar(_translate( "MainWindow", "Waiting for objects to be sent... %1%").arg(50)) maxPendingUpload = max(1, pendingUpload()) - + while pendingUpload() > 1: - self.updateStatusBar( - _translate( - "MainWindow", - "Waiting for objects to be sent... %1%" - ).arg(int(50 + 20 * (pendingUpload() / maxPendingUpload))) + self.updateStatusBar(_translate( + "MainWindow", + "Waiting for objects to be sent... %1%" + ).arg(int(50 + 20 * (pendingUpload()/maxPendingUpload))) ) time.sleep(0.5) QtCore.QCoreApplication.processEvents( @@ -3340,11 +2852,11 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth shared.thisapp.cleanup() logger.info("Shutdown complete") super(MyForm, myapp).close() - sys.exit(0) + # return + os._exit(0) + # window close event def closeEvent(self, event): - """window close event""" - self.appIndicatorHide() trayonclose = False @@ -3365,8 +2877,6 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.quit() def on_action_InboxMessageForceHtml(self): - """TBC""" - msgid = self.getCurrentMessageId() textEdit = self.getCurrentMessageTextedit() if not msgid: @@ -3385,54 +2895,60 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth lines[i]) elif lines[i] == '------------------------------------------------------': lines[i] = '
' - elif lines[i] == '' and (i + 1) < totalLines and \ - lines[i + 1] != '------------------------------------------------------': + elif lines[i] == '' and (i+1) < totalLines and \ + lines[i+1] != '------------------------------------------------------': lines[i] = '

' - content = ' '.join(lines) # To keep the whitespace between lines + content = ' '.join(lines) # To keep the whitespace between lines content = shared.fixPotentiallyInvalidUTF8Data(content) content = unicode(content, 'utf-8)') textEdit.setHtml(QtCore.QString(content)) def on_action_InboxMarkUnread(self): - """TBC""" - tableWidget = self.getCurrentMessagelist() if not tableWidget: return msgids = set() + # modified = 0 for row in tableWidget.selectedIndexes(): currentRow = row.row() msgid = str(tableWidget.item( currentRow, 3).data(QtCore.Qt.UserRole).toPyObject()) msgids.add(msgid) + # if not tableWidget.item(currentRow, 0).unread: + # modified += 1 self.updateUnreadStatus(tableWidget, currentRow, msgid, False) + # for 1081 idCount = len(msgids) + # rowcount = sqlExecuteChunked( '''UPDATE inbox SET read=0 WHERE msgid IN ({0}) AND read=1''', idCount, *msgids ) self.propagateUnreadCount() + # if rowcount == 1: + # # performance optimisation + # self.propagateUnreadCount(tableWidget.item(currentRow, 1 if tableWidget.item(currentRow, 1).type == AccountMixin.SUBSCRIPTION else 0).data(QtCore.Qt.UserRole), self.getCurrentFolder()) + # else: + # self.propagateUnreadCount(tableWidget.item(currentRow, 1 if tableWidget.item(currentRow, 1).type == AccountMixin.SUBSCRIPTION else 0).data(QtCore.Qt.UserRole), self.getCurrentFolder(), self.getCurrentTreeWidget(), 0) + # tableWidget.selectRow(currentRow + 1) + # This doesn't de-select the last message if you try to mark it unread, but that doesn't interfere. Might not be necessary. + # We could also select upwards, but then our problem would be with the topmost message. + # tableWidget.clearSelection() manages to mark the message as read again. + # Format predefined text on message reply. def quoted_text(self, message): - """Format predefined text on message reply.""" - if not BMConfigParser().safeGetBoolean('bitmessagesettings', 'replybelow'): - return '\n\n------------------------------------------------------\n' + message - - quoteWrapper = textwrap.TextWrapper( - replace_whitespace=False, - initial_indent='> ', - subsequent_indent='> ', - break_long_words=False, - break_on_hyphens=False, - ) + return '\n\n------------------------------------------------------\n' + message + quoteWrapper = textwrap.TextWrapper(replace_whitespace = False, + initial_indent = '> ', + subsequent_indent = '> ', + break_long_words = False, + break_on_hyphens = False) def quote_line(line): - """TBC""" - # Do quote empty lines. if line == '' or line.isspace(): return '> ' @@ -3440,13 +2956,11 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth elif line[0:2] == '> ': return '> ' + line # Wrap and quote lines/paragraphs new to this message. - return quoteWrapper.fill(line) - + else: + return quoteWrapper.fill(line) return '\n'.join([quote_line(l) for l in message.splitlines()]) + '\n\n' - def setSendFromComboBox(self, address=None): - """TBC""" - + def setSendFromComboBox(self, address = None): if address is None: messagelist = self.getCurrentMessagelist() if messagelist: @@ -3462,23 +2976,19 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth box.setCurrentIndex(0) def on_action_InboxReplyChan(self): - """TBC""" - self.on_action_InboxReply(self.REPLY_TYPE_CHAN) - - def on_action_InboxReply(self, replyType=None): - """TBC""" - + + def on_action_InboxReply(self, replyType = None): tableWidget = self.getCurrentMessagelist() if not tableWidget: return - + if replyType is None: replyType = self.REPLY_TYPE_SENDER - + # save this to return back after reply is done self.replyFromTab = self.ui.tabWidget.currentIndex() - + currentInboxRow = tableWidget.currentRow() toAddressAtCurrentInboxRow = tableWidget.item( currentInboxRow, 0).address @@ -3492,13 +3002,7 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth if queryreturn != []: for row in queryreturn: messageAtCurrentInboxRow, = row - acct.parseMessage( - toAddressAtCurrentInboxRow, - fromAddressAtCurrentInboxRow, - tableWidget.item( - currentInboxRow, - 2).subject, - messageAtCurrentInboxRow) + acct.parseMessage(toAddressAtCurrentInboxRow, fromAddressAtCurrentInboxRow, tableWidget.item(currentInboxRow, 2).subject, messageAtCurrentInboxRow) widget = { 'subject': self.ui.lineEditSubject, 'from': self.ui.comboBoxSendFrom, @@ -3508,23 +3012,13 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.ui.tabWidgetSend.setCurrentIndex( self.ui.tabWidgetSend.indexOf(self.ui.sendDirect) ) +# toAddressAtCurrentInboxRow = fromAddressAtCurrentInboxRow elif not BMConfigParser().has_section(toAddressAtCurrentInboxRow): - QtGui.QMessageBox.information( - self, _translate("MainWindow", "Address is gone"), - _translate("MainWindow", "Bitmessage cannot find your address %1. Perhaps you removed it?").arg( - toAddressAtCurrentInboxRow), - QtGui.QMessageBox.Ok) + QtGui.QMessageBox.information(self, _translate("MainWindow", "Address is gone"), _translate( + "MainWindow", "Bitmessage cannot find your address %1. Perhaps you removed it?").arg(toAddressAtCurrentInboxRow), QtGui.QMessageBox.Ok) elif not BMConfigParser().getboolean(toAddressAtCurrentInboxRow, 'enabled'): - QtGui.QMessageBox.information( - self, - _translate( - "MainWindow", - "Address disabled"), - _translate( - "MainWindow", - ("Error: The address from which you are trying to send is disabled. You\'ll have to enable it on " - "the \'Your Identities\' tab before using it.")), - QtGui.QMessageBox.Ok) + QtGui.QMessageBox.information(self, _translate("MainWindow", "Address disabled"), _translate( + "MainWindow", "Error: The address from which you are trying to send is disabled. You\'ll have to enable it on the \'Your Identities\' tab before using it."), QtGui.QMessageBox.Ok) else: self.setBroadcastEnablementDependingOnWhetherThisIsAMailingListAddress(toAddressAtCurrentInboxRow) broadcast_tab_index = self.ui.tabWidgetSend.indexOf( @@ -3539,31 +3033,21 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.ui.tabWidgetSend.setCurrentIndex(broadcast_tab_index) toAddressAtCurrentInboxRow = fromAddressAtCurrentInboxRow if fromAddressAtCurrentInboxRow == tableWidget.item(currentInboxRow, 1).label or ( - isinstance(acct, GatewayAccount) and fromAddressAtCurrentInboxRow == acct.relayAddress): + isinstance(acct, GatewayAccount) and fromAddressAtCurrentInboxRow == acct.relayAddress): self.ui.lineEditTo.setText(str(acct.fromAddress)) else: - self.ui.lineEditTo.setText( - ''.join( - [ - tableWidget.item(currentInboxRow, 1).label, - " <", - str(acct.fromAddress) + ">", - ] - ) - ) - - # If the previous message was to a chan then we should send our reply to - # the chan rather than to the particular person who sent the message. + self.ui.lineEditTo.setText(tableWidget.item(currentInboxRow, 1).label + " <" + str(acct.fromAddress) + ">") + + # If the previous message was to a chan then we should send our reply to the chan rather than to the particular person who sent the message. if acct.type == AccountMixin.CHAN and replyType == self.REPLY_TYPE_CHAN: logger.debug('original sent to a chan. Setting the to address in the reply to the chan address.') if toAddressAtCurrentInboxRow == tableWidget.item(currentInboxRow, 0).label: self.ui.lineEditTo.setText(str(toAddressAtCurrentInboxRow)) else: - self.ui.lineEditTo.setText(tableWidget.item( - currentInboxRow, 0).label + " <" + str(acct.toAddress) + ">") - + self.ui.lineEditTo.setText(tableWidget.item(currentInboxRow, 0).label + " <" + str(acct.toAddress) + ">") + self.setSendFromComboBox(toAddressAtCurrentInboxRow) - + quotedText = self.quoted_text(unicode(messageAtCurrentInboxRow, 'utf-8', 'replace')) widget['message'].setPlainText(quotedText) if acct.subject[0:3] in ['Re:', 'RE:']: @@ -3576,8 +3060,6 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth widget['message'].setFocus() def on_action_InboxAddSenderToAddressBook(self): - """TBC""" - tableWidget = self.getCurrentMessagelist() if not tableWidget: return @@ -3592,8 +3074,6 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth dialogs.AddAddressDialog(self, addressAtCurrentInboxRow)) def on_action_InboxAddSenderToBlackList(self): - """TBC""" - tableWidget = self.getCurrentMessagelist() if not tableWidget: return @@ -3607,37 +3087,25 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth queryreturn = sqlQuery('''select * from blacklist where address=?''', addressAtCurrentInboxRow) if queryreturn == []: - label = "\"" + tableWidget.item(currentInboxRow, - 2).subject + "\" in " + BMConfigParser().get(recipientAddress, - "label") + label = "\"" + tableWidget.item(currentInboxRow, 2).subject + "\" in " + BMConfigParser().get(recipientAddress, "label") sqlExecute('''INSERT INTO blacklist VALUES (?,?, ?)''', label, addressAtCurrentInboxRow, True) self.ui.blackwhitelist.rerenderBlackWhiteList() - self.updateStatusBar( - _translate( - "MainWindow", - "Entry added to the blacklist. Edit the label to your liking." - ) + self.updateStatusBar(_translate( + "MainWindow", + "Entry added to the blacklist. Edit the label to your liking.") ) else: - self.updateStatusBar( - _translate( - "MainWindow", - ("Error: You cannot add the same address to your blacklist" - " twice. Try renaming the existing one if you want.") - ) - ) - - def deleteRowFromMessagelist(self, row=None, inventoryHash=None, ackData=None, messageLists=None): - """TBC""" + self.updateStatusBar(_translate( + "MainWindow", + "Error: You cannot add the same address to your blacklist" + " twice. Try renaming the existing one if you want.")) + def deleteRowFromMessagelist(self, row = None, inventoryHash = None, ackData = None, messageLists = None): if messageLists is None: - messageLists = ( - self.ui.tableWidgetInbox, - self.ui.tableWidgetInboxChans, - self.ui.tableWidgetInboxSubscriptions) - elif not isinstance(messageLists, (list, tuple)): + messageLists = (self.ui.tableWidgetInbox, self.ui.tableWidgetInboxChans, self.ui.tableWidgetInboxSubscriptions) + elif type(messageLists) not in (list, tuple): messageLists = (messageLists) for messageList in messageLists: if row is not None: @@ -3653,35 +3121,34 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth if messageList.item(i, 3).data(QtCore.Qt.UserRole).toPyObject() == ackData: messageList.removeRow(i) + # Send item on the Inbox tab to trash def on_action_InboxTrash(self): - """Send item on the Inbox tab to trash""" - tableWidget = self.getCurrentMessagelist() if not tableWidget: return currentRow = 0 folder = self.getCurrentFolder() shifted = QtGui.QApplication.queryKeyboardModifiers() & QtCore.Qt.ShiftModifier - tableWidget.setUpdatesEnabled(False) + tableWidget.setUpdatesEnabled(False); inventoryHashesToTrash = [] # ranges in reversed order for r in sorted(tableWidget.selectedRanges(), key=lambda r: r.topRow())[::-1]: - for i in range(r.bottomRow() - r.topRow() + 1): + for i in range(r.bottomRow()-r.topRow()+1): inventoryHashToTrash = str(tableWidget.item( - r.topRow() + i, 3).data(QtCore.Qt.UserRole).toPyObject()) + r.topRow()+i, 3).data(QtCore.Qt.UserRole).toPyObject()) if inventoryHashToTrash in inventoryHashesToTrash: continue inventoryHashesToTrash.append(inventoryHashToTrash) currentRow = r.topRow() self.getCurrentMessageTextedit().setText("") - tableWidget.model().removeRows(r.topRow(), r.bottomRow() - r.topRow() + 1) + tableWidget.model().removeRows(r.topRow(), r.bottomRow()-r.topRow()+1) idCount = len(inventoryHashesToTrash) if folder == "trash" or shifted: sqlExecuteChunked('''DELETE FROM inbox WHERE msgid IN ({0})''', - idCount, *inventoryHashesToTrash) + idCount, *inventoryHashesToTrash) else: sqlExecuteChunked('''UPDATE inbox SET folder='trash' WHERE msgid IN ({0})''', - idCount, *inventoryHashesToTrash) + idCount, *inventoryHashesToTrash) tableWidget.selectRow(0 if currentRow == 0 else currentRow - 1) tableWidget.setUpdatesEnabled(True) self.propagateUnreadCount(self.getCurrentAccount, folder) @@ -3689,8 +3156,6 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth "MainWindow", "Moved items to trash.")) def on_action_TrashUndelete(self): - """TBC""" - tableWidget = self.getCurrentMessagelist() if not tableWidget: return @@ -3699,30 +3164,28 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth inventoryHashesToTrash = [] # ranges in reversed order for r in sorted(tableWidget.selectedRanges(), key=lambda r: r.topRow())[::-1]: - for i in range(r.bottomRow() - r.topRow() + 1): + for i in range(r.bottomRow()-r.topRow()+1): inventoryHashToTrash = str(tableWidget.item( - r.topRow() + i, 3).data(QtCore.Qt.UserRole).toPyObject()) + r.topRow()+i, 3).data(QtCore.Qt.UserRole).toPyObject()) if inventoryHashToTrash in inventoryHashesToTrash: continue inventoryHashesToTrash.append(inventoryHashToTrash) currentRow = r.topRow() self.getCurrentMessageTextedit().setText("") - tableWidget.model().removeRows(r.topRow(), r.bottomRow() - r.topRow() + 1) + tableWidget.model().removeRows(r.topRow(), r.bottomRow()-r.topRow()+1) if currentRow == 0: tableWidget.selectRow(currentRow) else: tableWidget.selectRow(currentRow - 1) idCount = len(inventoryHashesToTrash) sqlExecuteChunked('''UPDATE inbox SET folder='inbox' WHERE msgid IN({0})''', - idCount, *inventoryHashesToTrash) + idCount, *inventoryHashesToTrash) tableWidget.selectRow(0 if currentRow == 0 else currentRow - 1) tableWidget.setUpdatesEnabled(True) self.propagateUnreadCount(self.getCurrentAccount) self.updateStatusBar(_translate("MainWindow", "Undeleted item.")) def on_action_InboxSaveMessageAs(self): - """TBC""" - tableWidget = self.getCurrentMessagelist() if not tableWidget: return @@ -3743,9 +3206,7 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth message, = row defaultFilename = "".join(x for x in subjectAtCurrentInboxRow if x.isalnum()) + '.txt' - filename = QtGui.QFileDialog.getSaveFileName( - self, _translate("MainWindow", "Save As..."), - defaultFilename, "Text files (*.txt);;All files (*.*)") + filename = QtGui.QFileDialog.getSaveFileName(self, _translate("MainWindow","Save As..."), defaultFilename, "Text files (*.txt);;All files (*.*)") if filename == '': return try: @@ -3756,10 +3217,10 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth logger.exception('Message not saved', exc_info=True) self.updateStatusBar(_translate("MainWindow", "Write error.")) + # Send item on the Sent tab to trash def on_action_SentTrash(self): - """Send item on the Sent tab to trash""" - currentRow = 0 + unread = False tableWidget = self.getCurrentMessagelist() if not tableWidget: return @@ -3774,15 +3235,7 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth else: sqlExecute('''UPDATE sent SET folder='trash' WHERE ackdata=?''', ackdataToTrash) if tableWidget.item(currentRow, 0).unread: - self.propagateUnreadCount( - tableWidget.item( - currentRow, - 1 if tableWidget.item(currentRow, 1).type == AccountMixin.SUBSCRIPTION else 0 - ).data(QtCore.Qt.UserRole), - folder, - self.getCurrentTreeWidget(), - -1, - ) + self.propagateUnreadCount(tableWidget.item(currentRow, 1 if tableWidget.item(currentRow, 1).type == AccountMixin.SUBSCRIPTION else 0).data(QtCore.Qt.UserRole), folder, self.getCurrentTreeWidget(), -1) self.getCurrentMessageTextedit().setPlainText("") tableWidget.removeRow(currentRow) self.updateStatusBar(_translate( @@ -3792,8 +3245,6 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth currentRow if currentRow == 0 else currentRow - 1) def on_action_ForceSend(self): - """TBC""" - currentRow = self.ui.tableWidgetInbox.currentRow() addressAtCurrentRow = self.ui.tableWidgetInbox.item( currentRow, 0).data(QtCore.Qt.UserRole) @@ -3809,22 +3260,17 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth queues.workerQueue.put(('sendmessage', '')) def on_action_SentClipboard(self): - """TBC""" - currentRow = self.ui.tableWidgetInbox.currentRow() addressAtCurrentRow = self.ui.tableWidgetInbox.item( currentRow, 0).data(QtCore.Qt.UserRole) clipboard = QtGui.QApplication.clipboard() clipboard.setText(str(addressAtCurrentRow)) + # Group of functions for the Address Book dialog box def on_action_AddressBookNew(self): - """Group of functions for the Address Book dialog box""" - self.click_pushButtonAddAddressBook() def on_action_AddressBookDelete(self): - """TBC""" - while self.ui.tableWidgetAddressBook.selectedIndexes() != []: currentRow = self.ui.tableWidgetAddressBook.selectedIndexes()[ 0].row() @@ -3839,8 +3285,6 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.rerenderMessagelistToLabels() def on_action_AddressBookClipboard(self): - """TBC""" - fullStringOfAddresses = '' listOfSelectedRows = {} for i in range(len(self.ui.tableWidgetAddressBook.selectedIndexes())): @@ -3857,8 +3301,6 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth clipboard.setText(fullStringOfAddresses) def on_action_AddressBookSend(self): - """TBC""" - listOfSelectedRows = {} for i in range(len(self.ui.tableWidgetAddressBook.selectedIndexes())): listOfSelectedRows[ @@ -3884,13 +3326,11 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth ) def on_action_AddressBookSubscribe(self): - """TBC""" - listOfSelectedRows = {} for i in range(len(self.ui.tableWidgetAddressBook.selectedIndexes())): listOfSelectedRows[self.ui.tableWidgetAddressBook.selectedIndexes()[i].row()] = 0 for currentRow in listOfSelectedRows: - addressAtCurrentRow = str(self.ui.tableWidgetAddressBook.item(currentRow, 1).text()) + addressAtCurrentRow = str(self.ui.tableWidgetAddressBook.item(currentRow,1).text()) # Then subscribe to it... provided it's not already in the address book if shared.isAddressInMySubscriptionsList(addressAtCurrentRow): self.updateStatusBar(_translate( @@ -3899,15 +3339,13 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth " subscriptions twice. Perhaps rename the existing" " one if you want.")) continue - labelAtCurrentRow = self.ui.tableWidgetAddressBook.item(currentRow, 0).text().toUtf8() + labelAtCurrentRow = self.ui.tableWidgetAddressBook.item(currentRow,0).text().toUtf8() self.addSubscription(addressAtCurrentRow, labelAtCurrentRow) self.ui.tabWidget.setCurrentIndex( self.ui.tabWidget.indexOf(self.ui.subscriptions) ) def on_context_menuAddressBook(self, point): - """TBC""" - self.popMenuAddressBook = QtGui.QMenu(self) self.popMenuAddressBook.addAction(self.actionAddressBookSend) self.popMenuAddressBook.addAction(self.actionAddressBookClipboard) @@ -3919,9 +3357,9 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth normal = True for row in self.ui.tableWidgetAddressBook.selectedIndexes(): currentRow = row.row() - row_type = self.ui.tableWidgetAddressBook.item( + type = self.ui.tableWidgetAddressBook.item( currentRow, 0).type - if row_type != AccountMixin.NORMAL: + if type != AccountMixin.NORMAL: normal = False if normal: # only if all selected addressbook items are normal, allow delete @@ -3929,14 +3367,11 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.popMenuAddressBook.exec_( self.ui.tableWidgetAddressBook.mapToGlobal(point)) + # Group of functions for the Subscriptions dialog box def on_action_SubscriptionsNew(self): - """Group of functions for the Subscriptions dialog box""" - self.click_pushButtonAddSubscription() def on_action_SubscriptionsDelete(self): - """TBC""" - if QtGui.QMessageBox.question( self, "Delete subscription?", _translate( @@ -3960,15 +3395,11 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth shared.reloadBroadcastSendersForWhichImWatching() def on_action_SubscriptionsClipboard(self): - """TBC""" - address = self.getCurrentAccount() clipboard = QtGui.QApplication.clipboard() clipboard.setText(str(address)) def on_action_SubscriptionsEnable(self): - """TBC""" - address = self.getCurrentAccount() sqlExecute( '''update subscriptions set enabled=1 WHERE address=?''', @@ -3979,8 +3410,6 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth shared.reloadBroadcastSendersForWhichImWatching() def on_action_SubscriptionsDisable(self): - """TBC""" - address = self.getCurrentAccount() sqlExecute( '''update subscriptions set enabled=0 WHERE address=?''', @@ -3991,8 +3420,6 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth shared.reloadBroadcastSendersForWhichImWatching() def on_context_menuSubscriptions(self, point): - """TBC""" - currentItem = self.getCurrentItem() self.popMenuSubscriptions = QtGui.QMenu(self) if isinstance(currentItem, Ui_AddressWidget): @@ -4015,9 +3442,7 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.popMenuSubscriptions.exec_( self.ui.treeWidgetSubscriptions.mapToGlobal(point)) - def widgetConvert(self, widget): # pylint: disable=inconsistent-return-statements - """TBC""" - + def widgetConvert (self, widget): if widget == self.ui.tableWidgetInbox: return self.ui.treeWidgetYourIdentities elif widget == self.ui.tableWidgetInboxSubscriptions: @@ -4030,35 +3455,35 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth return self.ui.tableWidgetInboxSubscriptions elif widget == self.ui.treeWidgetChans: return self.ui.tableWidgetInboxChans + else: + return None def getCurrentTreeWidget(self): - """TBC""" - - currentIndex = self.ui.tabWidget.currentIndex() + currentIndex = self.ui.tabWidget.currentIndex(); treeWidgetList = [ self.ui.treeWidgetYourIdentities, False, self.ui.treeWidgetSubscriptions, self.ui.treeWidgetChans ] - return treeWidgetList[currentIndex] if currentIndex >= 0 and currentIndex < len(treeWidgetList) else False + if currentIndex >= 0 and currentIndex < len(treeWidgetList): + return treeWidgetList[currentIndex] + else: + return False def getAccountTreeWidget(self, account): - """TBC""" - try: if account.type == AccountMixin.CHAN: return self.ui.treeWidgetChans elif account.type == AccountMixin.SUBSCRIPTION: return self.ui.treeWidgetSubscriptions - return self.ui.treeWidgetYourIdentities + else: + return self.ui.treeWidgetYourIdentities except: return self.ui.treeWidgetYourIdentities def getCurrentMessagelist(self): - """TBC""" - - currentIndex = self.ui.tabWidget.currentIndex() + currentIndex = self.ui.tabWidget.currentIndex(); messagelistList = [ self.ui.tableWidgetInbox, False, @@ -4067,23 +3492,21 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth ] if currentIndex >= 0 and currentIndex < len(messagelistList): return messagelistList[currentIndex] - return False - + else: + return False + def getAccountMessagelist(self, account): - """TBC""" - try: if account.type == AccountMixin.CHAN: return self.ui.tableWidgetInboxChans elif account.type == AccountMixin.SUBSCRIPTION: return self.ui.tableWidgetInboxSubscriptions - return self.ui.tableWidgetInbox + else: + return self.ui.tableWidgetInbox except: return self.ui.tableWidgetInbox def getCurrentMessageId(self): - """TBC""" - messagelist = self.getCurrentMessagelist() if messagelist: currentRow = messagelist.currentRow() @@ -4095,8 +3518,6 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth return False def getCurrentMessageTextedit(self): - """TBC""" - currentIndex = self.ui.tabWidget.currentIndex() messagelistList = [ self.ui.textEditInboxMessage, @@ -4106,41 +3527,38 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth ] if currentIndex >= 0 and currentIndex < len(messagelistList): return messagelistList[currentIndex] - return False + else: + return False def getAccountTextedit(self, account): - """TBC""" - try: if account.type == AccountMixin.CHAN: return self.ui.textEditInboxMessageChans elif account.type == AccountMixin.SUBSCRIPTION: return self.ui.textEditInboxSubscriptions - return self.ui.textEditInboxMessage + else: + return self.ui.textEditInboxMessage except: return self.ui.textEditInboxMessage - def getCurrentSearchLine(self, currentIndex=None, retObj=False): # pylint: disable=inconsistent-return-statements - """TBC""" - + def getCurrentSearchLine(self, currentIndex=None, retObj=False): if currentIndex is None: currentIndex = self.ui.tabWidget.currentIndex() - messagelistList = [ self.ui.inboxSearchLineEdit, False, self.ui.inboxSearchLineEditSubscriptions, self.ui.inboxSearchLineEditChans, ] - if currentIndex >= 0 and currentIndex < len(messagelistList): if retObj: return messagelistList[currentIndex] - return messagelistList[currentIndex].text().toUtf8().data() - - def getCurrentSearchOption(self, currentIndex=None): # pylint: disable=inconsistent-return-statements - """TBC""" + else: + return messagelistList[currentIndex].text().toUtf8().data() + else: + return None + def getCurrentSearchOption(self, currentIndex=None): if currentIndex is None: currentIndex = self.ui.tabWidget.currentIndex() messagelistList = [ @@ -4151,10 +3569,11 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth ] if currentIndex >= 0 and currentIndex < len(messagelistList): return messagelistList[currentIndex].currentText().toUtf8().data() + else: + return None + # Group of functions for the Your Identities dialog box def getCurrentItem(self, treeWidget=None): - """Group of functions for the Your Identities dialog box""" - if treeWidget is None: treeWidget = self.getCurrentTreeWidget() if treeWidget: @@ -4162,29 +3581,28 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth if currentItem: return currentItem return False - + def getCurrentAccount(self, treeWidget=None): - """TODO: debug msg in else?""" - currentItem = self.getCurrentItem(treeWidget) if currentItem: account = currentItem.address return account - return False - - def getCurrentFolder(self, treeWidget=None): # pylint: disable=inconsistent-return-statements - """TBC""" + else: + # TODO need debug msg? + return False + def getCurrentFolder(self, treeWidget=None): if treeWidget is None: treeWidget = self.getCurrentTreeWidget() + #treeWidget = self.ui.treeWidgetYourIdentities if treeWidget: currentItem = treeWidget.currentItem() if currentItem and hasattr(currentItem, 'folderName'): return currentItem.folderName + else: + return None def setCurrentItemColor(self, color): - """TBC""" - treeWidget = self.getCurrentTreeWidget() if treeWidget: brush = QtGui.QBrush() @@ -4194,13 +3612,9 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth currentItem.setForeground(0, brush) def on_action_YourIdentitiesNew(self): - """TBC""" - self.click_NewAddressDialog() def on_action_YourIdentitiesDelete(self): - """TBC""" - account = self.getCurrentItem() if account.type == AccountMixin.NORMAL: return # maybe in the future @@ -4233,51 +3647,39 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.rerenderTabTreeChans() def on_action_Enable(self): - """TBC""" - addressAtCurrentRow = self.getCurrentAccount() self.enableIdentity(addressAtCurrentRow) account = self.getCurrentItem() account.setEnabled(True) def enableIdentity(self, address): - """TBC""" - BMConfigParser().set(address, 'enabled', 'true') BMConfigParser().save() shared.reloadMyAddressHashes() self.rerenderAddressBook() def on_action_Disable(self): - """TBC""" - address = self.getCurrentAccount() self.disableIdentity(address) account = self.getCurrentItem() account.setEnabled(False) def disableIdentity(self, address): - """TBC""" - BMConfigParser().set(str(address), 'enabled', 'false') BMConfigParser().save() shared.reloadMyAddressHashes() self.rerenderAddressBook() def on_action_Clipboard(self): - """TBC""" - address = self.getCurrentAccount() clipboard = QtGui.QApplication.clipboard() clipboard.setText(str(address)) def on_action_ClipboardMessagelist(self): - """TBC""" - tableWidget = self.getCurrentMessagelist() currentColumn = tableWidget.currentColumn() currentRow = tableWidget.currentRow() - if currentColumn not in [0, 1, 2]: # to, from, subject + if currentColumn not in [0, 1, 2]: # to, from, subject if self.getCurrentFolder() == "sent": currentColumn = 0 else: @@ -4289,19 +3691,9 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth myAddress = tableWidget.item(currentRow, 0).data(QtCore.Qt.UserRole) otherAddress = tableWidget.item(currentRow, 1).data(QtCore.Qt.UserRole) account = accountClass(myAddress) - if all( - [ - isinstance(account, GatewayAccount), - otherAddress == account.relayAddress, - any( - [ - currentColumn in [0, 2] and self.getCurrentFolder() == "sent", - currentColumn in [1, 2] and self.getCurrentFolder() != "sent", - ] - ), - ] - ): - + if isinstance(account, GatewayAccount) and otherAddress == account.relayAddress and ( + (currentColumn in [0, 2] and self.getCurrentFolder() == "sent") or + (currentColumn in [1, 2] and self.getCurrentFolder() != "sent")): text = str(tableWidget.item(currentRow, currentColumn).label) else: text = tableWidget.item(currentRow, currentColumn).data(QtCore.Qt.UserRole) @@ -4309,20 +3701,15 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth clipboard = QtGui.QApplication.clipboard() clipboard.setText(text) + #set avatar functions def on_action_TreeWidgetSetAvatar(self): - """set avatar functions""" - address = self.getCurrentAccount() self.setAvatar(address) def on_action_AddressBookSetAvatar(self): - """TBC""" - self.on_action_SetAvatar(self.ui.tableWidgetAddressBook) - + def on_action_SetAvatar(self, thisTableWidget): - """TBC""" - currentRow = thisTableWidget.currentRow() addressAtCurrentRow = thisTableWidget.item( currentRow, 1).text() @@ -4332,50 +3719,20 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth currentRow, 0).setIcon(avatarize(addressAtCurrentRow)) def setAvatar(self, addressAtCurrentRow): - """TBC""" - if not os.path.exists(state.appdata + 'avatars/'): os.makedirs(state.appdata + 'avatars/') - addressHash = hashlib.md5(addBMIfNotPresent(addressAtCurrentRow)).hexdigest() - extensions = [ - 'PNG', - 'GIF', - 'JPG', - 'JPEG', - 'SVG', - 'BMP', - 'MNG', - 'PBM', - 'PGM', - 'PPM', - 'TIFF', - 'XBM', - 'XPM', - 'TGA'] + hash = hashlib.md5(addBMIfNotPresent(addressAtCurrentRow)).hexdigest() + extensions = ['PNG', 'GIF', 'JPG', 'JPEG', 'SVG', 'BMP', 'MNG', 'PBM', 'PGM', 'PPM', 'TIFF', 'XBM', 'XPM', 'TGA'] # http://pyqt.sourceforge.net/Docs/PyQt4/qimagereader.html#supportedImageFormats - names = { - 'BMP': 'Windows Bitmap', - 'GIF': 'Graphic Interchange Format', - 'JPG': 'Joint Photographic Experts Group', - 'JPEG': 'Joint Photographic Experts Group', - 'MNG': 'Multiple-image Network Graphics', - 'PNG': 'Portable Network Graphics', - 'PBM': 'Portable Bitmap', - 'PGM': 'Portable Graymap', - 'PPM': 'Portable Pixmap', - 'TIFF': 'Tagged Image File Format', - 'XBM': 'X11 Bitmap', - 'XPM': 'X11 Pixmap', - 'SVG': 'Scalable Vector Graphics', - 'TGA': 'Targa Image Format'} + names = {'BMP':'Windows Bitmap', 'GIF':'Graphic Interchange Format', 'JPG':'Joint Photographic Experts Group', 'JPEG':'Joint Photographic Experts Group', 'MNG':'Multiple-image Network Graphics', 'PNG':'Portable Network Graphics', 'PBM':'Portable Bitmap', 'PGM':'Portable Graymap', 'PPM':'Portable Pixmap', 'TIFF':'Tagged Image File Format', 'XBM':'X11 Bitmap', 'XPM':'X11 Pixmap', 'SVG':'Scalable Vector Graphics', 'TGA':'Targa Image Format'} filters = [] all_images_filter = [] current_files = [] for ext in extensions: - filters += [names[ext] + ' (*.' + ext.lower() + ')'] - all_images_filter += ['*.' + ext.lower()] - upper = state.appdata + 'avatars/' + addressHash + '.' + ext.upper() - lower = state.appdata + 'avatars/' + addressHash + '.' + ext.lower() + filters += [ names[ext] + ' (*.' + ext.lower() + ')' ] + all_images_filter += [ '*.' + ext.lower() ] + upper = state.appdata + 'avatars/' + hash + '.' + ext.upper() + lower = state.appdata + 'avatars/' + hash + '.' + ext.lower() if os.path.isfile(lower): current_files += [lower] elif os.path.isfile(upper): @@ -4384,35 +3741,33 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth filters[1:1] = ['All files (*.*)'] sourcefile = QtGui.QFileDialog.getOpenFileName( self, _translate("MainWindow", "Set avatar..."), - filter=';;'.join(filters) + filter = ';;'.join(filters) ) # determine the correct filename (note that avatars don't use the suffix) - destination = state.appdata + 'avatars/' + addressHash + '.' + sourcefile.split('.')[-1] + destination = state.appdata + 'avatars/' + hash + '.' + sourcefile.split('.')[-1] exists = QtCore.QFile.exists(destination) if sourcefile == '': # ask for removal of avatar - if exists | current_files: + if exists | (len(current_files)>0): displayMsg = _translate("MainWindow", "Do you really want to remove this avatar?") overwrite = QtGui.QMessageBox.question( - self, 'Message', displayMsg, QtGui.QMessageBox.Yes, QtGui.QMessageBox.No) + self, 'Message', displayMsg, QtGui.QMessageBox.Yes, QtGui.QMessageBox.No) else: overwrite = QtGui.QMessageBox.No else: # ask whether to overwrite old avatar - if exists | current_files: - displayMsg = _translate( - "MainWindow", - "You have already set an avatar for this address. Do you really want to overwrite it?") + if exists | (len(current_files)>0): + displayMsg = _translate("MainWindow", "You have already set an avatar for this address. Do you really want to overwrite it?") overwrite = QtGui.QMessageBox.question( - self, 'Message', displayMsg, QtGui.QMessageBox.Yes, QtGui.QMessageBox.No) + self, 'Message', displayMsg, QtGui.QMessageBox.Yes, QtGui.QMessageBox.No) else: overwrite = QtGui.QMessageBox.No - + # copy the image file to the appdata folder - if not exists | overwrite == QtGui.QMessageBox.Yes: + if (not exists) | (overwrite == QtGui.QMessageBox.Yes): if overwrite == QtGui.QMessageBox.Yes: - for file_name in current_files: - QtCore.QFile.remove(file_name) + for file in current_files: + QtCore.QFile.remove(file) QtCore.QFile.remove(destination) # copy it if sourcefile != '': @@ -4434,14 +3789,10 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth return True def on_action_AddressBookSetSound(self): - """TBC""" - widget = self.ui.tableWidgetAddressBook self.setAddressSound(widget.item(widget.currentRow(), 0).text()) def setAddressSound(self, addr): - """TBC""" - filters = [unicode(_translate( "MainWindow", "Sound files (%s)" % ' '.join(['*%s%s' % (os.extsep, ext) for ext in sound.extensions]) @@ -4482,8 +3833,6 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth 'couldn\'t copy %s to %s', sourcefile, destination) def on_context_menuYourIdentities(self, point): - """TBC""" - currentItem = self.getCurrentItem() self.popMenuYourIdentities = QtGui.QMenu(self) if isinstance(currentItem, Ui_AddressWidget): @@ -4509,9 +3858,8 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.popMenuYourIdentities.exec_( self.ui.treeWidgetYourIdentities.mapToGlobal(point)) + # TODO make one popMenu def on_context_menuChan(self, point): - """TODO: make one popMenu""" - currentItem = self.getCurrentItem() self.popMenu = QtGui.QMenu(self) if isinstance(currentItem, Ui_AddressWidget): @@ -4535,8 +3883,6 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.ui.treeWidgetChans.mapToGlobal(point)) def on_context_menuInbox(self, point): - """TBC""" - tableWidget = self.getCurrentMessagelist() if tableWidget: currentFolder = self.getCurrentFolder() @@ -4557,9 +3903,9 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.popMenuInbox.addAction(self.actionReply) self.popMenuInbox.addAction(self.actionAddSenderToAddressBook) self.actionClipboardMessagelist = self.ui.inboxContextMenuToolbar.addAction( - _translate( - "MainWindow", "Copy subject to clipboard" - if tableWidget.currentColumn() == 2 else "Copy address to clipboard"), + _translate("MainWindow", + "Copy subject to clipboard" if tableWidget.currentColumn() == 2 else "Copy address to clipboard" + ), self.on_action_ClipboardMessagelist) self.popMenuInbox.addAction(self.actionClipboardMessagelist) self.popMenuInbox.addSeparator() @@ -4573,8 +3919,6 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.popMenuInbox.exec_(tableWidget.mapToGlobal(point)) def on_context_menuSent(self, point): - """TBC""" - self.popMenuSent = QtGui.QMenu(self) self.popMenuSent.addAction(self.actionSentClipboard) self.popMenuSent.addAction(self.actionTrashSentMessage) @@ -4594,8 +3938,6 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.popMenuSent.exec_(self.ui.tableWidgetInbox.mapToGlobal(point)) def inboxSearchLineEditUpdated(self, text): - """TBC""" - # dynamic search for too short text is slow if len(str(text)) < 3: return @@ -4607,8 +3949,6 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.loadMessagelist(messagelist, account, folder, searchOption, str(text)) def inboxSearchLineEditReturnPressed(self): - """TBC""" - logger.debug("Search return pressed") searchLine = self.getCurrentSearchLine() messagelist = self.getCurrentMessagelist() @@ -4621,8 +3961,6 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth messagelist.setFocus() def treeWidgetItemClicked(self): - """TBC""" - searchLine = self.getCurrentSearchLine() searchOption = self.getCurrentSearchOption() messageTextedit = self.getCurrentMessageTextedit() @@ -4638,23 +3976,14 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.loadMessagelist(messagelist, account, folder, searchOption, searchLine) def treeWidgetItemChanged(self, item, column): - """TBC""" - # only for manual edits. automatic edits (setText) are ignored if column != 0: return # only account names of normal addresses (no chans/mailinglists) - if any( - [ - not isinstance(item, Ui_AddressWidget), - not self.getCurrentTreeWidget(), - self.getCurrentTreeWidget().currentItem() is None, - ] - ): + if (not isinstance(item, Ui_AddressWidget)) or (not self.getCurrentTreeWidget()) or self.getCurrentTreeWidget().currentItem() is None: return - # not visible - if (not self.getCurrentItem()) or (not isinstance(self.getCurrentItem(), Ui_AddressWidget)): + if (not self.getCurrentItem()) or (not isinstance (self.getCurrentItem(), Ui_AddressWidget)): return # only currently selected item if item.address != self.getCurrentAccount(): @@ -4662,7 +3991,7 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth # "All accounts" can't be renamed if item.type == AccountMixin.ALL: return - + newLabel = unicode(item.text(0), 'utf-8', 'ignore') oldLabel = item.defaultLabel() @@ -4687,8 +4016,6 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.recurDepth -= 1 def tableWidgetInboxItemClicked(self): - """TBC""" - folder = self.getCurrentFolder() messageTextedit = self.getCurrentMessageTextedit() if not messageTextedit: @@ -4719,12 +4046,10 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth if tableWidget.item(currentRow, 0).unread is True: self.updateUnreadStatus(tableWidget, currentRow, msgid) # propagate - if all( - [ - folder != 'sent', - sqlExecute('''UPDATE inbox SET read=1 WHERE msgid=? AND read=0''', msgid) > 0, - ] - ): + if folder != 'sent' and sqlExecute( + '''UPDATE inbox SET read=1 WHERE msgid=? AND read=0''', + msgid + ) > 0: self.propagateUnreadCount() messageTextedit.setCurrentFont(QtGui.QFont()) @@ -4732,29 +4057,23 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth messageTextedit.setContent(message) def tableWidgetAddressBookItemChanged(self, item): - """TBC""" - if item.type == AccountMixin.CHAN: self.rerenderComboBoxSendFrom() self.rerenderMessagelistFromLabels() self.rerenderMessagelistToLabels() completerList = self.ui.lineEditTo.completer().model().stringList() - for i, this_item in enumerate(completerList): - if unicode(this_item).endswith(" <" + item.address + ">"): - this_item = item.label + " <" + item.address + ">" + for i in range(len(completerList)): + if unicode(completerList[i]).endswith(" <" + item.address + ">"): + completerList[i] = item.label + " <" + item.address + ">" self.ui.lineEditTo.completer().model().setStringList(completerList) def tabWidgetCurrentChanged(self, n): - """TBC""" - if n == self.ui.tabWidget.indexOf(self.ui.networkstatus): self.ui.networkstatus.startUpdate() else: self.ui.networkstatus.stopUpdate() def writeNewAddressToTable(self, label, address, streamNumber): - """TBC""" - self.rerenderTabTreeMessages() self.rerenderTabTreeSubscriptions() self.rerenderTabTreeChans() @@ -4763,16 +4082,14 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.rerenderAddressBook() def updateStatusBar(self, data): - """TBC""" - - if isinstance(data, (tuple, list)): + if type(data) is tuple or type(data) is list: option = data[1] message = data[0] else: option = 0 message = data if message != "": - logger.info('Status bar: %s', message) + logger.info('Status bar: ' + message) if option == 1: self.statusbar.addImportant(message) @@ -4780,8 +4097,6 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth self.statusbar.showMessage(message, 10000) def initSettings(self): - """TBC""" - QtCore.QCoreApplication.setOrganizationName("PyBitmessage") QtCore.QCoreApplication.setOrganizationDomain("bitmessage.org") QtCore.QCoreApplication.setApplicationName("pybitmessageqt") @@ -4795,11 +4110,8 @@ class MyForm(settingsmixin.SMainWindow): # pylint: disable=too-many-public-meth class settingsDialog(QtGui.QDialog): - """TBC""" def __init__(self, parent): - """TBC""" - QtGui.QWidget.__init__(self, parent) self.ui = Ui_settingsDialog() self.ui.setupUi(self) @@ -4822,7 +4134,7 @@ class settingsDialog(QtGui.QDialog): BMConfigParser().safeGetBoolean('bitmessagesettings', 'useidenticons')) self.ui.checkBoxReplyBelow.setChecked( BMConfigParser().safeGetBoolean('bitmessagesettings', 'replybelow')) - + if state.appdata == paths.lookupExeFolder(): self.ui.checkBoxPortableMode.setChecked(True) else: @@ -4888,36 +4200,16 @@ class settingsDialog(QtGui.QDialog): BMConfigParser().get('bitmessagesettings', 'maxoutboundconnections'))) # Demanded difficulty tab - self.ui.lineEditTotalDifficulty.setText( - str( - float( - BMConfigParser().getint('bitmessagesettings', 'defaultnoncetrialsperbyte') - ) / defaults.networkDefaultProofOfWorkNonceTrialsPerByte - ) - ) - self.ui.lineEditSmallMessageDifficulty.setText( - str( - float( - BMConfigParser().getint('bitmessagesettings', 'defaultpayloadlengthextrabytes') - ) / defaults.networkDefaultPayloadLengthExtraBytes - ) - ) + self.ui.lineEditTotalDifficulty.setText(str((float(BMConfigParser().getint( + 'bitmessagesettings', 'defaultnoncetrialsperbyte')) / defaults.networkDefaultProofOfWorkNonceTrialsPerByte))) + self.ui.lineEditSmallMessageDifficulty.setText(str((float(BMConfigParser().getint( + 'bitmessagesettings', 'defaultpayloadlengthextrabytes')) / defaults.networkDefaultPayloadLengthExtraBytes))) # Max acceptable difficulty tab - self.ui.lineEditMaxAcceptableTotalDifficulty.setText( - str( - float( - BMConfigParser().getint('bitmessagesettings', 'maxacceptablenoncetrialsperbyte') - ) / defaults.networkDefaultProofOfWorkNonceTrialsPerByte - ) - ) - self.ui.lineEditMaxAcceptableSmallMessageDifficulty.setText( - str( - float( - BMConfigParser().getint('bitmessagesettings', 'maxacceptablepayloadlengthextrabytes') - ) / defaults.networkDefaultPayloadLengthExtraBytes - ) - ) + self.ui.lineEditMaxAcceptableTotalDifficulty.setText(str((float(BMConfigParser().getint( + 'bitmessagesettings', 'maxacceptablenoncetrialsperbyte')) / defaults.networkDefaultProofOfWorkNonceTrialsPerByte))) + self.ui.lineEditMaxAcceptableSmallMessageDifficulty.setText(str((float(BMConfigParser().getint( + 'bitmessagesettings', 'maxacceptablepayloadlengthextrabytes')) / defaults.networkDefaultPayloadLengthExtraBytes))) # OpenCL if openclpow.openclAvailable(): @@ -4962,17 +4254,34 @@ class settingsDialog(QtGui.QDialog): QtCore.QObject.connect(self.ui.pushButtonNamecoinTest, QtCore.SIGNAL( "clicked()"), self.click_pushButtonNamecoinTest) - # Message Resend tab + #Message Resend tab self.ui.lineEditDays.setText(str( BMConfigParser().get('bitmessagesettings', 'stopresendingafterxdays'))) self.ui.lineEditMonths.setText(str( BMConfigParser().get('bitmessagesettings', 'stopresendingafterxmonths'))) + + + #'System' tab removed for now. + """try: + maxCores = BMConfigParser().getint('bitmessagesettings', 'maxcores') + except: + maxCores = 99999 + if maxCores <= 1: + self.ui.comboBoxMaxCores.setCurrentIndex(0) + elif maxCores == 2: + self.ui.comboBoxMaxCores.setCurrentIndex(1) + elif maxCores <= 4: + self.ui.comboBoxMaxCores.setCurrentIndex(2) + elif maxCores <= 8: + self.ui.comboBoxMaxCores.setCurrentIndex(3) + elif maxCores <= 16: + self.ui.comboBoxMaxCores.setCurrentIndex(4) + else: + self.ui.comboBoxMaxCores.setCurrentIndex(5)""" QtGui.QWidget.resize(self, QtGui.QWidget.sizeHint(self)) def comboBoxProxyTypeChanged(self, comboBoxIndex): - """TBC""" - if comboBoxIndex == 0: self.ui.lineEditSocksHostname.setEnabled(False) self.ui.lineEditSocksPort.setEnabled(False) @@ -4989,22 +4298,20 @@ class settingsDialog(QtGui.QDialog): self.ui.lineEditSocksUsername.setEnabled(True) self.ui.lineEditSocksPassword.setEnabled(True) + # Check status of namecoin integration radio buttons and translate + # it to a string as in the options. def getNamecoinType(self): - """Check status of namecoin integration radio buttons and translate it to a string as in the options.""" - if self.ui.radioButtonNamecoinNamecoind.isChecked(): return "namecoind" - elif self.ui.radioButtonNamecoinNmcontrol.isChecked(): + if self.ui.radioButtonNamecoinNmcontrol.isChecked(): return "nmcontrol" - logger.info("Neither namecoind nor nmcontrol were checked. This is a fatal error") - sys.exit(1) + assert False + # Namecoin connection type was changed. def namecoinTypeChanged(self, checked): - """Namecoin connection type was changed.""" - nmctype = self.getNamecoinType() assert nmctype == "namecoind" or nmctype == "nmcontrol" - + isNamecoind = (nmctype == "namecoind") self.ui.lineEditNamecoinUser.setEnabled(isNamecoind) self.ui.labelNamecoinUser.setEnabled(isNamecoind) @@ -5016,11 +4323,10 @@ class settingsDialog(QtGui.QDialog): else: self.ui.lineEditNamecoinPort.setText("9000") + # Test the namecoin settings specified in the settings dialog. def click_pushButtonNamecoinTest(self): - """Test the namecoin settings specified in the settings dialog.""" - self.ui.labelNamecoinTestResult.setText(_translate( - "MainWindow", "Testing...")) + "MainWindow", "Testing...")) options = {} options["type"] = self.getNamecoinType() options["host"] = str(self.ui.lineEditNamecoinHost.text().toUtf8()) @@ -5032,15 +4338,14 @@ class settingsDialog(QtGui.QDialog): responseStatus = response[0] responseText = response[1] self.ui.labelNamecoinTestResult.setText(responseText) - if responseStatus == 'success': + if responseStatus== 'success': self.parent.ui.pushButtonFetchNamecoinID.show() +# In order for the time columns on the Inbox and Sent tabs to be sorted +# correctly (rather than alphabetically), we need to overload the < +# operator and use this class instead of QTableWidgetItem. class myTableWidgetItem(QtGui.QTableWidgetItem): - """ - In order for the time columns on the Inbox and Sent tabs to be sorted correctly (rather than alphabetically), - we need to overload the < operator and use this class instead of QTableWidgetItem. - """ def __lt__(self, other): return int(self.data(33).toPyObject()) < int(other.data(33).toPyObject()) @@ -5063,23 +4368,21 @@ class MySingleApplication(QtGui.QApplication): uuid = '6ec0149b-96e1-4be1-93ab-1465fb3ebf7c' def __init__(self, *argv): - """TBC""" - super(MySingleApplication, self).__init__(*argv) - _id = MySingleApplication.uuid + id = MySingleApplication.uuid self.server = None self.is_running = False socket = QLocalSocket() - socket.connectToServer(_id) + socket.connectToServer(id) self.is_running = socket.waitForConnected() # Cleanup past crashed servers if not self.is_running: if socket.error() == QLocalSocket.ConnectionRefusedError: socket.disconnectFromServer() - QLocalServer.removeServer(_id) + QLocalServer.removeServer(id) socket.abort() @@ -5091,44 +4394,34 @@ class MySingleApplication(QtGui.QApplication): # Nope, create a local server with this id and assign on_new_connection # for whenever a second instance tries to run focus the application. self.server = QLocalServer() - self.server.listen(_id) + self.server.listen(id) self.server.newConnection.connect(self.on_new_connection) def __del__(self): - """TBC""" - if self.server: self.server.close() def on_new_connection(self): - """TBC""" - if myapp: myapp.appIndicatorShow() def init(): - """TBC""" - global app - if not app: app = MySingleApplication(sys.argv) return app def run(): - """Run the gui""" - global myapp - - running_app = init() + app = init() change_translation(l10n.getTranslationLanguage()) app.setStyleSheet("QStatusBar::item { border: 0px solid black }") myapp = MyForm() myapp.sqlInit() - myapp.appIndicatorInit(running_app) + myapp.appIndicatorInit(app) myapp.indicatorInit() myapp.notifierInit() myapp._firstrun = BMConfigParser().safeGetBoolean( @@ -5137,6 +4430,12 @@ def run(): myapp.showConnectDialog() # ask the user if we may connect myapp.ui.updateNetworkSwitchMenuLabel() +# try: +# if BMConfigParser().get('bitmessagesettings', 'mailchuck') < 1: +# myapp.showMigrationWizard(BMConfigParser().get('bitmessagesettings', 'mailchuck')) +# except: +# myapp.showMigrationWizard(0) + # only show after wizards and connect dialogs have completed if not BMConfigParser().getboolean('bitmessagesettings', 'startintray'): myapp.show() diff --git a/src/network/bmproto.py b/src/network/bmproto.py index aff6cd0c..1f1c67bd 100644 --- a/src/network/bmproto.py +++ b/src/network/bmproto.py @@ -300,7 +300,7 @@ class BMProto(AdvancedDispatcher, ObjectTracker): def _command_inv(self, dandelion=False): items = self.decode_payload_content("l32s") - if len(items) >= BMProto.maxObjectCount: + if len(items) > BMProto.maxObjectCount: logger.error("Too many items in %sinv message!", "d" if dandelion else "") raise BMProtoExcessiveDataError() else: diff --git a/src/network/tcp.py b/src/network/tcp.py index 163cbd85..6cba566f 100644 --- a/src/network/tcp.py +++ b/src/network/tcp.py @@ -180,7 +180,11 @@ class TCPConnection(BMProto, TLSDispatcher): for hash, storedValue in bigInvList.items(): payload += hash objectCount += 1 - if objectCount >= BMProto.maxObjectCount: + + # Remove -1 below when sufficient time has passed for users to + # upgrade to versions of PyBitmessage that accept inv with 50,000 + # items + if objectCount >= BMProto.maxObjectCount - 1: sendChunk() payload = b'' objectCount = 0