Bitmessage/PyBitmessage-2024-12-10
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

UI refactoring, part 2 #1394

Open
g1itch wants to merge 14 commits from g1itch/ui-refactoring into v0.6
pull from: g1itch/ui-refactoring
merge into: Bitmessage:v0.6
Conversation 5 Commits 14 Files Changed 15 +313 -278
2 changed files with 313 additions and 278 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit bc183adff5 - Show all commits

552
src/bitmessageqt/bitmessageui.ui
View File

@ -21,8 +21,8 @@
<enum>QTabWidget::Rounded</enum> <enum>QTabWidget::Rounded</enum>
</property> </property>
<widget class="QWidget" name="centralwidget"> <widget class="QWidget" name="centralwidget">
<layout class="QGridLayout" name="gridLayout_10"> <layout class="QVBoxLayout">
<item row="0" column="0"> <item>
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@ -64,173 +64,167 @@
<attribute name="title"> <attribute name="title">
<string>Messages</string> <string>Messages</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout"> <layout class="QVBoxLayout" name="inboxLayout">
<item row="0" column="0"> <item>
<layout class="QHBoxLayout" name="horizontalLayout_3"> <widget class="SSplitter" name="inboxHorizontalSplitter">
<item> <property name="orientation">
<layout class="QVBoxLayout" name="verticalLayout_12"> <enum>Qt::Horizontal</enum>
<item> </property>
<widget class="STreeWidget" name="treeWidgetYourIdentities"> <widget class="SSplitter" name="inboxIdentitiesSplitter">
<property name="maximumSize"> <property name="orientation">
<size> <enum>Qt::Vertical</enum>
<width>200</width> </property>
<height>16777215</height> <widget class="STreeWidget" name="treeWidgetYourIdentities">
</size> <property name="maximumSize">
</property> <size>
<column> <width>200</width>
<property name="text"> <height>16777215</height>
<string>Identities</string> </size>
</property> </property>
<property name="icon"> <column>
<iconset> <property name="text">
<selectedoff>:/newPrefix/images/identities.png</selectedoff> <string>Identities</string>
</iconset> </property>
</property> <property name="icon">
</column> <iconset>
</widget> <selectedoff>:/newPrefix/images/identities.png</selectedoff>
</item> </iconset>
<item> </property>
<widget class="QPushButton" name="pushButtonNewAddress"> </column>
<property name="maximumSize"> </widget>
<size> <widget class="QPushButton" name="pushButtonNewAddress">
<width>200</width> <property name="maximumSize">
<height>16777215</height> <size>
</size> <width>200</width>
</property> <height>16777215</height>
</size>
</property>
<property name="text">
<string>New Indentitiy</string>
</property>
</widget>
</widget>
<widget class="SSplitter" name="inboxMessagecontrolSplitter">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<widget class="QWidget" name="searchWidget">
<layout class="QHBoxLayout" name="searchLayout">
<item>
<widget class="QLineEdit" name="inboxSearchLineEdit">
<property name="placeholderText">
<string>Search</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="inboxSearchOption">
<item>
<property name="text"> <property name="text">
<string>New Indentitiy</string> <string>All</string>
</property> </property>
</widget> </item>
</item> <item>
</layout> <property name="text">
</item> <string>To</string>
<item>
<layout class="QVBoxLayout" name="verticalLayout_7">
<item>
<layout class="QHBoxLayout" name="horizontalLayoutSearch">
<property name="topMargin">
<number>0</number>
</property> </property>
<item> </item>
<widget class="QLineEdit" name="inboxSearchLineEdit"> <item>
<property name="placeholderText"> <property name="text">
<string>Search</string> <string>From</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="inboxSearchOption">
<item>
<property name="text">
<string>All</string>
</property>
</item>
<item>
<property name="text">
<string>To</string>
</property>
</item>
<item>
<property name="text">
<string>From</string>
</property>
</item>
<item>
<property name="text">
<string>Subject</string>
</property>
</item>
<item>
<property name="text">
<string>Message</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
<item>
<widget class="STableWidget" name="tableWidgetInbox">
<property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set>
</property> </property>
<property name="alternatingRowColors"> </item>
<bool>true</bool> <item>
<property name="text">
<string>Subject</string>
</property> </property>
<property name="selectionMode"> </item>
<enum>QAbstractItemView::ExtendedSelection</enum> <item>
<property name="text">
<string>Message</string>
</property> </property>
<property name="selectionBehavior"> </item>
<enum>QAbstractItemView::SelectRows</enum> </widget>
</property> </item>
<property name="sortingEnabled"> </layout>
<bool>true</bool> </widget>
</property> <widget class="STableWidget" name="tableWidgetInbox">
<property name="wordWrap"> <property name="editTriggers">
<bool>false</bool> <set>QAbstractItemView::NoEditTriggers</set>
</property> </property>
<attribute name="horizontalHeaderCascadingSectionResizes"> <property name="alternatingRowColors">
<bool>true</bool> <bool>true</bool>
</attribute> </property>
<attribute name="horizontalHeaderDefaultSectionSize"> <property name="selectionMode">
<number>200</number> <enum>QAbstractItemView::ExtendedSelection</enum>
</attribute> </property>
<attribute name="horizontalHeaderHighlightSections"> <property name="selectionBehavior">
<bool>false</bool> <enum>QAbstractItemView::SelectRows</enum>
</attribute> </property>
<attribute name="horizontalHeaderMinimumSectionSize"> <property name="sortingEnabled">
<number>27</number> <bool>true</bool>
</attribute> </property>
<attribute name="horizontalHeaderShowSortIndicator" stdset="0"> <property name="wordWrap">
<bool>false</bool> <bool>false</bool>
</attribute> </property>
<attribute name="horizontalHeaderStretchLastSection"> <attribute name="horizontalHeaderCascadingSectionResizes">
<bool>true</bool> <bool>true</bool>
</attribute> </attribute>
<attribute name="verticalHeaderVisible"> <attribute name="horizontalHeaderDefaultSectionSize">
<bool>false</bool> <number>200</number>
</attribute> </attribute>
<attribute name="verticalHeaderDefaultSectionSize"> <attribute name="horizontalHeaderHighlightSections">
<number>26</number> <bool>false</bool>
</attribute> </attribute>
<column> <attribute name="horizontalHeaderMinimumSectionSize">
<property name="text"> <number>27</number>
<string>To</string> </attribute>
</property> <attribute name="horizontalHeaderShowSortIndicator" stdset="0">
</column> <bool>false</bool>
<column> </attribute>
<property name="text"> <attribute name="horizontalHeaderStretchLastSection">
<string>From</string> <bool>true</bool>
</property> </attribute>
</column> <attribute name="verticalHeaderVisible">
<column> <bool>false</bool>
<property name="text"> </attribute>
<string>Subject</string> <attribute name="verticalHeaderDefaultSectionSize">
</property> <number>26</number>
</column> </attribute>
<column> <column>
<property name="text"> <property name="text">
<string>Received</string> <string>To</string>
</property> </property>
</column> </column>
</widget> <column>
</item> <property name="text">
<item> <string>From</string>
<widget class="MessageView" name="textEditInboxMessage"> </property>
<property name="baseSize"> </column>
<size> <column>
<width>0</width> <property name="text">
<height>500</height> <string>Subject</string>
</size> </property>
</property> </column>
<property name="readOnly"> <column>
<bool>true</bool> <property name="text">
</property> <string>Received</string>
</widget> </property>
</item> </column>
</layout> </widget>
</item> <widget class="MessageView" name="textEditInboxMessage">
</layout> <property name="baseSize">
<size>
<width>0</width>
<height>500</height>
</size>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</widget>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
@ -242,12 +236,16 @@
<attribute name="title"> <attribute name="title">
<string>Send</string> <string>Send</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_7"> <layout class="QVBoxLayout" name="sendLayout">
<item row="0" column="0"> <item>
<layout class="QHBoxLayout" name="horizontalLayout"> <widget class="SSplitter" name="sendHorizontalSplitter">
<item> <property name="orientation">
<layout class="QVBoxLayout" name="verticalLayout_2"> <enum>Qt::Horizontal</enum>
<item> </property>
<widget class="SSplitter" name="sendIdentitiesSplitter">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<widget class="STableWidget" name="tableWidgetAddressBook"> <widget class="STableWidget" name="tableWidgetAddressBook">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
@ -298,8 +296,6 @@
</property> </property>
</column> </column>
</widget> </widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonAddAddressBook"> <widget class="QPushButton" name="pushButtonAddAddressBook">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
@ -311,8 +307,6 @@
<string>Add Contact</string> <string>Add Contact</string>
</property> </property>
</widget> </widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonFetchNamecoinID"> <widget class="QPushButton" name="pushButtonFetchNamecoinID">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
@ -329,15 +323,14 @@
<string>Fetch Namecoin ID</string> <string>Fetch Namecoin ID</string>
</property> </property>
</widget> </widget>
</item> </widget>
</layout> <widget class="SSplitter" name="sendMessagecontrolSplitter">
</item> <property name="orientation">
<item> <enum>Qt::Vertical</enum>
<layout class="QVBoxLayout" name="verticalLayout"> </property>
<item>
<widget class="QTabWidget" name="tabWidgetSend"> <widget class="QTabWidget" name="tabWidgetSend">
<property name="currentIndex"> <property name="currentIndex">
<number>1</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="sendDirect"> <widget class="QWidget" name="sendDirect">
<attribute name="title"> <attribute name="title">
@ -464,9 +457,9 @@ p, li { white-space: pre-wrap; }
</layout> </layout>
</widget> </widget>
</widget> </widget>
</item>
<item> <widget class="QWidget" name="sendControlsContainer">
<layout class="QHBoxLayout" name="horizontalLayout_5"> <layout class="QHBoxLayout" name="sendControlsLayout">
<item> <item>
<widget class="QPushButton" name="pushButtonTTL"> <widget class="QPushButton" name="pushButtonTTL">
<property name="sizePolicy"> <property name="sizePolicy">
@ -601,14 +594,12 @@ p, li { white-space: pre-wrap; }
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </widget>
</layout> </widget>
</item> </widget>
</layout>
</item> </item>
</layout> </layout>
<zorder></zorder>
</widget> </widget>
<widget class="QWidget" name="subscriptions"> <widget class="QWidget" name="subscriptions">
<attribute name="icon"> <attribute name="icon">
@ -618,12 +609,16 @@ p, li { white-space: pre-wrap; }
<attribute name="title"> <attribute name="title">
<string>Subscriptions</string> <string>Subscriptions</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_3"> <layout class="QVBoxLayout">
<item row="0" column="0"> <item>
<layout class="QHBoxLayout" name="horizontalLayout_4"> <widget class="SSplitter" name="subscriptionsHorizontalSplitter">
<item> <property name="orientation">
<layout class="QVBoxLayout" name="verticalLayout_3"> <enum>Qt::Horizontal</enum>
<item> </property>
<widget class="SSplitter" name="subscriptionsIdentitiesSplitter">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<widget class="STreeWidget" name="treeWidgetSubscriptions"> <widget class="STreeWidget" name="treeWidgetSubscriptions">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
@ -651,8 +646,6 @@ p, li { white-space: pre-wrap; }
</property> </property>
</column> </column>
</widget> </widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonAddSubscription"> <widget class="QPushButton" name="pushButtonAddSubscription">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
@ -664,52 +657,51 @@ p, li { white-space: pre-wrap; }
<string>Add new Subscription</string> <string>Add new Subscription</string>
</property> </property>
</widget> </widget>
</item> </widget>
</layout> <widget class="SSplitter" name="subscriptionsMessagecontrolSplitter">
</item> <property name="orientation">
<item> <enum>Qt::Vertical</enum>
<layout class="QVBoxLayout" name="verticalLayout_4"> </property>
<item> <widget class="QWidget" name="searchWidget">
<layout class="QHBoxLayout" name="horizontalLayout_2"> <layout class="QHBoxLayout" name="searchLayout">
<item> <item>
<widget class="QLineEdit" name="inboxSearchLineEditSubscriptions"> <widget class="QLineEdit" name="inboxSearchLineEditSubscriptions">
<property name="placeholderText"> <property name="placeholderText">
<string>Search</string> <string>Search</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QComboBox" name="inboxSearchOptionSubscriptions"> <widget class="QComboBox" name="inboxSearchOptionSubscriptions">
<item> <item>
<property name="text"> <property name="text">
<string>All</string> <string>All</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>To</string> <string>To</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>From</string> <string>From</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>Subject</string> <string>Subject</string>
</property> </property>
</item> </item>
<item> <item>
<property name="text"> <property name="text">
<string>Message</string> <string>Message</string>
</property> </property>
</item> </item>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </widget>
<item>
<widget class="STableWidget" name="tableWidgetInboxSubscriptions"> <widget class="STableWidget" name="tableWidgetInboxSubscriptions">
<property name="editTriggers"> <property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set> <set>QAbstractItemView::NoEditTriggers</set>
@ -774,8 +766,6 @@ p, li { white-space: pre-wrap; }
</property> </property>
</column> </column>
</widget> </widget>
</item>
<item>
<widget class="MessageView" name="textEditInboxMessageSubscriptions"> <widget class="MessageView" name="textEditInboxMessageSubscriptions">
<property name="baseSize"> <property name="baseSize">
<size> <size>
@ -787,14 +777,12 @@ p, li { white-space: pre-wrap; }
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </widget>
</layout> </widget>
</item>
</layout>
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="tab_3"> <widget class="QWidget" name="chans">
<attribute name="icon"> <attribute name="icon">
<iconset resource="bitmessage_icons.qrc"> <iconset resource="bitmessage_icons.qrc">
<normaloff>:/newPrefix/images/can-icon-16px.png</normaloff>:/newPrefix/images/can-icon-16px.png</iconset> <normaloff>:/newPrefix/images/can-icon-16px.png</normaloff>:/newPrefix/images/can-icon-16px.png</iconset>
@ -802,12 +790,16 @@ p, li { white-space: pre-wrap; }
<attribute name="title"> <attribute name="title">
<string>Chans</string> <string>Chans</string>
</attribute> </attribute>
<layout class="QGridLayout" name="gridLayout_4"> <layout class="QVBoxLayout" name="chansLayout">
<item row="0" column="0"> <item>
<layout class="QHBoxLayout" name="horizontalLayout_7"> <widget class="SSplitter" name="chansHorizontalSplitter">
<item> <property name="orientation">
<layout class="QVBoxLayout" name="verticalLayout_17"> <enum>Qt::Horizontal</enum>
<item> </property>
<widget class="SSplitter" name="chansIdentitiesSplitter">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<widget class="QTreeWidget" name="treeWidgetChans"> <widget class="QTreeWidget" name="treeWidgetChans">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
@ -841,8 +833,6 @@ p, li { white-space: pre-wrap; }
</property> </property>
</column> </column>
</widget> </widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonAddChan"> <widget class="QPushButton" name="pushButtonAddChan">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
@ -854,21 +844,21 @@ p, li { white-space: pre-wrap; }
<string>Add Chan</string> <string>Add Chan</string>
</property> </property>
</widget> </widget>
</item> </widget>
</layout> <widget class="SSplitter" name="chansMessagecontrolSplitter">
</item> <property name="orientation">
<item> <enum>Qt::Vertical</enum>
<layout class="QVBoxLayout" name="verticalLayout_8"> </property>
<item> <widget class="QWidget" name="searchWidget">
<layout class="QHBoxLayout" name="horizontalLayout_6"> <layout class="QHBoxLayout" name="searchLayout">
<item> <item>
<widget class="QLineEdit" name="inboxSearchLineEditChans"> <widget class="QLineEdit" name="inboxSearchLineEditChans">
<property name="placeholderText"> <property name="placeholderText">
<string>Search</string> <string>Search</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QComboBox" name="inboxSearchOptionChans"> <widget class="QComboBox" name="inboxSearchOptionChans">
<item> <item>
<property name="text"> <property name="text">
@ -896,10 +886,9 @@ p, li { white-space: pre-wrap; }
</property> </property>
</item> </item>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </widget>
<item>
<widget class="STableWidget" name="tableWidgetInboxChans"> <widget class="STableWidget" name="tableWidgetInboxChans">
<property name="editTriggers"> <property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set> <set>QAbstractItemView::NoEditTriggers</set>
@ -964,8 +953,6 @@ p, li { white-space: pre-wrap; }
</property> </property>
</column> </column>
</widget> </widget>
</item>
<item>
<widget class="MessageView" name="textEditInboxMessageChans"> <widget class="MessageView" name="textEditInboxMessageChans">
<property name="baseSize"> <property name="baseSize">
<size> <size>
@ -977,10 +964,8 @@ p, li { white-space: pre-wrap; }
<bool>true</bool> <bool>true</bool>
</property> </property>
</widget> </widget>
</item> </widget>
</layout> </widget>
</item>
</layout>
</item> </item>
</layout> </layout>
</widget> </widget>
@ -1177,11 +1162,22 @@ p, li { white-space: pre-wrap; }
<extends>QTableWidget</extends> <extends>QTableWidget</extends>
<header>bitmessageqt.settingsmixin</header> <header>bitmessageqt.settingsmixin</header>
</customwidget> </customwidget>
<customwidget>
<class>SSplitter</class>
<extends>QSplitter</extends>
<header>bitmessageqt.settingsmixin</header>
<container>1</container>
</customwidget>
<customwidget> <customwidget>
<class>MessageCompose</class> <class>MessageCompose</class>
<extends>QTextEdit</extends> <extends>QTextEdit</extends>
<header>bitmessageqt.messagecompose</header> <header>bitmessageqt.messagecompose</header>
</customwidget> </customwidget>
<customwidget>
<class>MessagelistControl</class>
<extends>SSplitter</extends>
<header>bitmessageqt.messagelist</header>
</customwidget>
</customwidgets> </customwidgets>
<tabstops> <tabstops>
<tabstop>tableWidgetInbox</tabstop> <tabstop>tableWidgetInbox</tabstop>

39
src/bitmessageqt/main.py
View File

@ -23,6 +23,45 @@ class Window(settingsmixin.SMainWindow, RetranslateMixin):
self.addressBookCompleter.setModel(self.addressBookCompleterModel) self.addressBookCompleter.setModel(self.addressBookCompleterModel)
self.lineEditTo.setCompleter(self.addressBookCompleter) 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): def updateNetworkSwitchMenuLabel(self, dontconnect=None):
""" """
Set the label for "Go online"/"Go offline" menu action Set the label for "Go online"/"Go offline" menu action