diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index 8a4633b2..dab209e6 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -53,6 +53,7 @@ import state from network.asyncore_pollchoose import set_rates import sound import re +import bitmessage_icons_rc # Loads icon resources try: @@ -627,6 +628,9 @@ class MyForm(settingsmixin.SMainWindow): self.ui.horizontalSliderTTL.setMaximumSize(QtCore.QSize(105, self.ui.pushButtonSend.height())) + self.statusbar = self.statusBar() + self.statusbar.insertPermanentWidget(0, self.ui.rightStatusBar) + # Ask the user if we may delete their old version 1 addresses if they # have any. for addressInKeysFile in getSortedAccounts(): @@ -750,11 +754,8 @@ class MyForm(settingsmixin.SMainWindow): self.ui.blackwhitelist.rerenderBlackWhiteList() - # Put the colored icon on the status bar + # The coloured icon on the status bar - self.statusbar = self.statusBar() - - self.statusbar.insertPermanentWidget(0, self.ui.pushButtonStatusIcon) QtCore.QObject.connect(self.ui.pushButtonStatusIcon, QtCore.SIGNAL( "clicked()"), self.click_pushButtonStatusIcon) @@ -1843,6 +1844,13 @@ class MyForm(settingsmixin.SMainWindow): def updateWorkProverStatus(self, status): self.POWTasksCount = status.tasksCount + if status.speed == 0: + self.ui.workProverSpeed.setText("") + else: + self.ui.workProverSpeed.setText( + _translate("MainWindow", "%1 kiH / s").arg("{:.1f}".format(status.speed / 1024)) + ) + def rerenderMessagelistFromLabels(self): for messagelist in (self.ui.tableWidgetInbox, self.ui.tableWidgetInboxChans, self.ui.tableWidgetInboxSubscriptions): for i in range(messagelist.rowCount()): diff --git a/src/bitmessageqt/bitmessageui.ui b/src/bitmessageqt/bitmessageui.ui index 38bf8886..f43fdd6a 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 @@ -22,6 +22,42 @@ + + + + + 0 + + + 0 + + + 0 + + + + + + + + + + + + + + + + :/newPrefix/images/redicon.png:/newPrefix/images/redicon.png + + + true + + + + + + @@ -58,7 +94,7 @@ - + :/newPrefix/images/inbox.png:/newPrefix/images/inbox.png @@ -257,7 +293,7 @@ - + :/newPrefix/images/send.png:/newPrefix/images/send.png @@ -621,7 +657,7 @@ - + :/newPrefix/images/subscriptions.png:/newPrefix/images/subscriptions.png @@ -829,7 +865,7 @@ - + :/newPrefix/images/can-icon-16px.png:/newPrefix/images/can-icon-16px.png @@ -1043,7 +1079,7 @@ - + :/newPrefix/images/blacklist.png:/newPrefix/images/blacklist.png @@ -1052,7 +1088,7 @@ - + :/newPrefix/images/networkstatus.png:/newPrefix/images/networkstatus.png @@ -1061,20 +1097,6 @@ - - - - - - - - :/newPrefix/images/redicon.png:/newPrefix/images/redicon.png - - - true - - - @@ -1282,8 +1304,6 @@ textEditMessage pushButtonAddSubscription - - - + diff --git a/src/bitmessageqt/settings.ui b/src/bitmessageqt/settings.ui index 95282a96..996e98d7 100644 --- a/src/bitmessageqt/settings.ui +++ b/src/bitmessageqt/settings.ui @@ -998,9 +998,6 @@ checkBoxSocksListen buttonBox - - - buttonBox