Skip to content

Commit fbb9a4a

Browse files
author
Jonathan Warren
committed
Merge branch 'master' of git://github.com/rainulf/PyBitmessage into rainulf-master
2 parents 640a4c6 + a3cdc28 commit fbb9a4a

7 files changed

Lines changed: 415 additions & 216 deletions

File tree

‎Makefile‎

100755100644
File mode changed.

‎debian.sh‎

100755100644
File mode changed.

‎debian/rules‎

100755100644
File mode changed.

‎osx.sh‎

100755100644
File mode changed.

‎src/bitmessageqt/__init__.py‎

Lines changed: 269 additions & 197 deletions
Large diffs are not rendered by default.

‎src/bitmessageqt/bitmessageui.py‎

Lines changed: 45 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
# Form implementation generated from reading ui file 'bitmessageui.ui'
44
#
5-
# Created: Thu Jun 13 01:02:50 2013
6-
# by: PyQt4 UI code generator 4.10.1
5+
# Created: Fri Jul 12 04:40:47 2013
6+
# by: PyQt4 UI code generator 4.10
77
#
88
# WARNING! All changes made in this file will be lost!
99

@@ -54,6 +54,21 @@ def setupUi(self, MainWindow):
5454
self.inbox.setObjectName(_fromUtf8("inbox"))
5555
self.verticalLayout_2 = QtGui.QVBoxLayout(self.inbox)
5656
self.verticalLayout_2.setObjectName(_fromUtf8("verticalLayout_2"))
57+
self.horizontalLayoutSearch = QtGui.QHBoxLayout()
58+
self.horizontalLayoutSearch.setContentsMargins(-1, 0, -1, -1)
59+
self.horizontalLayoutSearch.setObjectName(_fromUtf8("horizontalLayoutSearch"))
60+
self.inboxSearchLineEdit = QtGui.QLineEdit(self.inbox)
61+
self.inboxSearchLineEdit.setObjectName(_fromUtf8("inboxSearchLineEdit"))
62+
self.horizontalLayoutSearch.addWidget(self.inboxSearchLineEdit)
63+
self.inboxSearchOptionCB = QtGui.QComboBox(self.inbox)
64+
self.inboxSearchOptionCB.setObjectName(_fromUtf8("inboxSearchOptionCB"))
65+
self.inboxSearchOptionCB.addItem(_fromUtf8(""))
66+
self.inboxSearchOptionCB.addItem(_fromUtf8(""))
67+
self.inboxSearchOptionCB.addItem(_fromUtf8(""))
68+
self.inboxSearchOptionCB.addItem(_fromUtf8(""))
69+
self.inboxSearchOptionCB.addItem(_fromUtf8(""))
70+
self.horizontalLayoutSearch.addWidget(self.inboxSearchOptionCB)
71+
self.verticalLayout_2.addLayout(self.horizontalLayoutSearch)
5772
self.tableWidgetInbox = QtGui.QTableWidget(self.inbox)
5873
self.tableWidgetInbox.setAlternatingRowColors(True)
5974
self.tableWidgetInbox.setSelectionMode(QtGui.QAbstractItemView.ExtendedSelection)
@@ -157,6 +172,21 @@ def setupUi(self, MainWindow):
157172
self.sent.setObjectName(_fromUtf8("sent"))
158173
self.verticalLayout = QtGui.QVBoxLayout(self.sent)
159174
self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
175+
self.horizontalLayout = QtGui.QHBoxLayout()
176+
self.horizontalLayout.setContentsMargins(-1, 0, -1, -1)
177+
self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
178+
self.sentSearchLineEdit = QtGui.QLineEdit(self.sent)
179+
self.sentSearchLineEdit.setObjectName(_fromUtf8("sentSearchLineEdit"))
180+
self.horizontalLayout.addWidget(self.sentSearchLineEdit)
181+
self.sentSearchOptionCB = QtGui.QComboBox(self.sent)
182+
self.sentSearchOptionCB.setObjectName(_fromUtf8("sentSearchOptionCB"))
183+
self.sentSearchOptionCB.addItem(_fromUtf8(""))
184+
self.sentSearchOptionCB.addItem(_fromUtf8(""))
185+
self.sentSearchOptionCB.addItem(_fromUtf8(""))
186+
self.sentSearchOptionCB.addItem(_fromUtf8(""))
187+
self.sentSearchOptionCB.addItem(_fromUtf8(""))
188+
self.horizontalLayout.addWidget(self.sentSearchOptionCB)
189+
self.verticalLayout.addLayout(self.horizontalLayout)
160190
self.tableWidgetSent = QtGui.QTableWidget(self.sent)
161191
self.tableWidgetSent.setDragDropMode(QtGui.QAbstractItemView.DragDrop)
162192
self.tableWidgetSent.setAlternatingRowColors(True)
@@ -392,7 +422,7 @@ def setupUi(self, MainWindow):
392422
self.gridLayout.addWidget(self.tabWidget, 0, 0, 1, 1)
393423
MainWindow.setCentralWidget(self.centralwidget)
394424
self.menubar = QtGui.QMenuBar(MainWindow)
395-
self.menubar.setGeometry(QtCore.QRect(0, 0, 795, 18))
425+
self.menubar.setGeometry(QtCore.QRect(0, 0, 795, 25))
396426
self.menubar.setObjectName(_fromUtf8("menubar"))
397427
self.menuFile = QtGui.QMenu(self.menubar)
398428
self.menuFile.setObjectName(_fromUtf8("menuFile"))
@@ -467,6 +497,11 @@ def setupUi(self, MainWindow):
467497

