From 270f15c123c20dc9d72ffe1e0730eb55779dbdfb Mon Sep 17 00:00:00 2001 From: bartekn80 Date: Mon, 15 Jul 2013 21:50:48 +0200 Subject: [PATCH] fix save attach on sended message rename sendtextedit qedittext to qbrowseEdt --- src/bitmessageqt/__init__.py | 11 ++++++----- src/bitmessageqt/bitmessageui.py | 7 ++++--- src/bitmessageqt/bitmessageui.ui | 28 ++++++++++++++++------------ 3 files changed, 26 insertions(+), 20 deletions(-) diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index c74f24c9..e999858a 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -366,6 +366,9 @@ class MyForm(QtGui.QMainWindow): QtCore.QObject.connect(self.ui.textEditInboxMessage, QtCore.SIGNAL("anchorClicked(const QUrl&)"), self.saveAttach) + QtCore.QObject.connect(self.ui.textEditSentMessage, + QtCore.SIGNAL("anchorClicked(const QUrl&)"), self.saveAttach) + QtCore.QObject.connect(self.ui.AddAttach, QtCore.SIGNAL("clicked()"), self.AddAttach) @@ -2700,9 +2703,9 @@ class MyForm(QtGui.QMainWindow): print "filename : "+value[0] self.attachArray[licznik-1]['filename']=value[1].split('=')[-1] - print mess_list[i] + - if(mess_list[i]=='\n' and zal == True): + if((mess_list[i]=='' or mess_list[i]=='\n') and zal == True): print "jest zal"+str(i) for s in range( i+1,len(mess_list) ): @@ -2716,7 +2719,7 @@ class MyForm(QtGui.QMainWindow): dane='' zal=False break - + if(attachs): return True else: @@ -2727,7 +2730,6 @@ class MyForm(QtGui.QMainWindow): self.attachArray=[] currentRow = self.ui.tableWidgetInbox.currentRow() - if currentRow >= 0: fromAddress = str(self.ui.tableWidgetInbox.item( currentRow, 1).data(Qt.UserRole).toPyObject()) @@ -2740,7 +2742,6 @@ class MyForm(QtGui.QMainWindow): self.on_action_InboxMessageForceHtml() return - if decodeAddress(fromAddress)[3] in shared.broadcastSendersForWhichImWatching or shared.isAddressInMyAddressBook(fromAddress): if len(self.ui.tableWidgetInbox.item(currentRow, 2).data(Qt.UserRole).toPyObject()) < 30000: self.ui.textEditInboxMessage.setText(self.ui.tableWidgetInbox.item( diff --git a/src/bitmessageqt/bitmessageui.py b/src/bitmessageqt/bitmessageui.py index a3385738..c3f122dc 100644 --- a/src/bitmessageqt/bitmessageui.py +++ b/src/bitmessageqt/bitmessageui.py @@ -2,7 +2,7 @@ # Form implementation generated from reading ui file 'bitmessageui.ui' # -# Created: Sun Jul 14 13:49:53 2013 +# Created: Mon Jul 15 21:33:24 2013 # by: PyQt4 UI code generator 4.10 # # WARNING! All changes made in this file will be lost! @@ -230,7 +230,8 @@ class Ui_MainWindow(object): self.tableWidgetSent.verticalHeader().setVisible(False) self.tableWidgetSent.verticalHeader().setStretchLastSection(False) self.verticalLayout.addWidget(self.tableWidgetSent) - self.textEditSentMessage = QtGui.QTextEdit(self.sent) + self.textEditSentMessage = QtGui.QTextBrowser(self.sent) + self.textEditSentMessage.setOpenLinks(False) self.textEditSentMessage.setObjectName(_fromUtf8("textEditSentMessage")) self.verticalLayout.addWidget(self.textEditSentMessage) icon3 = QtGui.QIcon() @@ -537,7 +538,7 @@ class Ui_MainWindow(object): self.textEditMessage.setHtml(_translate("MainWindow", "\n" "\n" +"\n" "


", None)) self.radioButtonBroadcast.setText(_translate("MainWindow", "Broadcast to everyone who is subscribed to your address", None)) self.label.setText(_translate("MainWindow", "To:", None)) diff --git a/src/bitmessageqt/bitmessageui.ui b/src/bitmessageqt/bitmessageui.ui index b8527021..0607c18c 100644 --- a/src/bitmessageqt/bitmessageui.ui +++ b/src/bitmessageqt/bitmessageui.ui @@ -14,7 +14,7 @@ Bitmessage - + :/newPrefix/images/can-icon-24px.png:/newPrefix/images/can-icon-24px.png @@ -61,7 +61,7 @@ - + :/newPrefix/images/inbox.png:/newPrefix/images/inbox.png @@ -203,7 +203,7 @@ - + :/newPrefix/images/send.png:/newPrefix/images/send.png @@ -253,7 +253,7 @@ <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +</style></head><body style=" font-family:'Droid Sans'; font-size:9pt; font-weight:400; font-style:normal;"> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2';"><br /></p></body></html> @@ -365,7 +365,7 @@ p, li { white-space: pre-wrap; } - + :/newPrefix/images/sent.png:/newPrefix/images/sent.png @@ -479,13 +479,17 @@ p, li { white-space: pre-wrap; } - + + + false + + - + :/newPrefix/images/identities.png:/newPrefix/images/identities.png @@ -585,7 +589,7 @@ p, li { white-space: pre-wrap; } - + :/newPrefix/images/subscriptions.png:/newPrefix/images/subscriptions.png @@ -670,7 +674,7 @@ p, li { white-space: pre-wrap; } - + :/newPrefix/images/addressbook.png:/newPrefix/images/addressbook.png @@ -752,7 +756,7 @@ p, li { white-space: pre-wrap; } - + :/newPrefix/images/blacklist.png:/newPrefix/images/blacklist.png @@ -844,7 +848,7 @@ p, li { white-space: pre-wrap; } - + :/newPrefix/images/networkstatus.png:/newPrefix/images/networkstatus.png @@ -863,7 +867,7 @@ p, li { white-space: pre-wrap; } - + :/newPrefix/images/redicon.png:/newPrefix/images/redicon.png