diff options
| author | fanquake <fanquake@gmail.com> | 2019-11-26 09:29:41 -0500 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2019-11-26 09:48:52 -0500 |
| commit | f2ab1309619b995ce9acb30bf0d1ec8526c435ad (patch) | |
| tree | 8ea95e8b2d5994ad656c4c9e9f45f9a3f66a54ce /src | |
| parent | 0ee914ba9e5960763c7bb380b566ee481446f97a (diff) | |
| parent | 93352d261fa4e1518a4f006de157ff5a2fc4c819 (diff) | |
| download | bitcoin-f2ab1309619b995ce9acb30bf0d1ec8526c435ad.tar.xz | |
Merge #17606: qt, refactor: Use proper classes for Ui::*
93352d261fa4e1518a4f006de157ff5a2fc4c819 qt: Use proper class for Ui::ReceiveCoinsDialog (Hennadii Stepanov)
87819046432a24fa8a7ec5c115eae4df0d281245 qt: Fix class name of Ui::ModalOverlay (Hennadii Stepanov)
Pull request description:
Use proper classes for:
- `Ui::ModalOverlay` to remove `<customwidget>` entry
- `Ui::ReceiveCoinsDialog` to be consistent with the code base
This PR does not change behavior.
ACKs for top commit:
jonasschnelli:
Tested ACK 93352d261fa4e1518a4f006de157ff5a2fc4c819 - ran this on top of master and tested the modal overlay on initial mainnet sync.
laanwj:
code review ACK 93352d261fa4e1518a4f006de157ff5a2fc4c819
Tree-SHA512: faeed8e86dbf5355505defcdb7e1db07d6a6005ee5eb07367b00f6aa122dd8ad34f8372d4bae7b29c0eac87b538a33157e19328be2876135e8a6376a3197f1bc
Diffstat (limited to 'src')
| -rw-r--r-- | src/qt/forms/modaloverlay.ui | 10 | ||||
| -rw-r--r-- | src/qt/forms/receivecoinsdialog.ui | 2 |
2 files changed, 2 insertions, 10 deletions
diff --git a/src/qt/forms/modaloverlay.ui b/src/qt/forms/modaloverlay.ui index b5a69c578d..da19a6fa2e 100644 --- a/src/qt/forms/modaloverlay.ui +++ b/src/qt/forms/modaloverlay.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> <class>ModalOverlay</class> - <widget class="ModalOverlay" name="ModalOverlay"> + <widget class="QWidget" name="ModalOverlay"> <property name="geometry"> <rect> <x>0</x> @@ -369,14 +369,6 @@ QLabel { color: rgb(40,40,40); }</string> </item> </layout> </widget> - <customwidgets> - <customwidget> - <class>ModalOverlay</class> - <extends>QWidget</extends> - <header>qt/modaloverlay.h</header> - <container>1</container> - </customwidget> - </customwidgets> <resources/> <connections/> </ui> diff --git a/src/qt/forms/receivecoinsdialog.ui b/src/qt/forms/receivecoinsdialog.ui index 64f52fcf45..7dbee6d689 100644 --- a/src/qt/forms/receivecoinsdialog.ui +++ b/src/qt/forms/receivecoinsdialog.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> <class>ReceiveCoinsDialog</class> - <widget class="QWidget" name="ReceiveCoinsDialog"> + <widget class="QDialog" name="ReceiveCoinsDialog"> <property name="geometry"> <rect> <x>0</x> |