fix save attach on sended message

rename sendtextedit qedittext to qbrowseEdt
This commit is contained in:
bartekn80 2013-07-15 21:50:48 +02:00
parent 3382bd46c5
commit 270f15c123
3 changed files with 26 additions and 20 deletions

View File

@ -366,6 +366,9 @@ class MyForm(QtGui.QMainWindow):
QtCore.QObject.connect(self.ui.textEditInboxMessage, QtCore.QObject.connect(self.ui.textEditInboxMessage,
QtCore.SIGNAL("anchorClicked(const QUrl&)"), self.saveAttach) 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) QtCore.QObject.connect(self.ui.AddAttach, QtCore.SIGNAL("clicked()"), self.AddAttach)
@ -2700,9 +2703,9 @@ class MyForm(QtGui.QMainWindow):
print "filename : "+value[0] print "filename : "+value[0]
self.attachArray[licznik-1]['filename']=value[1].split('=')[-1] 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) print "jest zal"+str(i)
for s in range( i+1,len(mess_list) ): for s in range( i+1,len(mess_list) ):
@ -2727,7 +2730,6 @@ class MyForm(QtGui.QMainWindow):
self.attachArray=[] self.attachArray=[]
currentRow = self.ui.tableWidgetInbox.currentRow() currentRow = self.ui.tableWidgetInbox.currentRow()
if currentRow >= 0: if currentRow >= 0:
fromAddress = str(self.ui.tableWidgetInbox.item( fromAddress = str(self.ui.tableWidgetInbox.item(
currentRow, 1).data(Qt.UserRole).toPyObject()) currentRow, 1).data(Qt.UserRole).toPyObject())
@ -2740,7 +2742,6 @@ class MyForm(QtGui.QMainWindow):
self.on_action_InboxMessageForceHtml() self.on_action_InboxMessageForceHtml()
return return
if decodeAddress(fromAddress)[3] in shared.broadcastSendersForWhichImWatching or shared.isAddressInMyAddressBook(fromAddress): if decodeAddress(fromAddress)[3] in shared.broadcastSendersForWhichImWatching or shared.isAddressInMyAddressBook(fromAddress):
if len(self.ui.tableWidgetInbox.item(currentRow, 2).data(Qt.UserRole).toPyObject()) < 30000: if len(self.ui.tableWidgetInbox.item(currentRow, 2).data(Qt.UserRole).toPyObject()) < 30000:
self.ui.textEditInboxMessage.setText(self.ui.tableWidgetInbox.item( self.ui.textEditInboxMessage.setText(self.ui.tableWidgetInbox.item(

View File

@ -2,7 +2,7 @@
# Form implementation generated from reading ui file 'bitmessageui.ui' # 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 # by: PyQt4 UI code generator 4.10
# #
# WARNING! All changes made in this file will be lost! # 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().setVisible(False)
self.tableWidgetSent.verticalHeader().setStretchLastSection(False) self.tableWidgetSent.verticalHeader().setStretchLastSection(False)
self.verticalLayout.addWidget(self.tableWidgetSent) 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.textEditSentMessage.setObjectName(_fromUtf8("textEditSentMessage"))
self.verticalLayout.addWidget(self.textEditSentMessage) self.verticalLayout.addWidget(self.textEditSentMessage)
icon3 = QtGui.QIcon() icon3 = QtGui.QIcon()
@ -537,7 +538,7 @@ class Ui_MainWindow(object):
self.textEditMessage.setHtml(_translate("MainWindow", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n" self.textEditMessage.setHtml(_translate("MainWindow", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n" "<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
"p, li { white-space: pre-wrap; }\n" "p, li { white-space: pre-wrap; }\n"
"</style></head><body style=\" font-family:\'Sans\'; font-size:9pt; font-weight:400; font-style:normal;\">\n" "</style></head><body style=\" font-family:\'Droid Sans\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
"<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>", None)) "<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>", None))
self.radioButtonBroadcast.setText(_translate("MainWindow", "Broadcast to everyone who is subscribed to your address", None)) self.radioButtonBroadcast.setText(_translate("MainWindow", "Broadcast to everyone who is subscribed to your address", None))
self.label.setText(_translate("MainWindow", "To:", None)) self.label.setText(_translate("MainWindow", "To:", None))

View File

@ -14,7 +14,7 @@
<string>Bitmessage</string> <string>Bitmessage</string>
</property> </property>
<property name="windowIcon"> <property name="windowIcon">
<iconset> <iconset resource="bitmessage_icons.qrc">
<normaloff>:/newPrefix/images/can-icon-24px.png</normaloff>:/newPrefix/images/can-icon-24px.png</iconset> <normaloff>:/newPrefix/images/can-icon-24px.png</normaloff>:/newPrefix/images/can-icon-24px.png</iconset>
</property> </property>
<property name="tabShape"> <property name="tabShape">
@ -61,7 +61,7 @@
</property> </property>
<widget class="QWidget" name="inbox"> <widget class="QWidget" name="inbox">
<attribute name="icon"> <attribute name="icon">
<iconset> <iconset resource="bitmessage_icons.qrc">
<normaloff>:/newPrefix/images/inbox.png</normaloff>:/newPrefix/images/inbox.png</iconset> <normaloff>:/newPrefix/images/inbox.png</normaloff>:/newPrefix/images/inbox.png</iconset>
</attribute> </attribute>
<attribute name="title"> <attribute name="title">
@ -203,7 +203,7 @@
</widget> </widget>
<widget class="QWidget" name="send"> <widget class="QWidget" name="send">
<attribute name="icon"> <attribute name="icon">
<iconset> <iconset resource="bitmessage_icons.qrc">
<normaloff>:/newPrefix/images/send.png</normaloff>:/newPrefix/images/send.png</iconset> <normaloff>:/newPrefix/images/send.png</normaloff>:/newPrefix/images/send.png</iconset>
</attribute> </attribute>
<attribute name="title"> <attribute name="title">
@ -253,7 +253,7 @@
<string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt; <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt; &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt; &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Droid Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot;-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';&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string> &lt;p style=&quot;-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';&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property> </property>
</widget> </widget>
@ -365,7 +365,7 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
<widget class="QWidget" name="sent"> <widget class="QWidget" name="sent">
<attribute name="icon"> <attribute name="icon">
<iconset> <iconset resource="bitmessage_icons.qrc">
<normaloff>:/newPrefix/images/sent.png</normaloff>:/newPrefix/images/sent.png</iconset> <normaloff>:/newPrefix/images/sent.png</normaloff>:/newPrefix/images/sent.png</iconset>
</attribute> </attribute>
<attribute name="title"> <attribute name="title">
@ -479,13 +479,17 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QTextEdit" name="textEditSentMessage"/> <widget class="QTextBrowser" name="textEditSentMessage">
<property name="openLinks">
<bool>false</bool>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="youridentities"> <widget class="QWidget" name="youridentities">
<attribute name="icon"> <attribute name="icon">
<iconset> <iconset resource="bitmessage_icons.qrc">
<normaloff>:/newPrefix/images/identities.png</normaloff>:/newPrefix/images/identities.png</iconset> <normaloff>:/newPrefix/images/identities.png</normaloff>:/newPrefix/images/identities.png</iconset>
</attribute> </attribute>
<attribute name="title"> <attribute name="title">
@ -585,7 +589,7 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
<widget class="QWidget" name="subscriptions"> <widget class="QWidget" name="subscriptions">
<attribute name="icon"> <attribute name="icon">
<iconset> <iconset resource="bitmessage_icons.qrc">
<normaloff>:/newPrefix/images/subscriptions.png</normaloff>:/newPrefix/images/subscriptions.png</iconset> <normaloff>:/newPrefix/images/subscriptions.png</normaloff>:/newPrefix/images/subscriptions.png</iconset>
</attribute> </attribute>
<attribute name="title"> <attribute name="title">
@ -670,7 +674,7 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
<widget class="QWidget" name="addressbook"> <widget class="QWidget" name="addressbook">
<attribute name="icon"> <attribute name="icon">
<iconset> <iconset resource="bitmessage_icons.qrc">
<normaloff>:/newPrefix/images/addressbook.png</normaloff>:/newPrefix/images/addressbook.png</iconset> <normaloff>:/newPrefix/images/addressbook.png</normaloff>:/newPrefix/images/addressbook.png</iconset>
</attribute> </attribute>
<attribute name="title"> <attribute name="title">
@ -752,7 +756,7 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
<widget class="QWidget" name="blackwhitelist"> <widget class="QWidget" name="blackwhitelist">
<attribute name="icon"> <attribute name="icon">
<iconset> <iconset resource="bitmessage_icons.qrc">
<normaloff>:/newPrefix/images/blacklist.png</normaloff>:/newPrefix/images/blacklist.png</iconset> <normaloff>:/newPrefix/images/blacklist.png</normaloff>:/newPrefix/images/blacklist.png</iconset>
</attribute> </attribute>
<attribute name="title"> <attribute name="title">
@ -844,7 +848,7 @@ p, li { white-space: pre-wrap; }
</widget> </widget>
<widget class="QWidget" name="networkstatus"> <widget class="QWidget" name="networkstatus">
<attribute name="icon"> <attribute name="icon">
<iconset> <iconset resource="bitmessage_icons.qrc">
<normaloff>:/newPrefix/images/networkstatus.png</normaloff>:/newPrefix/images/networkstatus.png</iconset> <normaloff>:/newPrefix/images/networkstatus.png</normaloff>:/newPrefix/images/networkstatus.png</iconset>
</attribute> </attribute>
<attribute name="title"> <attribute name="title">
@ -863,7 +867,7 @@ p, li { white-space: pre-wrap; }
<string/> <string/>
</property> </property>
<property name="icon"> <property name="icon">
<iconset> <iconset resource="bitmessage_icons.qrc">
<normaloff>:/newPrefix/images/redicon.png</normaloff>:/newPrefix/images/redicon.png</iconset> <normaloff>:/newPrefix/images/redicon.png</normaloff>:/newPrefix/images/redicon.png</iconset>
</property> </property>
<property name="flat"> <property name="flat">