468498
def retranslateUi(self, MainWindow):
469499
MainWindow.setWindowTitle(_translate("MainWindow", "Bitmessage", None))
500+
self.inboxSearchOptionCB.setItemText(0, _translate("MainWindow", "All", None))
501+
self.inboxSearchOptionCB.setItemText(1, _translate("MainWindow", "To", None))
502+
self.inboxSearchOptionCB.setItemText(2, _translate("MainWindow", "From", None))
503+
self.inboxSearchOptionCB.setItemText(3, _translate("MainWindow", "Subject", None))
504+
self.inboxSearchOptionCB.setItemText(4, _translate("MainWindow", "Message", None))
470505
self.tableWidgetInbox.setSortingEnabled(True)
471506
item = self.tableWidgetInbox.horizontalHeaderItem(0)
472507
item.setText(_translate("MainWindow", "To", None))
@@ -484,14 +519,19 @@ def retranslateUi(self, MainWindow):
484519
self.textEditMessage.setHtml(_translate("MainWindow", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
485520
"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
486521
"p, li { white-space: pre-wrap; }\n"
487-
"</style></head><body style=\" font-family:\'MS Shell Dlg 2\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
488-
"<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;\"><br /></p></body></html>", None))
522+
"</style></head><body style=\" font-family:\'Sans\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
523+
"<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))
489524
self.label.setText(_translate("MainWindow", "To:", None))
490525
self.label_2.setText(_translate("MainWindow", "From:", None))
491526
self.radioButtonBroadcast.setText(_translate("MainWindow", "Broadcast to everyone who is subscribed to your address", None))
492527
self.pushButtonSend.setText(_translate("MainWindow", "Send", None))
493528
self.labelSendBroadcastWarning.setText(_translate("MainWindow", "Be aware that broadcasts are only encrypted with your address. Anyone who knows your address can read them.", None))
494529
self.tabWidget.setTabText(self.tabWidget.indexOf(self.send), _translate("MainWindow", "Send", None))
530+
self.sentSearchOptionCB.setItemText(0, _translate("MainWindow", "All", None))
531+
self.sentSearchOptionCB.setItemText(1, _translate("MainWindow", "To", None))
532+
self.sentSearchOptionCB.setItemText(2, _translate("MainWindow", "From", None))
533+
self.sentSearchOptionCB.setItemText(3, _translate("MainWindow", "Subject", None))
534+
self.sentSearchOptionCB.setItemText(4, _translate("MainWindow", "Message", None))
495535
self.tableWidgetSent.setSortingEnabled(True)
496536
item = self.tableWidgetSent.horizontalHeaderItem(0)
497537
item.setText(_translate("MainWindow", "To", None))

