Skip to content

Commit d93d923

Browse files
author
Jonathan Warren
committed
Added some default text to the search textbox, also fixed bitmessage_icons.qrc after file move
1 parent fbb9a4a commit d93d923

4 files changed

Lines changed: 38 additions & 47 deletions

File tree

‎src/bitmessagemain.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
from gevent import monkey
1515
monkey.patch_all()
1616
except ImportError as ex:
17-
print "cannot find gevent"
17+
print "Not using the gevent module as it was not found. No need to worry."
1818

1919
import signal # Used to capture a Ctrl-C keypress so that Bitmessage can shutdown gracefully.
2020
# The next 3 are used for the API

‎src/bitmessageqt/bitmessage_icons.qrc‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<RCC>
22
<qresource prefix="newPrefix">
3-
<file>images/can-icon-24px-yellow.png</file>
4-
<file>images/can-icon-24px-red.png</file>
5-
<file>images/can-icon-24px-green.png</file>
6-
<file>images/can-icon-24px.png</file>
7-
<file>images/can-icon-16px.png</file>
8-
<file>images/greenicon.png</file>
9-
<file>images/redicon.png</file>
10-
<file>images/yellowicon.png</file>
11-
<file>images/addressbook.png</file>
12-
<file>images/blacklist.png</file>
13-
<file>images/identities.png</file>
14-
<file>images/networkstatus.png</file>
15-
<file>images/sent.png</file>
16-
<file>images/subscriptions.png</file>
17-
<file>images/send.png</file>
18-
<file>images/inbox.png</file>
3+
<file>../images/can-icon-24px-yellow.png</file>
4+
<file>../images/can-icon-24px-red.png</file>
5+
<file>../images/can-icon-24px-green.png</file>
6+
<file>../images/can-icon-24px.png</file>
7+
<file>../images/can-icon-16px.png</file>
8+
<file>../images/greenicon.png</file>
9+
<file>../images/redicon.png</file>
10+
<file>../images/yellowicon.png</file>
11+
<file>../images/addressbook.png</file>
12+
<file>../images/blacklist.png</file>
13+
<file>../images/identities.png</file>
14+
<file>../images/networkstatus.png</file>
15+
<file>../images/sent.png</file>
16+
<file>../images/subscriptions.png</file>
17+
<file>../images/send.png</file>
18+
<file>../images/inbox.png</file>
1919
</qresource>
2020
</RCC>

‎src/bitmessageqt/bitmessageui.py‎

Lines changed: 7 additions & 15 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: Fri Jul 12 04:40:47 2013
6-
# by: PyQt4 UI code generator 4.10
5+
# Created: Sat Jul 13 20:23:44 2013
6+
# by: PyQt4 UI code generator 4.10.2
77
#
88
# WARNING! All changes made in this file will be lost!
99

@@ -422,7 +422,7 @@ def setupUi(self, MainWindow):
422422
self.gridLayout.addWidget(self.tabWidget, 0, 0, 1, 1)
423423
MainWindow.setCentralWidget(self.centralwidget)
424424
self.menubar = QtGui.QMenuBar(MainWindow)
425-
self.menubar.setGeometry(QtCore.QRect(0, 0, 795, 25))
425+
self.menubar.setGeometry(QtCore.QRect(0, 0, 795, 18))
426426
self.menubar.setObjectName(_fromUtf8("menubar"))
427427
self.menuFile = QtGui.QMenu(self.menubar)
428428
self.menuFile.setObjectName(_fromUtf8("menuFile"))
@@ -497,6 +497,7 @@ def setupUi(self, MainWindow):
497497

