From bc183adff5c8fe7588bf7d45d8746dfb8f7ab48c Mon Sep 17 00:00:00 2001 From: Dmitri Bogomolov <4glitch@gmail.com> Date: Wed, 7 Nov 2018 18:28:42 +0200 Subject: [PATCH] Added splitters --- src/bitmessageqt/bitmessageui.ui | 552 +++++++++++++++---------------- src/bitmessageqt/main.py | 39 +++ 2 files changed, 313 insertions(+), 278 deletions(-) diff --git a/src/bitmessageqt/bitmessageui.ui b/src/bitmessageqt/bitmessageui.ui index 515de98b..360bbadf 100644 --- a/src/bitmessageqt/bitmessageui.ui +++ b/src/bitmessageqt/bitmessageui.ui @@ -21,8 +21,8 @@ QTabWidget::Rounded - - + + @@ -64,173 +64,167 @@ Messages - - - - - - - - - - 200 - 16777215 - - - - - Identities - - - - :/newPrefix/images/identities.png - - - - - - - - - - 200 - 16777215 - - + + + + + Qt::Horizontal + + + + Qt::Vertical + + + + + 200 + 16777215 + + + + + Identities + + + + :/newPrefix/images/identities.png + + + + + + + + 200 + 16777215 + + + + New Indentitiy + + + + + + Qt::Vertical + + + + + + + Search + + + + + + - New Indentitiy + All - - - - - - - - - - 0 + + + + To - - - - Search - - - - - - - - All - - - - - To - - - - - From - - - - - Subject - - - - - Message - - - - - - - - - - QAbstractItemView::NoEditTriggers + + + + From - - true + + + + Subject - - QAbstractItemView::ExtendedSelection + + + + Message - - QAbstractItemView::SelectRows - - - true - - - false - - - true - - - 200 - - - false - - - 27 - - - false - - - true - - - false - - - 26 - - - - To - - - - - From - - - - - Subject - - - - - Received - - - - - - - - - 0 - 500 - - - - true - - - - - - + + + + + + + + QAbstractItemView::NoEditTriggers + + + true + + + QAbstractItemView::ExtendedSelection + + + QAbstractItemView::SelectRows + + + true + + + false + + + true + + + 200 + + + false + + + 27 + + + false + + + true + + + false + + + 26 + + + + To + + + + + From + + + + + Subject + + + + + Received + + + + + + + 0 + 500 + + + + true + + + + @@ -242,12 +236,16 @@ Send - - - - - - + + + + + Qt::Horizontal + + + + Qt::Vertical + @@ -298,8 +296,6 @@ - - @@ -311,8 +307,6 @@ Add Contact - - @@ -329,15 +323,14 @@ Fetch Namecoin ID - - - - - - + + + + Qt::Vertical + - 1 + 0 @@ -464,9 +457,9 @@ p, li { white-space: pre-wrap; } - - - + + + @@ -601,14 +594,12 @@ p, li { white-space: pre-wrap; } - - - - - + + + + - @@ -618,12 +609,16 @@ p, li { white-space: pre-wrap; } Subscriptions - - - - - - + + + + + Qt::Horizontal + + + + Qt::Vertical + @@ -651,8 +646,6 @@ p, li { white-space: pre-wrap; } - - @@ -664,52 +657,51 @@ p, li { white-space: pre-wrap; } Add new Subscription - - - - - - - - - - - Search - - - - - - - - All - - - - - To - - - - - From - - - - - Subject - - - - - Message - - - - - - - + + + + Qt::Vertical + + + + + + + Search + + + + + + + + All + + + + + To + + + + + From + + + + + Subject + + + + + Message + + + + + + QAbstractItemView::NoEditTriggers @@ -774,8 +766,6 @@ p, li { white-space: pre-wrap; } - - @@ -787,14 +777,12 @@ p, li { white-space: pre-wrap; } true - - - - + + - + :/newPrefix/images/can-icon-16px.png:/newPrefix/images/can-icon-16px.png @@ -802,12 +790,16 @@ p, li { white-space: pre-wrap; } Chans - - - - - - + + + + + Qt::Horizontal + + + + Qt::Vertical + @@ -841,8 +833,6 @@ p, li { white-space: pre-wrap; } - - @@ -854,21 +844,21 @@ p, li { white-space: pre-wrap; } Add Chan - - - - - - - - + + + + Qt::Vertical + + + + Search - - + + @@ -896,10 +886,9 @@ p, li { white-space: pre-wrap; } - - - - + + + QAbstractItemView::NoEditTriggers @@ -964,8 +953,6 @@ p, li { white-space: pre-wrap; } - - @@ -977,10 +964,8 @@ p, li { white-space: pre-wrap; } true - - - - + + @@ -1177,11 +1162,22 @@ p, li { white-space: pre-wrap; } QTableWidget
bitmessageqt.settingsmixin
+ + SSplitter + QSplitter +
bitmessageqt.settingsmixin
+ 1 + MessageCompose QTextEdit
bitmessageqt.messagecompose
 + + MessagelistControl + SSplitter +
bitmessageqt.messagelist
+ tableWidgetInbox diff --git a/src/bitmessageqt/main.py b/src/bitmessageqt/main.py index 61ef2388..14189b62 100644 --- a/src/bitmessageqt/main.py +++ b/src/bitmessageqt/main.py @@ -23,6 +23,45 @@ class Window(settingsmixin.SMainWindow, RetranslateMixin): self.addressBookCompleter.setModel(self.addressBookCompleterModel) self.lineEditTo.setCompleter(self.addressBookCompleter) + # splitters + for splitter in ( + self.inboxHorizontalSplitter, + self.sendHorizontalSplitter, + self.subscriptionsHorizontalSplitter, + self.chansHorizontalSplitter + ): + splitter.setStretchFactor(0, 0) + splitter.setStretchFactor(1, 1) + splitter.setCollapsible(0, False) + splitter.setCollapsible(1, False) + + for splitter in ( + self.inboxIdentitiesSplitter, + self.sendIdentitiesSplitter, + self.subscriptionsIdentitiesSplitter, + self.chansIdentitiesSplitter + ): + splitter.setStretchFactor(0, 1) + splitter.setStretchFactor(1, 0) + splitter.setCollapsible(0, False) + splitter.setCollapsible(1, False) + splitter.handle(1).setEnabled(False) + + for splitter in ( + self.inboxMessagecontrolSplitter, + self.subscriptionsMessagecontrolSplitter, + self.chansMessagecontrolSplitter + ): + splitter.setStretchFactor(0, 0) + splitter.setStretchFactor(1, 1) + splitter.setStretchFactor(2, 2) + splitter.setCollapsible(0, False) + splitter.setCollapsible(1, False) + splitter.setCollapsible(2, False) + splitter.handle(1).setEnabled(False) + + self.sendMessagecontrolSplitter.handle(1).setEnabled(False) + def updateNetworkSwitchMenuLabel(self, dontconnect=None): """ Set the label for "Go online"/"Go offline" menu action