Merge branch 'upstream/master'

Conflicts:
	src/bitmessageqt/bitmessageui.py

src/bitmessagemain.py

@@ -414,7 +414,10 @@ class MySimpleXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
                 readStatus = params[1]
                 if not isinstance(readStatus, bool):
                     raise APIError(23, 'Bool expected in readStatus, saw %s instead.' % type(readStatus))
-                sqlExecute('''UPDATE inbox set read = ? WHERE msgid=?''', readStatus, msgid)
+                queryreturn = sqlQuery('''SELECT read FROM inbox WHERE msgid=?''', msgid)
+                # UPDATE is slow, only update if status is different
+                if queryreturn != [] and (queryreturn[0][0] == 1) != readStatus:
+                    sqlExecute('''UPDATE inbox set read = ? WHERE msgid=?''', readStatus, msgid)
             queryreturn = sqlQuery('''SELECT msgid, toaddress, fromaddress, subject, received, message, encodingtype, read FROM inbox WHERE msgid=?''', msgid)
             data = '{"inboxMessage":['
             for row in queryreturn:

src/bitmessageqt/bitmessageui.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'bitmessageui.ui'
 #
-# Created: Sun Sep 08 08:30:26 2013
+# Created: Tue Sep 03 15:17:26 2013
 #      by: PyQt4 UI code generator 4.10.2
 #
 # WARNING! All changes made in this file will be lost!
@@ -26,7 +26,7 @@ except AttributeError:
 class Ui_MainWindow(object):
     def setupUi(self, MainWindow):
         MainWindow.setObjectName(_fromUtf8("MainWindow"))
-        MainWindow.resize(795, 579)
+        MainWindow.resize(885, 580)
         icon = QtGui.QIcon()
         icon.addPixmap(QtGui.QPixmap(_fromUtf8(":/newPrefix/images/can-icon-24px.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         MainWindow.setWindowIcon(icon)
@@ -238,15 +238,14 @@ class Ui_MainWindow(object):
         self.gridLayout_3.setObjectName(_fromUtf8("gridLayout_3"))
         self.pushButtonNewAddress = QtGui.QPushButton(self.youridentities)
         self.pushButtonNewAddress.setObjectName(_fromUtf8("pushButtonNewAddress"))
-        self.gridLayout_3.addWidget(self.pushButtonNewAddress, 0, 1, 1, 1)
+        self.gridLayout_3.addWidget(self.pushButtonNewAddress, 0, 0, 1, 1)
         spacerItem2 = QtGui.QSpacerItem(689, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
-        self.gridLayout_3.addItem(spacerItem2, 0, 3, 1, 1)
+        self.gridLayout_3.addItem(spacerItem2, 0, 1, 1, 1)
         self.tableWidgetYourIdentities = QtGui.QTableWidget(self.youridentities)
-        self.tableWidgetYourIdentities.setStyleSheet(_fromUtf8(""))
         self.tableWidgetYourIdentities.setFrameShadow(QtGui.QFrame.Sunken)
         self.tableWidgetYourIdentities.setLineWidth(1)
         self.tableWidgetYourIdentities.setAlternatingRowColors(True)
-        self.tableWidgetYourIdentities.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
+        self.tableWidgetYourIdentities.setSelectionMode(QtGui.QAbstractItemView.SingleSelection)
         self.tableWidgetYourIdentities.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows)
         self.tableWidgetYourIdentities.setObjectName(_fromUtf8("tableWidgetYourIdentities"))
         self.tableWidgetYourIdentities.setColumnCount(3)
@@ -269,10 +268,7 @@ class Ui_MainWindow(object):
         self.tableWidgetYourIdentities.verticalHeader().setDefaultSectionSize(26)
         self.tableWidgetYourIdentities.verticalHeader().setSortIndicatorShown(False)
         self.tableWidgetYourIdentities.verticalHeader().setStretchLastSection(False)
-        self.gridLayout_3.addWidget(self.tableWidgetYourIdentities, 1, 0, 1, 4)
+        self.gridLayout_3.addWidget(self.tableWidgetYourIdentities, 1, 0, 1, 2)
-        self.pushButtonJoinCreateChan = QtGui.QPushButton(self.youridentities)
-        self.pushButtonJoinCreateChan.setObjectName(_fromUtf8("pushButtonJoinCreateChan"))
-        self.gridLayout_3.addWidget(self.pushButtonJoinCreateChan, 0, 2, 1, 1)
         icon4 = QtGui.QIcon()
         icon4.addPixmap(QtGui.QPixmap(_fromUtf8(":/newPrefix/images/identities.png")), QtGui.QIcon.Normal, QtGui.QIcon.Off)
         self.tabWidget.addTab(self.youridentities, icon4, _fromUtf8(""))
@@ -291,7 +287,7 @@ class Ui_MainWindow(object):
         self.gridLayout_4.addItem(spacerItem3, 1, 1, 1, 1)
         self.tableWidgetSubscriptions = QtGui.QTableWidget(self.subscriptions)
         self.tableWidgetSubscriptions.setAlternatingRowColors(True)
-        self.tableWidgetSubscriptions.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
+        self.tableWidgetSubscriptions.setSelectionMode(QtGui.QAbstractItemView.SingleSelection)
         self.tableWidgetSubscriptions.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows)
         self.tableWidgetSubscriptions.setObjectName(_fromUtf8("tableWidgetSubscriptions"))
         self.tableWidgetSubscriptions.setColumnCount(2)
@@ -361,7 +357,7 @@ class Ui_MainWindow(object):
         self.gridLayout_6.addItem(spacerItem5, 2, 1, 1, 1)
         self.tableWidgetBlacklist = QtGui.QTableWidget(self.blackwhitelist)
         self.tableWidgetBlacklist.setAlternatingRowColors(True)
-        self.tableWidgetBlacklist.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
+        self.tableWidgetBlacklist.setSelectionMode(QtGui.QAbstractItemView.SingleSelection)
         self.tableWidgetBlacklist.setSelectionBehavior(QtGui.QAbstractItemView.SelectRows)
         self.tableWidgetBlacklist.setObjectName(_fromUtf8("tableWidgetBlacklist"))
         self.tableWidgetBlacklist.setColumnCount(2)
@@ -505,7 +501,7 @@ class Ui_MainWindow(object):
         self.menubar.addAction(self.menuHelp.menuAction())
 
         self.retranslateUi(MainWindow)
-        self.tabWidget.setCurrentIndex(6)
+        self.tabWidget.setCurrentIndex(0)
         QtCore.QObject.connect(self.radioButtonSpecific, QtCore.SIGNAL(_fromUtf8("toggled(bool)")), self.lineEditTo.setEnabled)
         QtCore.QObject.connect(self.radioButtonSpecific, QtCore.SIGNAL(_fromUtf8("clicked(bool)")), self.labelSendBroadcastWarning.hide)
         QtCore.QObject.connect(self.radioButtonBroadcast, QtCore.SIGNAL(_fromUtf8("clicked()")), self.labelSendBroadcastWarning.show)
@@ -522,7 +518,8 @@ class Ui_MainWindow(object):
         MainWindow.setTabOrder(self.textEditMessage, self.pushButtonSend)
         MainWindow.setTabOrder(self.pushButtonSend, self.tableWidgetSent)
         MainWindow.setTabOrder(self.tableWidgetSent, self.textEditSentMessage)
-        MainWindow.setTabOrder(self.textEditSentMessage, self.tableWidgetYourIdentities)
+        MainWindow.setTabOrder(self.textEditSentMessage, self.pushButtonNewAddress)
+        MainWindow.setTabOrder(self.pushButtonNewAddress, self.tableWidgetYourIdentities)
         MainWindow.setTabOrder(self.tableWidgetYourIdentities, self.pushButtonAddSubscription)
         MainWindow.setTabOrder(self.pushButtonAddSubscription, self.tableWidgetSubscriptions)
         MainWindow.setTabOrder(self.tableWidgetSubscriptions, self.pushButtonAddAddressBook)
@@ -584,7 +581,7 @@ class Ui_MainWindow(object):
         item = self.tableWidgetSent.horizontalHeaderItem(3)
         item.setText(_translate("MainWindow", "Status", None))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.sent), _translate("MainWindow", "Sent", None))