498498
def retranslateUi(self, MainWindow):
499499
MainWindow.setWindowTitle(_translate("MainWindow", "Bitmessage", None))
500+
self.inboxSearchLineEdit.setPlaceholderText(_translate("MainWindow", "Search", None))
500501
self.inboxSearchOptionCB.setItemText(0, _translate("MainWindow", "All", None))
501502
self.inboxSearchOptionCB.setItemText(1, _translate("MainWindow", "To", None))
502503
self.inboxSearchOptionCB.setItemText(2, _translate("MainWindow", "From", None))
@@ -519,14 +520,15 @@ def retranslateUi(self, MainWindow):
519520
self.textEditMessage.setHtml(_translate("MainWindow", "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\">\n"
520521
"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\n"
521522
"p, li { white-space: pre-wrap; }\n"
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))
523+
"</style></head><body style=\" font-family:\'MS Shell Dlg 2\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
524+
"<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))
524525
self.label.setText(_translate("MainWindow", "To:", None))
525526
self.label_2.setText(_translate("MainWindow", "From:", None))
526527
self.radioButtonBroadcast.setText(_translate("MainWindow", "Broadcast to everyone who is subscribed to your address", None))
527528
self.pushButtonSend.setText(_translate("MainWindow", "Send", None))
528529
self.labelSendBroadcastWarning.setText(_translate("MainWindow", "Be aware that broadcasts are only encrypted with your address. Anyone who knows your address can read them.", None))
529530
self.tabWidget.setTabText(self.tabWidget.indexOf(self.send), _translate("MainWindow", "Send", None))
531+
self.sentSearchLineEdit.setPlaceholderText(_translate("MainWindow", "Search", None))
530532
self.sentSearchOptionCB.setItemText(0, _translate("MainWindow", "All", None))
531533
self.sentSearchOptionCB.setItemText(1, _translate("MainWindow", "To", None))
532534
self.sentSearchOptionCB.setItemText(2, _translate("MainWindow", "From", None))
@@ -599,13 +601,3 @@ def retranslateUi(self, MainWindow):
599601
self.actionDeleteAllTrashedMessages.setText(_translate("MainWindow", "Delete all trashed messages", None))
600602

601603
import bitmessage_icons_rc
602-
603-
if __name__ == "__main__":
604-
import sys
605-
app = QtGui.QApplication(sys.argv)
606-
MainWindow = QtGui.QMainWindow()
607-
ui = Ui_MainWindow()
608-
ui.setupUi(MainWindow)
609-
MainWindow.show()
610-
sys.exit(app.exec_())
611-

‎src/bitmessageqt/bitmessageui.ui‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,7 @@
2222
</property>
2323
<widget class="QWidget" name="centralwidget">
2424
<layout class="QGridLayout" name="gridLayout">
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">
25+
<property name="margin">
3526
<number>0</number>
3627
</property>
3728
<item row="0" column="0">
@@ -83,7 +74,11 @@
8374
<number>0</number>
8475
</property>
8576
<item>
86-
<widget class="QLineEdit" name="inboxSearchLineEdit"/>
77+
<widget class="QLineEdit" name="inboxSearchLineEdit">
78+
<property name="placeholderText">
79+
<string>Search</string>
80+
</property>
81+
</widget>
8782
</item>
8883
<item>
8984
<widget class="QComboBox" name="inboxSearchOptionCB">
@@ -262,8 +257,8 @@
262257
<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;
263258
&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;
264259
p, li { white-space: pre-wrap; }
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>
260+
&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;
261+
&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>
267262
</property>
268263
</widget>
269264
</item>
@@ -364,7 +359,11 @@ p, li { white-space: pre-wrap; }
364359
<number>0</number>
365360
</property>
366361
<item>
367-
<widget class="QLineEdit" name="sentSearchLineEdit"/>
362+
<widget class="QLineEdit" name="sentSearchLineEdit">
363+
<property name="placeholderText">
364+
<string>Search</string>
365+
</property>
366+
</widget>
368367
</item>
369368
<item>
370369
<widget class="QComboBox" name="sentSearchOptionCB">
@@ -1012,7 +1011,7 @@ p, li { white-space: pre-wrap; }
10121011
<x>0</x>
10131012
<y>0</y>
10141013
<width>795</width>
1015-
<height>25</height>
1014+
<height>18</height>
10161015
</rect>
10171016
</property>
10181017
<widget class="QMenu" name="menuFile">

0 commit comments

Comments
 (0)