‎src/bitmessageqt/bitmessageui.ui‎

Lines changed: 101 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,24 @@
1414
<string>Bitmessage</string>
1515
</property>
1616
<property name="windowIcon">
17-
<iconset resource="bitmessage_icons.qrc">
17+
<iconset>
1818
<normaloff>:/newPrefix/images/can-icon-24px.png</normaloff>:/newPrefix/images/can-icon-24px.png</iconset>
1919
</property>
2020
<property name="tabShape">
2121
<enum>QTabWidget::Rounded</enum>
2222
</property>
2323
<widget class="QWidget" name="centralwidget">
2424
<layout class="QGridLayout" name="gridLayout">
25-
<property name="margin">
25+
<property name="leftMargin">
26+
<number>0</number>
27+
</property>
28+
<property name="topMargin">
29+
<number>0</number>
30+
</property>
31+
<property name="rightMargin">
32+
<number>0</number>
33+
</property>
34+
<property name="bottomMargin">
2635
<number>0</number>
2736
</property>
2837
<item row="0" column="0">
@@ -61,13 +70,52 @@
6170
</property>
6271
<widget class="QWidget" name="inbox">
6372
<attribute name="icon">
64-
<iconset resource="bitmessage_icons.qrc">
73+
<iconset>
6574
<normaloff>:/newPrefix/images/inbox.png</normaloff>:/newPrefix/images/inbox.png</iconset>
6675
</attribute>
6776
<attribute name="title">
6877
<string>Inbox</string>
6978
</attribute>
7079
<layout class="QVBoxLayout" name="verticalLayout_2">
80+
<item>
81+
<layout class="QHBoxLayout" name="horizontalLayoutSearch">
82+
<property name="topMargin">
83+
<number>0</number>
84+
</property>
85+
<item>
86+
<widget class="QLineEdit" name="inboxSearchLineEdit"/>
87+
</item>
88+
<item>
89+
<widget class="QComboBox" name="inboxSearchOptionCB">
90+
<item>
91+
<property name="text">
92+
<string>All</string>
93+
</property>
94+
</item>
95+
<item>
96+
<property name="text">
97+
<string>To</string>
98+
</property>
99+
</item>
100+
<item>
101+
<property name="text">
102+
<string>From</string>
103+
</property>
104+
</item>
105+
<item>
106+
<property name="text">
107+
<string>Subject</string>
108+
</property>
109+
</item>
110+
<item>
111+
<property name="text">
112+
<string>Message</string>
113+
</property>
114+
</item>
115+
</widget>
116+
</item>
117+
</layout>
118+
</item>
71119
<item>
72120
<widget class="QTableWidget" name="tableWidgetInbox">
73121
<property name="alternatingRowColors">
@@ -145,7 +193,7 @@
145193
</widget>
146194
<widget class="QWidget" name="send">
147195
<attribute name="icon">
148-
<iconset resource="bitmessage_icons.qrc">
196+
<iconset>
149197
<normaloff>:/newPrefix/images/send.png</normaloff>:/newPrefix/images/send.png</iconset>
150198
</attribute>
151199
<attribute name="title">
@@ -214,8 +262,8 @@
214262
<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;
215263
&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;
216264
p, li { white-space: pre-wrap; }
217-
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'MS Shell Dlg 2'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
218-
&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;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
265+
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
266+
&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>
219267
</property>
220268
</widget>
221269
</item>
@@ -303,13 +351,52 @@ p, li { white-space: pre-wrap; }
303351
</widget>
304352
<widget class="QWidget" name="sent">
305353
<attribute name="icon">
306-
<iconset resource="bitmessage_icons.qrc">
354+
<iconset>
307355
<normaloff>:/newPrefix/images/sent.png</normaloff>:/newPrefix/images/sent.png</iconset>
308356
</attribute>
309357
<attribute name="title">
310358
<string>Sent</string>
311359
</attribute>
312360
<layout class="QVBoxLayout" name="verticalLayout">
361+
<item>
362+
<layout class="QHBoxLayout" name="horizontalLayout">
363+
<property name="topMargin">
364+
<number>0</number>
365+
</property>
366+
<item>
367+
<widget class="QLineEdit" name="sentSearchLineEdit"/>
368+
</item>
369+
<item>
370+
<widget class="QComboBox" name="sentSearchOptionCB">
371+
<item>
372+
<property name="text">
373+
<string>All</string>
374+
</property>
375+
</item>
376+
<item>
377+
<property name="text">
378+
<string>To</string>
379+
</property>
380+
</item>
381+
<item>
382+
<property name="text">
383+
<string>From</string>
384+
</property>
385+
</item>
386+
<item>
387+
<property name="text">
388+
<string>Subject</string>
389+
</property>
390+
</item>
391+
<item>
392+
<property name="text">
393+
<string>Message</string>
394+
</property>
395+
</item>
396+
</widget>
397+
</item>
398+
</layout>
399+
</item>
313400
<item>
314401
<widget class="QTableWidget" name="tableWidgetSent">
315402
<property name="dragDropMode">
@@ -380,7 +467,7 @@ p, li { white-space: pre-wrap; }
380467
</widget>
381468
<widget class="QWidget" name="youridentities">
382469
<attribute name="icon">
383-
<iconset resource="bitmessage_icons.qrc">
470+
<iconset>
384471
<normaloff>:/newPrefix/images/identities.png</normaloff>:/newPrefix/images/identities.png</iconset>
385472
</attribute>
386473
<attribute name="title">
@@ -480,7 +567,7 @@ p, li { white-space: pre-wrap; }
480567
</widget>
481568
<widget class="QWidget" name="subscriptions">
482569
<attribute name="icon">
483-
<iconset resource="bitmessage_icons.qrc">
570+
<iconset>
484571
<normaloff>:/newPrefix/images/subscriptions.png</normaloff>:/newPrefix/images/subscriptions.png</iconset>
485572
</attribute>
486573
<attribute name="title">
@@ -565,7 +652,7 @@ p, li { white-space: pre-wrap; }
565652
</widget>
566653
<widget class="QWidget" name="addressbook">
567654
<attribute name="icon">
568-
<iconset resource="bitmessage_icons.qrc">
655+
<iconset>
569656
<normaloff>:/newPrefix/images/addressbook.png</normaloff>:/newPrefix/images/addressbook.png</iconset>
570657
</attribute>
571658
<attribute name="title">
@@ -647,7 +734,7 @@ p, li { white-space: pre-wrap; }
647734
</widget>
648735
<widget class="QWidget" name="blackwhitelist">
649736
<attribute name="icon">
650-
<iconset resource="bitmessage_icons.qrc">
737+
<iconset>
651738
<normaloff>:/newPrefix/images/blacklist.png</normaloff>:/newPrefix/images/blacklist.png</iconset>
652739
</attribute>
653740
<attribute name="title">
@@ -739,7 +826,7 @@ p, li { white-space: pre-wrap; }
739826
</widget>
740827
<widget class="QWidget" name="networkstatus">
741828
<attribute name="icon">
742-
<iconset resource="bitmessage_icons.qrc">
829+
<iconset>
743830
<normaloff>:/newPrefix/images/networkstatus.png</normaloff>:/newPrefix/images/networkstatus.png</iconset>
744831
</attribute>
745832
<attribute name="title">
@@ -758,7 +845,7 @@ p, li { white-space: pre-wrap; }
758845
<string/>
759846
</property>
760847
<property name="icon">
761-
<iconset resource="bitmessage_icons.qrc">
848+
<iconset>
762849
<normaloff>:/newPrefix/images/redicon.png</normaloff>:/newPrefix/images/redicon.png</iconset>
763850
</property>
764851
<property name="flat">
@@ -925,7 +1012,7 @@ p, li { white-space: pre-wrap; }
9251012
<x>0</x>
9261013
<y>0</y>
9271014
<width>795</width>
928-
<height>18</height>
1015+
<height>25</height>
9291016
</rect>
9301017
</property>
9311018
<widget class="QMenu" name="menuFile">

0 commit comments

Comments
 (0)