-        self.pushButtonNewAddress.setText(_translate("MainWindow", "Create new Address", None))
+        self.pushButtonNewAddress.setText(_translate("MainWindow", "New", None))
         self.tableWidgetYourIdentities.setSortingEnabled(True)
         item = self.tableWidgetYourIdentities.horizontalHeaderItem(0)
         item.setText(_translate("MainWindow", "Label (not shown to anyone)", None))
@@ -592,7 +589,6 @@ class Ui_MainWindow(object):
         item.setText(_translate("MainWindow", "Address", None))
         item = self.tableWidgetYourIdentities.horizontalHeaderItem(2)
         item.setText(_translate("MainWindow", "Stream", None))
-        self.pushButtonJoinCreateChan.setText(_translate("MainWindow", "Join / Create Chan", None))
         self.tabWidget.setTabText(self.tabWidget.indexOf(self.youridentities), _translate("MainWindow", "Your Identities", None))
         self.label_5.setText(_translate("MainWindow", "Here you can subscribe to \'broadcast messages\' that are sent by other users. Messages will appear in your Inbox. Addresses here override those on the Blacklist tab.", None))
         self.pushButtonAddSubscription.setText(_translate("MainWindow", "Add new Subscription", None))

src/translations/bitmessage_de.ts

@@ -17,7 +17,7 @@
     <message>
         <location filename="../bitmessageqt/__init__.py" line="165"/>
         <source>Add sender to your Address Book</source>
-        <translation>Absender zum Adressbuch hinzufügen.</translation>
+        <translation>Absender zum Adressbuch hinzufügen</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/__init__.py" line="269"/>
@@ -920,7 +920,7 @@ p, li { white-space: pre-wrap; }
     <message>
         <location filename="../bitmessageqt/bitmessageui.py" line="623"/>
         <source>Ctrl+Q</source>
-        <translation type="unfinished">Strg+Q</translation>
+        <translation>Strg+Q</translation>
     </message>
     <message>
         <location filename="../bitmessageqt/bitmessageui.py" line="625"/>
@@ -1487,7 +1487,7 @@ Die Zufallszahlen-Option ist standard, jedoch haben deterministische Adressen ei
     <message>
         <location filename="../bitmessageqt/settings.py" line="343"/>
         <source>Override automatic language localization (use countycode or language code, e.g. &apos;en_US&apos; or &apos;en&apos;):</source>
-        <translation type="unfinished"></translation>
+        <translation>Automatische Sprachauswahl überschreiben (verwenden Sie den Landescode oder Sprachcode, z.B. &quot;de_DE&quot; oder &quot;de&quot;):</translation>
     </message>
 </context>
 </TS>