From 6326147d6ff4e42c4787be4966c11dd0a346b5f5 Mon Sep 17 00:00:00 2001
From: Daniel Kraft
Date: Tue, 28 Jan 2014 20:57:01 +0100
Subject: [PATCH] Make reply below quote opt-in.
Add a new preference for 'reply below quote' and only use the new
quoting style if it is set.
---
src/bitmessageqt/__init__.py | 8 +-
src/bitmessageqt/settings.py | 147 +++++++++++++++++------------------
src/bitmessageqt/settings.ui | 9 ++-
src/helper_startup.py | 3 +-
4 files changed, 88 insertions(+), 79 deletions(-)
diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py
index 3d5180f6..c33a60b5 100644
--- a/src/bitmessageqt/__init__.py
+++ b/src/bitmessageqt/__init__.py
@@ -2251,6 +2251,8 @@ class MyForm(QtGui.QMainWindow):
self.settingsDialogInstance.ui.checkBoxWillinglySendToMobile.isChecked()))
shared.config.set('bitmessagesettings', 'useidenticons', str(
self.settingsDialogInstance.ui.checkBoxUseIdenticons.isChecked()))
+ shared.config.set('bitmessagesettings', 'replybelow', str(
+ self.settingsDialogInstance.ui.checkBoxReplyBelow.isChecked()))
lang_ind = int(self.settingsDialogInstance.ui.languageComboBox.currentIndex())
if not languages[lang_ind] == 'other':
@@ -2616,6 +2618,9 @@ class MyForm(QtGui.QMainWindow):
# Format predefined text on message reply.
def quoted_text(self, message):
+ if not shared.safeConfigGetBoolean('bitmessagesettings', 'replybelow'):
+ return '\n\n------------------------------------------------------\n' + message
+
quoteWrapper = textwrap.TextWrapper(replace_whitespace = False,
initial_indent = '> ',
subsequent_indent = '> ',
@@ -2675,7 +2680,6 @@ class MyForm(QtGui.QMainWindow):
else:
self.ui.comboBoxSendFrom.setCurrentIndex(0)
- #self.ui.textEditMessage.setText('\n\n------------------------------------------------------\n' + unicode(messageAtCurrentInboxRow, 'utf-8)'))
quotedText = self.quoted_text(unicode(messageAtCurrentInboxRow, 'utf-8'))
self.ui.textEditMessage.setText(quotedText)
if self.ui.tableWidgetInbox.item(currentInboxRow, 2).text()[0:3] in ['Re:', 'RE:']:
@@ -3340,6 +3344,8 @@ class settingsDialog(QtGui.QDialog):
shared.safeConfigGetBoolean('bitmessagesettings', 'willinglysendtomobile'))
self.ui.checkBoxUseIdenticons.setChecked(
shared.safeConfigGetBoolean('bitmessagesettings', 'useidenticons'))
+ self.ui.checkBoxReplyBelow.setChecked(
+ shared.safeConfigGetBoolean('bitmessagesettings', 'replybelow'))
global languages
languages = ['system','en','eo','fr','de','es','ru','no','ar','zh_cn','en_pirate','other']
diff --git a/src/bitmessageqt/settings.py b/src/bitmessageqt/settings.py
index 293c133b..a79976cd 100644
--- a/src/bitmessageqt/settings.py
+++ b/src/bitmessageqt/settings.py
@@ -2,8 +2,8 @@
# Form implementation generated from reading ui file 'settings.ui'
#
-# Created: Mon Jan 20 14:26:31 2014
-# by: PyQt4 UI code generator 4.10.3
+# Created: Tue Jan 28 20:46:24 2014
+# by: PyQt4 UI code generator 4.9.3
#
# WARNING! All changes made in this file will be lost!
@@ -12,16 +12,7 @@ from PyQt4 import QtCore, QtGui
try:
_fromUtf8 = QtCore.QString.fromUtf8
except AttributeError:
- def _fromUtf8(s):
- return s
-
-try:
- _encoding = QtGui.QApplication.UnicodeUTF8
- def _translate(context, text, disambig):
- return QtGui.QApplication.translate(context, text, disambig, _encoding)
-except AttributeError:
- def _translate(context, text, disambig):
- return QtGui.QApplication.translate(context, text, disambig)
+ _fromUtf8 = lambda s: s
class Ui_settingsDialog(object):
def setupUi(self, settingsDialog):
@@ -72,6 +63,9 @@ class Ui_settingsDialog(object):
self.checkBoxUseIdenticons = QtGui.QCheckBox(self.tabUserInterface)
self.checkBoxUseIdenticons.setObjectName(_fromUtf8("checkBoxUseIdenticons"))
self.formLayout.setWidget(7, QtGui.QFormLayout.LabelRole, self.checkBoxUseIdenticons)
+ self.checkBoxReplyBelow = QtGui.QCheckBox(self.tabUserInterface)
+ self.checkBoxReplyBelow.setObjectName(_fromUtf8("checkBoxReplyBelow"))
+ self.formLayout.setWidget(8, QtGui.QFormLayout.LabelRole, self.checkBoxReplyBelow)
self.groupBox = QtGui.QGroupBox(self.tabUserInterface)
self.groupBox.setObjectName(_fromUtf8("groupBox"))
self.formLayout_2 = QtGui.QFormLayout(self.groupBox)
@@ -92,7 +86,7 @@ class Ui_settingsDialog(object):
self.languageComboBox.addItem(_fromUtf8(""))
self.languageComboBox.addItem(_fromUtf8(""))
self.formLayout_2.setWidget(0, QtGui.QFormLayout.LabelRole, self.languageComboBox)
- self.formLayout.setWidget(8, QtGui.QFormLayout.FieldRole, self.groupBox)
+ self.formLayout.setWidget(9, QtGui.QFormLayout.FieldRole, self.groupBox)
self.tabWidgetSettings.addTab(self.tabUserInterface, _fromUtf8(""))
self.tabNetworkSettings = QtGui.QWidget()
self.tabNetworkSettings.setObjectName(_fromUtf8("tabNetworkSettings"))
@@ -383,68 +377,69 @@ class Ui_settingsDialog(object):
settingsDialog.setTabOrder(self.checkBoxSocksListen, self.buttonBox)
def retranslateUi(self, settingsDialog):
- settingsDialog.setWindowTitle(_translate("settingsDialog", "Settings", None))
- self.checkBoxStartOnLogon.setText(_translate("settingsDialog", "Start Bitmessage on user login", None))
- self.checkBoxStartInTray.setText(_translate("settingsDialog", "Start Bitmessage in the tray (don\'t show main window)", None))
- self.checkBoxMinimizeToTray.setText(_translate("settingsDialog", "Minimize to tray", None))
- self.checkBoxShowTrayNotifications.setText(_translate("settingsDialog", "Show notification when message received", None))
- self.checkBoxPortableMode.setText(_translate("settingsDialog", "Run in Portable Mode", None))
- self.PortableModeDescription.setText(_translate("settingsDialog", "In Portable Mode, messages and config files are stored in the same directory as the program rather than the normal application-data folder. This makes it convenient to run Bitmessage from a USB thumb drive.", None))
- self.checkBoxWillinglySendToMobile.setText(_translate("settingsDialog", "Willingly include unencrypted destination address when sending to a mobile device", None))
- self.checkBoxUseIdenticons.setText(_translate("settingsDialog", "Use Identicons", None))
- self.groupBox.setTitle(_translate("settingsDialog", "Interface Language", None))
- self.languageComboBox.setItemText(0, _translate("settingsDialog", "System Settings", "system"))
- self.languageComboBox.setItemText(1, _translate("settingsDialog", "English", "en"))
- self.languageComboBox.setItemText(2, _translate("settingsDialog", "Esperanto", "eo"))
- self.languageComboBox.setItemText(3, _translate("settingsDialog", "Français", "fr"))
- self.languageComboBox.setItemText(4, _translate("settingsDialog", "Deutsch", "de"))
- self.languageComboBox.setItemText(5, _translate("settingsDialog", "Españl", "es"))
- self.languageComboBox.setItemText(6, _translate("settingsDialog", "русский язык", "ru"))
- self.languageComboBox.setItemText(7, _translate("settingsDialog", "Norsk", "no"))
- self.languageComboBox.setItemText(8, _translate("settingsDialog", "العربية", "ar"))
- self.languageComboBox.setItemText(9, _translate("settingsDialog", "简体中文", "zh_cn"))
- self.languageComboBox.setItemText(10, _translate("settingsDialog", "Pirate English", "en_pirate"))
- self.languageComboBox.setItemText(11, _translate("settingsDialog", "Other (set in keys.dat)", "other"))
- self.tabWidgetSettings.setTabText(self.tabWidgetSettings.indexOf(self.tabUserInterface), _translate("settingsDialog", "User Interface", None))
- self.groupBox1.setTitle(_translate("settingsDialog", "Listening port", None))
- self.label.setText(_translate("settingsDialog", "Listen for connections on port:", None))
- self.groupBox_2.setTitle(_translate("settingsDialog", "Proxy server / Tor", None))
- self.label_2.setText(_translate("settingsDialog", "Type:", None))
- self.label_3.setText(_translate("settingsDialog", "Server hostname:", None))
- self.label_4.setText(_translate("settingsDialog", "Port:", None))
- self.checkBoxAuthentication.setText(_translate("settingsDialog", "Authentication", None))
- self.label_5.setText(_translate("settingsDialog", "Username:", None))
- self.label_6.setText(_translate("settingsDialog", "Pass:", None))
- self.checkBoxSocksListen.setText(_translate("settingsDialog", "Listen for incoming connections when using proxy", None))
- self.comboBoxProxyType.setItemText(0, _translate("settingsDialog", "none", None))
- self.comboBoxProxyType.setItemText(1, _translate("settingsDialog", "SOCKS4a", None))
- self.comboBoxProxyType.setItemText(2, _translate("settingsDialog", "SOCKS5", None))
- self.tabWidgetSettings.setTabText(self.tabWidgetSettings.indexOf(self.tabNetworkSettings), _translate("settingsDialog", "Network Settings", None))
- self.label_9.setText(_translate("settingsDialog", "Total difficulty:", None))
- self.label_10.setText(_translate("settingsDialog", "The \'Total difficulty\' affects the absolute amount of work the sender must complete. Doubling this value doubles the amount of work.", None))
- self.label_11.setText(_translate("settingsDialog", "Small message difficulty:", None))
- self.label_8.setText(_translate("settingsDialog", "When someone sends you a message, their computer must first complete some work. The difficulty of this work, by default, is 1. You may raise this default for new addresses you create by changing the values here. Any new addresses you create will require senders to meet the higher difficulty. There is one exception: if you add a friend or acquaintance to your address book, Bitmessage will automatically notify them when you next send a message that they need only complete the minimum amount of work: difficulty 1. ", None))
- self.label_12.setText(_translate("settingsDialog", "The \'Small message difficulty\' mostly only affects the difficulty of sending small messages. Doubling this value makes it almost twice as difficult to send a small message but doesn\'t really affect large messages.", None))
- self.tabWidgetSettings.setTabText(self.tabWidgetSettings.indexOf(self.tabDemandedDifficulty), _translate("settingsDialog", "Demanded difficulty", None))
- self.label_15.setText(_translate("settingsDialog", "Here you may set the maximum amount of work you are willing to do to send a message to another person. Setting these values to 0 means that any value is acceptable.", None))
- self.label_13.setText(_translate("settingsDialog", "Maximum acceptable total difficulty:", None))
- self.label_14.setText(_translate("settingsDialog", "Maximum acceptable small message difficulty:", None))
- self.tabWidgetSettings.setTabText(self.tabWidgetSettings.indexOf(self.tabMaxAcceptableDifficulty), _translate("settingsDialog", "Max acceptable difficulty", None))
- self.label_16.setText(_translate("settingsDialog", "Bitmessage can utilize a different Bitcoin-based program called Namecoin to make addresses human-friendly. For example, instead of having to tell your friend your long Bitmessage address, you can simply tell him to send a message to test.
(Getting your own Bitmessage address into Namecoin is still rather difficult).
Bitmessage can use either namecoind directly or a running nmcontrol instance.
", None))
- self.label_17.setText(_translate("settingsDialog", "Host:", None))
- self.label_18.setText(_translate("settingsDialog", "Port:", None))
- self.labelNamecoinUser.setText(_translate("settingsDialog", "Username:", None))
- self.labelNamecoinPassword.setText(_translate("settingsDialog", "Password:", None))
- self.pushButtonNamecoinTest.setText(_translate("settingsDialog", "Test", None))
- self.label_21.setText(_translate("settingsDialog", "Connect to:", None))
- self.radioButtonNamecoinNamecoind.setText(_translate("settingsDialog", "Namecoind", None))
- self.radioButtonNamecoinNmcontrol.setText(_translate("settingsDialog", "NMControl", None))
- self.tabWidgetSettings.setTabText(self.tabWidgetSettings.indexOf(self.tabNamecoin), _translate("settingsDialog", "Namecoin integration", None))
- self.label_7.setText(_translate("settingsDialog", "