Skip to content

Commit

Permalink
Merge #1549: [Cleanup][GUI] Nuke zPIV from the GUI
Browse files Browse the repository at this point in the history
09973ef [Cleanup][GUI] Remove zPIV balance in the topbar (random-zebra)
20471d8 [GUI][Cleanup] remove redundant SendWidget::refreshView (random-zebra)
6b7e6db [Cleanup][GUI] Remove ZPivControlDialog and sendZpiv from send widget (random-zebra)
4863f40 [Cleanup][GUI] Remove privacy widget (random-zebra)

Pull request description:

  As anticipated, after 4.1, zPIV will be accessible only through the CLI/RPC interface and will be completely removed from the GUI.

  Only mention left is in the staking charts (and tx records), for historical purpose.

  EDIT: Closes #1628

Top commit has no ACKs.

Tree-SHA512: 8f1db0da3a5bea425cc4671d6e12acbdfbd8bcec90efbad629b71bb1aae3e862c0f2664ea8c4c559a7f8dec47784c2a7e44cbbb7c24e430b31980069d9bde07d
  • Loading branch information
furszy committed Jun 10, 2020
2 parents 73c3ecc + 09973ef commit 47bf23a
Show file tree
Hide file tree
Showing 20 changed files with 36 additions and 2,574 deletions.
8 changes: 0 additions & 8 deletions src/Makefile.qt.include
Expand Up @@ -19,7 +19,6 @@ QT_FORMS_UI = \
qt/forms/optionsdialog.ui \
qt/forms/rpcconsole.ui \
qt/pivx/forms/loadingdialog.ui \
qt/forms/zpivcontroldialog.ui \
qt/pivx/forms/snackbar.ui \
qt/pivx/forms/navmenuwidget.ui \
qt/pivx/forms/lockunlock.ui \
Expand Down Expand Up @@ -50,7 +49,6 @@ QT_FORMS_UI = \
qt/pivx/forms/tooltipmenu.ui \
qt/pivx/forms/addresseswidget.ui \
qt/pivx/forms/defaultdialog.ui \
qt/pivx/forms/privacywidget.ui \
qt/pivx/forms/coldstakingwidget.ui \
qt/pivx/settings/forms/settingsbackupwallet.ui \
qt/pivx/settings/forms/settingsexportcsv.ui \
Expand Down Expand Up @@ -104,7 +102,6 @@ QT_MOC_CPP = \
qt/moc_utilitydialog.cpp \
qt/moc_walletmodel.cpp \
qt/pivx/moc_loadingdialog.cpp \
qt/moc_zpivcontroldialog.cpp \
qt/pivx/moc_pwidget.cpp \
qt/pivx/moc_focuseddialog.cpp \
qt/pivx/moc_snackbar.cpp \
Expand Down Expand Up @@ -142,7 +139,6 @@ QT_MOC_CPP = \
qt/pivx/moc_tooltipmenu.cpp \
qt/pivx/moc_addresseswidget.cpp \
qt/pivx/moc_defaultdialog.cpp \
qt/pivx/moc_privacywidget.cpp \
qt/pivx/moc_coldstakingwidget.cpp \
qt/pivx/settings/moc_settingsbackupwallet.cpp \
qt/pivx/settings/moc_settingsexportcsv.cpp \
Expand Down Expand Up @@ -224,7 +220,6 @@ BITCOIN_QT_H = \
qt/pivx/pfborderimage.h \
qt/pivx/loadingdialog.h \
qt/winshutdownmonitor.h \
qt/zpivcontroldialog.h \
qt/pivx/pwidget.h \
qt/pivx/focuseddialog.h \
qt/pivx/guitransactionsutils.h \
Expand Down Expand Up @@ -267,7 +262,6 @@ BITCOIN_QT_H = \
qt/pivx/tooltipmenu.h \
qt/pivx/addresseswidget.h \
qt/pivx/defaultdialog.h \
qt/pivx/privacywidget.h \
qt/pivx/coldstakingwidget.h \
qt/pivx/settings/settingsbackupwallet.h \
qt/pivx/settings/settingsexportcsv.h \
Expand Down Expand Up @@ -549,7 +543,6 @@ BITCOIN_QT_WALLET_CPP = \
qt/walletmodel.cpp \
qt/walletmodeltransaction.cpp \
qt/pivx/loadingdialog.cpp \
qt/zpivcontroldialog.cpp \
qt/pivx/pwidget.cpp \
qt/pivx/focuseddialog.cpp \
qt/pivx/guitransactionsutils.cpp \
Expand Down Expand Up @@ -591,7 +584,6 @@ BITCOIN_QT_WALLET_CPP = \
qt/pivx/tooltipmenu.cpp \
qt/pivx/addresseswidget.cpp \
qt/pivx/defaultdialog.cpp \
qt/pivx/privacywidget.cpp \
qt/pivx/coldstakingwidget.cpp \
qt/pivx/settings/settingsbackupwallet.cpp \
qt/pivx/settings/settingsexportcsv.cpp \
Expand Down
3 changes: 0 additions & 3 deletions src/qt/CMakeLists.txt
Expand Up @@ -101,7 +101,6 @@ SET(QT_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/addresstablemodel.cpp
${CMAKE_CURRENT_SOURCE_DIR}/askpassphrasedialog.cpp
${CMAKE_CURRENT_SOURCE_DIR}/coincontroldialog.cpp
${CMAKE_CURRENT_SOURCE_DIR}/zpivcontroldialog.cpp
${CMAKE_CURRENT_SOURCE_DIR}/coincontroltreewidget.cpp
${CMAKE_CURRENT_SOURCE_DIR}/editaddressdialog.cpp
${CMAKE_CURRENT_SOURCE_DIR}/openuridialog.cpp
Expand All @@ -114,7 +113,6 @@ SET(QT_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/transactiontablemodel.cpp
${CMAKE_CURRENT_SOURCE_DIR}/walletmodel.cpp
${CMAKE_CURRENT_SOURCE_DIR}/walletmodeltransaction.cpp
${CMAKE_CURRENT_SOURCE_DIR}/zpivcontroldialog.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/pivxgui.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/loadingdialog.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/pwidget.cpp
Expand Down Expand Up @@ -158,7 +156,6 @@ SET(QT_SOURCES
${CMAKE_CURRENT_SOURCE_DIR}/pivx/tooltipmenu.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/addresseswidget.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/defaultdialog.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/privacywidget.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/coldstakingwidget.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/settingsbackupwallet.cpp
${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/settingsbittoolwidget.cpp
Expand Down
2 changes: 0 additions & 2 deletions src/qt/askpassphrasedialog.h
Expand Up @@ -44,8 +44,6 @@ class AskPassphraseDialog : public QDialog, public Runnable
ToggleLock, /** Toggle wallet lock state */
ChangePass, /** Change passphrase */
Send_PIV, /** Send PIV */
Send_zPIV, /** Send zPIV */
Mint_zPIV, /** Mint zPIV */
BIP_38, /** BIP38 menu */
Multi_Sig, /** Multi-Signature dialog */
Sign_Message, /** Sign/verify message dialog */
Expand Down
431 changes: 0 additions & 431 deletions src/qt/forms/zpivcontroldialog.ui

This file was deleted.

5 changes: 1 addition & 4 deletions src/qt/optionsdialog.cpp
Expand Up @@ -67,12 +67,9 @@ OptionsDialog::OptionsDialog(QWidget* parent, bool enableWallet) : QDialog(paren
ui->tabWidget->removeTab(ui->tabWidget->indexOf(ui->tabWindow));
#endif

/* remove Wallet tab and zPiv options in case of -disablewallet */
/* remove Wallet tab in case of -disablewallet */
if (!enableWallet) {
ui->tabWidget->removeTab(ui->tabWidget->indexOf(ui->tabWallet));

ui->verticalZpivOptionsWidget->hide();
ui->verticalZpivDisplayWidget->hide();
}

/* Display elements init */
Expand Down
26 changes: 0 additions & 26 deletions src/qt/pivx/forms/navmenuwidget.ui
Expand Up @@ -243,32 +243,6 @@ background-color:transparent;
</property>
<property name="text">
<string>CONTACTS
</string>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
<property name="autoExclusive">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="btnPrivacy">
<property name="minimumSize">
<size>
<width>100</width>
<height>80</height>
</size>
</property>
<property name="text">
<string>PRIVACY
</string>
</property>
<property name="iconSize">
Expand Down

0 comments on commit 47bf23a

Please sign in to comment.