Added some default text to the search textbox, also fixed bitmessage_icons.qrc after file move
This commit is contained in:
Jonathan Warren
parent
fbb9a4ae60
commit
d93d923364
|
|
@ -14,7 +14,7 @@ try:
|
|||
from gevent import monkey
|
||||
monkey.patch_all()
|
||||
except ImportError as ex:
|
||||
print "cannot find gevent"
|
||||
print "Not using the gevent module as it was not found. No need to worry."
|
||||
|
||||
import signal # Used to capture a Ctrl-C keypress so that Bitmessage can shutdown gracefully.
|
||||
# The next 3 are used for the API
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
<RCC>
|
||||
<qresource prefix="newPrefix">
|
||||
<file>images/can-icon-24px-yellow.png</file>
|
||||
<file>images/can-icon-24px-red.png</file>
|
||||
<file>images/can-icon-24px-green.png</file>
|
||||
<file>images/can-icon-24px.png</file>
|
||||
<file>images/can-icon-16px.png</file>
|
||||
<file>images/greenicon.png</file>
|
||||
<file>images/redicon.png</file>
|
||||
<file>images/yellowicon.png</file>
|
||||
<file>images/addressbook.png</file>
|
||||
<file>images/blacklist.png</file>
|
||||
<file>images/identities.png</file>
|
||||
<file>images/networkstatus.png</file>
|
||||
<file>images/sent.png</file>
|
||||
<file>images/subscriptions.png</file>
|
||||
<file>images/send.png</file>
|
||||
<file>images/inbox.png</file>
|
||||
<file>../images/can-icon-24px-yellow.png</file>
|
||||
<file>../images/can-icon-24px-red.png</file>
|
||||
<file>../images/can-icon-24px-green.png</file>
|
||||
<file>../images/can-icon-24px.png</file>
|
||||
<file>../images/can-icon-16px.png</file>
|
||||
<file>../images/greenicon.png</file>
|
||||
<file>../images/redicon.png</file>
|
||||
<file>../images/yellowicon.png</file>
|
||||
<file>../images/addressbook.png</file>
|
||||
<file>../images/blacklist.png</file>
|
||||
<file>../images/identities.png</file>
|
||||
<file>../images/networkstatus.png</file>
|
||||
<file>../images/sent.png</file>
|
||||
<file>../images/subscriptions.png</file>
|
||||
<file>../images/send.png</file>
|
||||
<file>../images/inbox.png</file>
|
||||
</qresource>
|
||||
</RCC>
|
||||
|
|
|
|||
|
|
@ -2,8 +2,8 @@
|
|||
|
||||
# Form implementation generated from reading ui file 'bitmessageui.ui'
|
||||
#
|
||||
# Created: Fri Jul 12 04:40:47 2013
|
||||
# by: PyQt4 UI code generator 4.10
|
||||
# Created: Sat Jul 13 20:23:44 2013
|
||||
# by: PyQt4 UI code generator 4.10.2
|
||||
#
|
||||
# WARNING! All changes made in this file will be lost!
|
||||
|
||||
|
|
@ -422,7 +422,7 @@ class Ui_MainWindow(object):
|
|||
self.gridLayout.addWidget(self.tabWidget, 0, 0, 1, 1)
|
||||
MainWindow.setCentralWidget(self.centralwidget)
|
||||
self.menubar = QtGui.QMenuBar(MainWindow)
|
||||
self.menubar.setGeometry(QtCore.QRect(0, 0, 795, 25))
|
||||
self.menubar.setGeometry(QtCore.QRect(0, 0, 795, 18))
|
||||
self.menubar.setObjectName(_fromUtf8("menubar"))
|
||||
self.menuFile = QtGui.QMenu(self.menubar)
|
||||
self.menuFile.setObjectName(_fromUtf8("menuFile"))
|
||||
|
|
@ -497,6 +497,7 @@ class Ui_MainWindow(object):
|
|||
|
||||
def retranslateUi(self, MainWindow):
|
||||
MainWindow.setWindowTitle(_translate("MainWindow", "Bitmessage", None))
|
||||
self.inboxSearchLineEdit.setPlaceholderText(_translate("MainWindow", "Search", None))
|
||||
self.inboxSearchOptionCB.setItemText(0, _translate("MainWindow", "All", None))
|
||||
self.inboxSearchOptionCB.setItemText(1, _translate("MainWindow", "To", None))
|
||||
self.inboxSearchOptionCB.setItemText(2, _translate("MainWindow", "From", None))
|
||||
|
|
@ -519,14 +520,15 @@ 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"
|
||||
"<html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">\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"
|
||||
"<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))
|
||||
"</style></head><body style=\" font-family:\'MS Shell Dlg 2\'; 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;\"><br /></p></body></html>", None))
|
||||
self.label.setText(_translate("MainWindow", "To:", None))
|
||||
self.label_2.setText(_translate("MainWindow", "From:", None))
|
||||
self.radioButtonBroadcast.setText(_translate("MainWindow", "Broadcast to everyone who is subscribed to your address", None))
|
||||
self.pushButtonSend.setText(_translate("MainWindow", "Send", None))
|
||||
self.labelSendBroadcastWarning.setText(_translate("MainWindow", "Be aware that broadcasts are only encrypted with your address. Anyone who knows your address can read them.", None))
|
||||
self.tabWidget.setTabText(self.tabWidget.indexOf(self.send), _translate("MainWindow", "Send", None))
|
||||
self.sentSearchLineEdit.setPlaceholderText(_translate("MainWindow", "Search", None))
|
||||
self.sentSearchOptionCB.setItemText(0, _translate("MainWindow", "All", None))
|
||||
self.sentSearchOptionCB.setItemText(1, _translate("MainWindow", "To", None))
|
||||
self.sentSearchOptionCB.setItemText(2, _translate("MainWindow", "From", None))
|
||||
|
|
@ -599,13 +601,3 @@ class Ui_MainWindow(object):
|
|||
self.actionDeleteAllTrashedMessages.setText(_translate("MainWindow", "Delete all trashed messages", None))
|
||||
|
||||
import bitmessage_icons_rc
|
||||
|
||||
if __name__ == "__main__":
|
||||
import sys
|
||||
app = QtGui.QApplication(sys.argv)
|
||||
MainWindow = QtGui.QMainWindow()
|
||||
ui = Ui_MainWindow()
|
||||
ui.setupUi(MainWindow)
|
||||
MainWindow.show()
|
||||
sys.exit(app.exec_())
|
||||
|
||||
|
|
|
|||
|
|
@ -22,16 +22,7 @@
|
|||
</property>
|
||||
<widget class="QWidget" name="centralwidget">
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<property name="leftMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="topMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="rightMargin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<property name="bottomMargin">
|
||||
<property name="margin">
|
||||
<number>0</number>
|
||||
</property>
|
||||
<item row="0" column="0">
|
||||
|
|
@ -83,7 +74,11 @@
|
|||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="inboxSearchLineEdit"/>
|
||||
<widget class="QLineEdit" name="inboxSearchLineEdit">
|
||||
<property name="placeholderText">
|
||||
<string>Search</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QComboBox" name="inboxSearchOptionCB">
|
||||
|
|
@ -262,8 +257,8 @@
|
|||
<string><!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;">
|
||||
<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></string>
|
||||
</style></head><body style=" font-family:'MS Shell Dlg 2'; 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;"><br /></p></body></html></string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
|
|
@ -364,7 +359,11 @@ p, li { white-space: pre-wrap; }
|
|||
<number>0</number>
|
||||
</property>
|
||||
<item>
|
||||
<widget class="QLineEdit" name="sentSearchLineEdit"/>
|
||||
<widget class="QLineEdit" name="sentSearchLineEdit">
|
||||
<property name="placeholderText">
|
||||
<string>Search</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QComboBox" name="sentSearchOptionCB">
|
||||
|
|
@ -1012,7 +1011,7 @@ p, li { white-space: pre-wrap; }
|
|||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>795</width>
|
||||
<height>25</height>
|
||||
<height>18</height>
|
||||
</rect>
|
||||
</property>
|
||||
<widget class="QMenu" name="menuFile">
|
||||
|
|
|
|||
Reference in New Issue
Block a user