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 +30 -52
2 changed files with 30 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d72dbbfd70 - Show all commits

70
src/bitmessageqt/bitmessageui.ui
View File

@ -70,17 +70,10 @@
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<widget class="SSplitter" name="inboxIdentitiesSplitter"> <widget class="QWidget" name="inboxIdentitiesWidget">
<property name="orientation"> <layout class="QVBoxLayout">
<enum>Qt::Vertical</enum> <item>
</property>
<widget class="STreeWidget" name="treeWidgetYourIdentities"> <widget class="STreeWidget" name="treeWidgetYourIdentities">
<property name="maximumSize">
<size>
<width>200</width>
<height>16777215</height>
</size>
</property>
<column> <column>
<property name="text"> <property name="text">
<string>Identities</string> <string>Identities</string>
@ -92,6 +85,8 @@
</property> </property>
</column> </column>
</widget> </widget>
</item>
<item>
<widget class="QPushButton" name="pushButtonNewAddress"> <widget class="QPushButton" name="pushButtonNewAddress">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
@ -103,6 +98,8 @@
<string>New Indentitiy</string> <string>New Indentitiy</string>
</property> </property>
</widget> </widget>
</item>
</layout>
</widget> </widget>
<widget class="SSplitter" name="inboxMessagecontrolSplitter"> <widget class="SSplitter" name="inboxMessagecontrolSplitter">
<property name="orientation"> <property name="orientation">
@ -242,17 +239,10 @@
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<widget class="SSplitter" name="sendIdentitiesSplitter"> <widget class="QWidget" name="sendIdentitiesWidget">
<property name="orientation"> <layout class="QVBoxLayout">
<enum>Qt::Vertical</enum> <item>
</property>
<widget class="STableWidget" name="tableWidgetAddressBook"> <widget class="STableWidget" name="tableWidgetAddressBook">
<property name="maximumSize">
<size>
<width>200</width>
<height>16777215</height>
</size>
</property>
<property name="alternatingRowColors"> <property name="alternatingRowColors">
<bool>true</bool> <bool>true</bool>
</property> </property>
@ -296,6 +286,8 @@
</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>
@ -307,6 +299,8 @@
<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>
@ -323,6 +317,8 @@
<string>Fetch Namecoin ID</string> <string>Fetch Namecoin ID</string>
</property> </property>
</widget> </widget>
</item>
</layout>
</widget> </widget>
<widget class="SSplitter" name="sendMessagecontrolSplitter"> <widget class="SSplitter" name="sendMessagecontrolSplitter">
<property name="orientation"> <property name="orientation">
@ -615,17 +611,10 @@ p, li { white-space: pre-wrap; }
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<widget class="SSplitter" name="subscriptionsIdentitiesSplitter"> <widget class="QWidget" name="subscriptionsIdentitiesWidget">
<property name="orientation"> <layout class="QVBoxLayout">
<enum>Qt::Vertical</enum> <item>
</property>
<widget class="STreeWidget" name="treeWidgetSubscriptions"> <widget class="STreeWidget" name="treeWidgetSubscriptions">
<property name="maximumSize">
<size>
<width>200</width>
<height>16777215</height>
</size>
</property>
<property name="alternatingRowColors"> <property name="alternatingRowColors">
<bool>true</bool> <bool>true</bool>
</property> </property>
@ -646,6 +635,8 @@ 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>
@ -657,6 +648,8 @@ p, li { white-space: pre-wrap; }
<string>Add new Subscription</string> <string>Add new Subscription</string>
</property> </property>
</widget> </widget>
</item>
</layout>
</widget> </widget>
<widget class="SSplitter" name="subscriptionsMessagecontrolSplitter"> <widget class="SSplitter" name="subscriptionsMessagecontrolSplitter">
<property name="orientation"> <property name="orientation">
@ -796,17 +789,10 @@ p, li { white-space: pre-wrap; }
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<widget class="SSplitter" name="chansIdentitiesSplitter"> <widget class="QWidget" name="chansIdentitiesWidget">
<property name="orientation"> <layout class="QVBoxLayout">
<enum>Qt::Vertical</enum> <item>
</property>
<widget class="QTreeWidget" name="treeWidgetChans"> <widget class="QTreeWidget" name="treeWidgetChans">
<property name="maximumSize">
<size>
<width>200</width>
<height>16777215</height>
</size>
</property>
<property name="frameShadow"> <property name="frameShadow">
<enum>QFrame::Sunken</enum> <enum>QFrame::Sunken</enum>
</property> </property>
@ -833,6 +819,8 @@ 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>
@ -844,6 +832,8 @@ p, li { white-space: pre-wrap; }
<string>Add Chan</string> <string>Add Chan</string>
</property> </property>
</widget> </widget>
</item>
</layout>
</widget> </widget>
<widget class="SSplitter" name="chansMessagecontrolSplitter"> <widget class="SSplitter" name="chansMessagecontrolSplitter">
<property name="orientation"> <property name="orientation">

12
src/bitmessageqt/main.py
View File

@ -35,18 +35,6 @@ class Window(settingsmixin.SMainWindow, RetranslateMixin):
splitter.setCollapsible(0, False) splitter.setCollapsible(0, False)
splitter.setCollapsible(1, 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 ( for splitter in (
self.inboxMessagecontrolSplitter, self.inboxMessagecontrolSplitter,
self.subscriptionsMessagecontrolSplitter, self.subscriptionsMessagecontrolSplitter,