From 1e640b3135bc891fd11baf44fcdad3021c534923 Mon Sep 17 00:00:00 2001 From: Dmitri Bogomolov <4glitch@gmail.com> Date: Mon, 5 Nov 2018 16:57:00 +0200 Subject: [PATCH] bitmessageui.ui: added all cusom widgets except for SSplitter --- src/bitmessageqt/__init__.py | 6 +- src/bitmessageqt/bitmessageui.ui | 412 ++++++------------------------- 2 files changed, 82 insertions(+), 336 deletions(-) diff --git a/src/bitmessageqt/__init__.py b/src/bitmessageqt/__init__.py index eb140fb9..cb3e9147 100644 --- a/src/bitmessageqt/__init__.py +++ b/src/bitmessageqt/__init__.py @@ -2240,7 +2240,7 @@ class MyForm(settingsmixin.SMainWindow): )) def click_pushButtonFetchNamecoinID(self): - identities = str(self.ui.lineEditTo.text().toUtf8()).split(";") + identities = str(self.lineEditTo.text().toUtf8()).split(";") err, addr = self.namecoin.query(identities[-1].strip()) if err is not None: self.updateStatusBar( @@ -4096,9 +4096,9 @@ class MyForm(settingsmixin.SMainWindow): logger.warning( 'There was a problem testing for a Namecoin daemon.' ' Hiding the Fetch Namecoin ID button') - self.ui.pushButtonFetchNamecoinID.hide() + self.pushButtonFetchNamecoinID.hide() else: - self.ui.pushButtonFetchNamecoinID.show() + self.pushButtonFetchNamecoinID.show() def initSettings(self): self.loadSettings() diff --git a/src/bitmessageqt/bitmessageui.ui b/src/bitmessageqt/bitmessageui.ui index fef40be6..515de98b 100644 --- a/src/bitmessageqt/bitmessageui.ui +++ b/src/bitmessageqt/bitmessageui.ui @@ -70,7 +70,7 @@ - + 200 @@ -150,7 +150,7 @@ - + QAbstractItemView::NoEditTriggers @@ -216,7 +216,7 @@ - + 0 @@ -248,7 +248,7 @@ - + 200 @@ -337,9 +337,9 @@ - 0 + 1 - + Send ordinary Message @@ -392,12 +392,12 @@ - + <!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:'Droid Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +</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> @@ -406,7 +406,7 @@ p, li { white-space: pre-wrap; } - + Send Message to your Subscribers @@ -449,12 +449,12 @@ p, li { white-space: pre-wrap; } - + <!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:'Droid Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +</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> @@ -581,7 +581,14 @@ p, li { white-space: pre-wrap; } - + + + + Clear + + + + @@ -617,7 +624,7 @@ p, li { white-space: pre-wrap; } - + 200 @@ -703,7 +710,7 @@ p, li { white-space: pre-wrap; } - + QAbstractItemView::NoEditTriggers @@ -769,7 +776,7 @@ p, li { white-space: pre-wrap; } - + 0 @@ -893,7 +900,7 @@ p, li { white-space: pre-wrap; } - + QAbstractItemView::NoEditTriggers @@ -959,7 +966,7 @@ p, li { white-space: pre-wrap; } - + 0 @@ -977,7 +984,7 @@ p, li { white-space: pre-wrap; } - + :/newPrefix/images/blacklist.png:/newPrefix/images/blacklist.png @@ -985,91 +992,8 @@ p, li { white-space: pre-wrap; } Blacklist - - - - - Use a Blacklist (Allow all incoming messages except those on the Blacklist) - - - true - - - - - - - Use a Whitelist (Block all incoming messages except those on the Whitelist) - - - - - - - Add new entry - - - - - - - Qt::Horizontal - - - - 689 - 20 - - - - - - - - true - - - QAbstractItemView::SingleSelection - - - QAbstractItemView::SelectRows - - - true - - - true - - - 400 - - - false - - - false - - - true - - - false - - - - Name or Label - - - - - Address - - - - - - + :/newPrefix/images/networkstatus.png:/newPrefix/images/networkstatus.png @@ -1077,214 +1001,6 @@ p, li { white-space: pre-wrap; } Network Status - - - - 680 - 440 - 21 - 23 - - - - - - - - :/newPrefix/images/redicon.png:/newPrefix/images/redicon.png - - - true - - - - - - 20 - 70 - 241 - 241 - - - - - - - - - 212 - 208 - 200 - - - - - - - - - 212 - 208 - 200 - - - - - - - - - 212 - 208 - 200 - - - - - - - - QFrame::Box - - - QFrame::Plain - - - false - - - true - - - QAbstractItemView::NoSelection - - - true - - - false - - - true - - - false - - - - Stream # - - - - - Connections - - - - - - - 20 - 30 - 401 - 16 - - - - Total connections: - - - - - - 320 - 110 - 331 - 20 - - - - Since startup: - - - - - - 350 - 130 - 361 - 16 - - - - Processed 0 person-to-person messages. - - - - - - 350 - 170 - 331 - 16 - - - - Processed 0 public keys. - - - - - - 350 - 150 - 351 - 16 - - - - Processed 0 broadcasts. - - - - - - 320 - 250 - 291 - 16 - - - - Inventory lookups per second: 0 - - - - - - 350 - 210 - 251 - 16 - - - - Down: 0 KB/s - - - - - - 350 - 230 - 251 - 16 - - - - Up: 0 KB/s - - @@ -1296,7 +1012,7 @@ p, li { white-space: pre-wrap; } 0 0 885 - 27 + 22 @@ -1306,6 +1022,7 @@ p, li { white-space: pre-wrap; } + @@ -1319,6 +1036,7 @@ p, li { white-space: pre-wrap; } Help + @@ -1347,8 +1065,7 @@ p, li { white-space: pre-wrap; } - - + .. Manage keys @@ -1357,8 +1074,7 @@ p, li { white-space: pre-wrap; } - - + .. Quit @@ -1370,8 +1086,7 @@ p, li { white-space: pre-wrap; } - - + .. Help @@ -1383,8 +1098,7 @@ p, li { white-space: pre-wrap; } - - + .. About @@ -1393,8 +1107,7 @@ p, li { white-space: pre-wrap; } - - + .. Settings @@ -1403,8 +1116,7 @@ p, li { white-space: pre-wrap; } - - + .. Regenerate deterministic addresses @@ -1413,8 +1125,7 @@ p, li { white-space: pre-wrap; } - - + .. Delete all trashed messages @@ -1423,14 +1134,55 @@ p, li { white-space: pre-wrap; } - - + .. Join / Create chan + + + Contact Support + + + + + Go offline + + + + + Blacklist + QWidget +
bitmessageqt.blacklist
+ + + NetworkStatus + QWidget +
bitmessageqt.networkstatus
+ + + MessageView + QTextEdit +
bitmessageqt.messageview
+ + + STreeWidget + QTreeWidget +
bitmessageqt.settingsmixin
+ + + STableWidget + QTableWidget +
bitmessageqt.settingsmixin
+ + + MessageCompose + QTextEdit +
bitmessageqt.messagecompose
+ + tableWidgetInbox textEditInboxMessage @@ -1440,12 +1192,6 @@ p, li { white-space: pre-wrap; } textEditMessage pushButtonSend pushButtonAddSubscription - radioButtonBlacklist - radioButtonWhitelist - pushButtonAddBlacklist - tableWidgetBlacklist - tableWidgetConnectionCount - pushButtonStatusIcon