sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 12:32:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

partial Merge bitcoin-core/gui#171: Use layout manager for Create Wallet dialog

Browse Source 
d4feb6812a2707ef85d75dda4372086ec62eb922 qt: Use layout manager for Create Wallet dialog (Hennadii Stepanov)

Pull request description:

  On master (e75f91eae3936269b40b4bfdfe540d5526270936) not using layout manager causes problems with resizing:

  ![Screenshot from 2021-01-01 13-03-13](https://user-images.githubusercontent.com/32963518/103437728-ce1d4580-4c33-11eb-8915-1e9482775653.png)
  ![Screenshot from 2021-01-01 13-03-26](https://user-images.githubusercontent.com/32963518/103437730-d6758080-4c33-11eb-9e0f-87d0dd487fcb.png)

  Also text labels are not resized properly on some window managers (https://github.com/bitcoin/bitcoin/issues/20777), or if their lengths are changed (after translation).

  This PR introduces a standard layout manager for the "Create Wallet" dialog that fixes all layout issues (actually, the `createwalletdialog.ui` has been re-written from scratch):

  ![Screenshot from 2021-01-01 13-10-03](https://user-images.githubusercontent.com/32963518/103437822-d0cc6a80-4c34-11eb-84fd-fcb10a16d9ef.png)
  ![Screenshot from 2021-01-06 23-50-36](https://user-images.githubusercontent.com/32963518/103823090-0b416780-507a-11eb-89dd-3f48a358e168.png)

  Additional visual changes:
  - advanced options are grouped in `QGroupBox` (https://github.com/bitcoin-core/gui/pull/96#issuecomment-726337165)
  - enabled the [size grip](https://doc.qt.io/qt-5/qsizegrip.html#details)

  Fix https://github.com/bitcoin/bitcoin/issues/20777

ACKs for top commit:
  jarolrod:
    ACK d4feb6812a2707ef85d75dda4372086ec62eb922
  Sjors:
    re-tACK d4feb6812a2707ef85d75dda4372086ec62eb922
  promag:
    Tested ACK d4feb6812a2707ef85d75dda4372086ec62eb922 on macos.

Tree-SHA512: 4c055962e49f88624900b880b33a866976d224628784593428b712d2e94563d77ddefddea3397134d20e72f738a8cf9aa885c1272fd9ffc90213c104435fb9f4
This commit is contained in:
MarcoFalke 2021-01-21 18:51:10 +01:00 committed by PastaPastaPasta
parent 209a52fbe9
commit c22047e146
1 changed files with 115 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

210
src/qt/forms/createwalletdialog.ui
View File

@ -6,106 +6,126 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>364</width> <width>407</width>
<height>195</height> <height>348</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Create Wallet</string> <string>Create Wallet</string>
</property> </property>
<widget class="QDialogButtonBox" name="buttonBox"> <property name="sizeGripEnabled">
<property name="geometry"> <bool>true</bool>
<rect> </property>
<x>10</x> <layout class="QVBoxLayout" name="verticalLayout">
<y>140</y> <item>
<width>341</width> <layout class="QHBoxLayout" name="horizontalLayout">
<height>40</height> <item>
</rect> <widget class="QLabel" name="wallet_name_label">
</property> <property name="text">
<property name="orientation"> <string>Wallet Name</string>
<enum>Qt::Horizontal</enum> </property>
</property> </widget>
<property name="standardButtons"> </item>
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> <item>
</property> <widget class="QLineEdit" name="wallet_name_line_edit">
</widget> <property name="minimumSize">
<widget class="QLineEdit" name="wallet_name_line_edit"> <size>
<property name="geometry"> <width>262</width>
<rect> <height>0</height>
<x>120</x> </size>
<y>20</y> </property>
<width>231</width> <property name="placeholderText">
<height>24</height> <string>Wallet</string>
</rect> </property>
</property> </widget>
</widget> </item>
<widget class="QLabel" name="label"> </layout>
<property name="geometry"> </item>
<rect> <item>
<x>20</x> <widget class="QCheckBox" name="encrypt_wallet_checkbox">
<y>20</y> <property name="toolTip">
<width>101</width> <string>Encrypt the wallet. The wallet will be encrypted with a passphrase of your choice.</string>
<height>21</height> </property>
</rect> <property name="text">
</property> <string>Encrypt Wallet</string>
<property name="text"> </property>
<string>Wallet Name</string> <property name="checked">
</property> <bool>false</bool>
</widget> </property>
<widget class="QCheckBox" name="encrypt_wallet_checkbox"> </widget>
<property name="geometry"> </item>
<rect> <item>
<x>20</x> <spacer name="verticalSpacer_1">
<y>60</y> <property name="orientation">
<width>171</width> <enum>Qt::Vertical</enum>
<height>22</height> </property>
</rect> <property name="sizeType">
</property> <enum>QSizePolicy::Fixed</enum>
<property name="toolTip"> </property>
<string>Encrypt the wallet. The wallet will be encrypted with a passphrase of your choice.</string> <property name="sizeHint" stdset="0">
</property> <size>
<property name="text"> <width>20</width>
<string>Encrypt Wallet</string> <height>8</height>
</property> </size>
<property name="checked"> </property>
<bool>true</bool> </spacer>
</property> </item>
</widget> <item>
<widget class="QCheckBox" name="disable_privkeys_checkbox"> <widget class="QGroupBox" name="groupBox">
<property name="enabled"> <property name="title">
<bool>false</bool> <string>Advanced Options</string>
</property> </property>
<property name="geometry"> <layout class="QVBoxLayout" name="verticalLayout_groupbox">
<rect> <item>
<x>20</x> <widget class="QCheckBox" name="disable_privkeys_checkbox">
<y>90</y> <property name="enabled">
<width>171</width> <bool>true</bool>
<height>22</height> </property>
</rect> <property name="toolTip">
</property> <string>Disable private keys for this wallet. Wallets with private keys disabled will have no private keys and cannot have an HD seed or imported private keys. This is ideal for watch-only wallets.</string>
<property name="toolTip"> </property>
<string>Disable private keys for this wallet. Wallets with private keys disabled will have no private keys and cannot have an HD seed or imported private keys. This is ideal for watch-only wallets.</string> <property name="text">
</property> <string>Disable Private Keys</string>
<property name="text"> </property>
<string>Disable Private Keys</string> </widget>
</property> </item>
</widget> <item>
<widget class="QCheckBox" name="blank_wallet_checkbox"> <widget class="QCheckBox" name="blank_wallet_checkbox">
<property name="geometry"> <property name="toolTip">
<rect> <string>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</string>
<x>20</x> </property>
<y>120</y> <property name="text">
<width>171</width> <string>Make Blank Wallet</string>
<height>22</height> </property>
</rect> </widget>
</property> </item>
<property name="toolTip"> </layout>
<string>Make a blank wallet. Blank wallets do not initially have private keys or scripts. Private keys and addresses can be imported, or an HD seed can be set, at a later time.</string> </widget>
</property> </item>
<property name="text"> <item>
<string>Make Blank Wallet</string> <spacer name="verticalSpacer_2">
</property> <property name="orientation">
</widget> <enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</widget> </widget>
<tabstops> <tabstops>
<tabstop>wallet_name_line_edit</tabstop> <tabstop>wallet_name_line_edit</tabstop>