Skip to content

Commit

Permalink
Merge #634: Improve gui
Browse files Browse the repository at this point in the history 
fbb34a3 Improve gui (Giacomo Caironi)

Pull request description:

  This PR tries to improve the GUI look and usability:
  * Improve SignMessageDialog, GetXpubDialog, SignPsbtDialog and MainWindow widget size and spacing
  * Add buttons to import a psbt from a file and to export it after signing

ACKs for top commit:
  achow101:
    ACK fbb34a3

Tree-SHA512: 613f2d993dec96c7a1fb90e5234414aa9afe1bce93c3769460692e8659d2442928961e0baf5876eb3e0d68d9d56eb11e4d401acb18a08ce1c4f86adc66a72841
  • Loading branch information
@achow101
achow101 committed Nov 17, 2022
2 parents e94864b + fbb34a3 commit 857e935
Show file tree
Hide file tree
Showing 7 changed files with 986 additions and 794 deletions.
322 changes: 169 additions & 153 deletions hwilib/ui/displayaddressdialog.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,164 +6,180 @@
<rect>
<x>0</x>
<y>0</y>
<width>469</width>
<height>196</height>
<width>500</width>
<height>200</height>
</rect>
</property>
<property name="windowTitle">
<string>Dialog</string>
</property>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="geometry">
<rect>
<x>350</x>
<y>150</y>
<width>101</width>
<height>32</height>
</rect>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Close</set>
</property>
</widget>
<widget class="QLineEdit" name="path_lineedit">
<property name="geometry">
<rect>
<x>120</x>
<y>10</y>
<width>331</width>
<height>32</height>
</rect>
</property>
</widget>
<widget class="QLabel" name="label">
<property name="geometry">
<rect>
<x>10</x>
<y>20</y>
<width>111</width>
<height>18</height>
</rect>
</property>
<property name="text">
<string>Derivation Path</string>
</property>
</widget>
<widget class="QPushButton" name="go_button">
<property name="geometry">
<rect>
<x>410</x>
<y>50</y>
<width>41</width>
<height>41</height>
</rect>
</property>
<property name="text">
<string>Go</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget>
<widget class="QLabel" name="label_2">
<property name="geometry">
<rect>
<x>10</x>
<y>120</y>
<width>58</width>
<height>18</height>
</rect>
</property>
<property name="text">
<string>Address</string>
</property>
</widget>
<widget class="QLineEdit" name="address_lineedit">
<property name="geometry">
<rect>
<x>70</x>
<y>110</y>
<width>381</width>
<height>32</height>
</rect>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
<widget class="QGroupBox" name="type_groupbox">
<property name="geometry">
<rect>
<x>10</x>
<y>50</y>
<width>381</width>
<height>40</height>
</rect>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>30</height>
</size>
</property>
<property name="title">
<string/>
</property>
<widget class="QRadioButton" name="sh_wpkh_radio">
<property name="geometry">
<rect>
<x>10</x>
<y>10</y>
<width>121</width>
<height>22</height>
</rect>
</property>
<property name="text">
<string>P2SH-P2WPKH</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
<widget class="QRadioButton" name="wpkh_radio">
<property name="geometry">
<rect>
<x>150</x>
<y>10</y>
<width>91</width>
<height>22</height>
</rect>
</property>
<property name="text">
<string>P2WPKH</string>
</property>
</widget>
<widget class="QRadioButton" name="radioButton">
<property name="geometry">
<rect>
<x>260</x>
<y>10</y>
<width>105</width>
<height>22</height>
</rect>
</property>
<property name="text">
<string>P2PKH</string>
</property>
</widget>
</widget>
<layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
<number>10</number>
</property>
<property name="topMargin">
<number>10</number>
</property>
<property name="rightMargin">
<number>10</number>
</property>
<property name="bottomMargin">
<number>10</number>
</property>
<property name="spacing">
<number>10</number>
</property>
<item row="1" column="0" colspan="2">
<widget class="QGroupBox" name="type_groupbox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Minimum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>300</width>
<height>50</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>500</width>
<height>50</height>
</size>
</property>
<property name="title">
<string/>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="spacing">
<number>5</number>
</property>
<item>
<widget class="QRadioButton" name="sh_wpkh_radio">
<property name="text">
<string>P2SH-P2WPKH</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="wpkh_radio">
<property name="text">
<string>P2WPKH</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="radioButton">
<property name="text">
<string>P2PKH</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Address</string>
</property>
</widget>
</item>
<item row="2" column="1" colspan="2">
<widget class="QLineEdit" name="address_lineedit">
<property name="minimumSize">
<size>
<width>100</width>
<height>30</height>
</size>
</property>
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
<item row="0" column="1" colspan="2">
<widget class="QLineEdit" name="path_lineedit">
<property name="minimumSize">
<size>
<width>200</width>
<height>30</height>
</size>
</property>
</widget>
</item>
<item row="1" column="2" alignment="Qt::AlignHCenter">
<widget class="QPushButton" name="go_button">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>40</width>
<height>40</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>50</width>
<height>40</height>
</size>
</property>
<property name="text">
<string>Go</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="2">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="minimumSize">
<size>
<width>0</width>
<height>25</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>80</width>
<height>25</height>
</size>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Close</set>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label">
<property name="maximumSize">
<size>
<width>100</width>
<height>16777215</height>
</size>
</property>
<property name="text">
<string>Derivation Path</string>
</property>
</widget>
</item>
</layout>
</widget>
<resources/>
<connections>
Expand Down

0 comments on commit 857e935

Please sign in to comment.