diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml index 6e255d0b39815..b8183cfa777cf 100644 --- a/.github/workflows/build-and-test.yml +++ b/.github/workflows/build-and-test.yml @@ -66,7 +66,7 @@ jobs: # Run the remainder of lint tests in `test/lint/`. test/lint/lint-all.sh - # Verify that scripted diffs are deterministically reproducable. + # Verify that scripted diffs are deterministically reproducible. if [ "${{ github.event_name }}" = "pull_request" ]; then COMMIT_RANGE="${{ github.base_ref }}..HEAD" test/lint/commit-script-check.sh $COMMIT_RANGE diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index 7fdd5aa7729f1..c7a6056a08835 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -16,65 +16,65 @@ QT_FORMS_UI = \ qt/forms/intro.ui \ qt/forms/openuridialog.ui \ qt/forms/rpcconsole.ui \ - qt/pivx/forms/loadingdialog.ui \ - qt/pivx/forms/snackbar.ui \ - qt/pivx/forms/navmenuwidget.ui \ - qt/pivx/forms/lockunlock.ui \ - qt/pivx/forms/expandablebutton.ui \ - qt/pivx/forms/receivedialog.ui \ - qt/pivx/forms/balancebubble.ui \ - qt/pivx/forms/topbar.ui \ - qt/pivx/forms/txrow.ui \ - qt/pivx/forms/dashboardwidget.ui \ - qt/pivx/forms/addresslabelrow.ui \ - qt/pivx/forms/contactdropdownrow.ui \ - qt/pivx/forms/mninfodialog.ui \ - qt/pivx/forms/optionbutton.ui \ - qt/pivx/forms/masternodewizarddialog.ui \ - qt/pivx/forms/mnrow.ui \ - qt/pivx/forms/masternodeswidget.ui \ - qt/pivx/forms/myaddressrow.ui \ - qt/pivx/forms/csrow.ui \ - qt/pivx/forms/sendmemodialog.ui \ - qt/pivx/forms/sendchangeaddressdialog.ui \ - qt/pivx/forms/sendconfirmdialog.ui \ - qt/pivx/forms/sendcustomfeedialog.ui \ - qt/pivx/forms/sendmultirow.ui \ - qt/pivx/forms/send.ui \ - qt/pivx/forms/addnewcontactdialog.ui \ - qt/pivx/forms/requestdialog.ui \ - qt/pivx/forms/receivewidget.ui \ - qt/pivx/forms/tooltipmenu.ui \ - qt/pivx/forms/addresseswidget.ui \ - qt/pivx/forms/defaultdialog.ui \ - qt/pivx/forms/coldstakingwidget.ui \ - qt/pivx/forms/proposalcard.ui \ - qt/pivx/forms/mnselectiondialog.ui \ - qt/pivx/forms/votedialog.ui \ - qt/pivx/forms/createproposaldialog.ui \ - qt/pivx/forms/proposalinfodialog.ui \ - qt/pivx/forms/governancewidget.ui \ - qt/pivx/settings/forms/backupwallet.ui \ - qt/pivx/settings/forms/exportcsv.ui \ - qt/pivx/settings/forms/bittoolwidget.ui \ - qt/pivx/settings/forms/consolewidget.ui \ - qt/pivx/settings/forms/displayoptionswidget.ui \ - qt/pivx/settings/forms/faqwidget.ui \ - qt/pivx/settings/forms/informationwidget.ui \ - qt/pivx/settings/forms/mainoptionswidget.ui \ - qt/pivx/settings/forms/signmessagewidgets.ui \ - qt/pivx/settings/forms/walletoptionswidget.ui \ - qt/pivx/settings/forms/walletrepairwidget.ui \ - qt/pivx/settings/forms/settingswidget.ui \ - qt/pivx/forms/welcomecontentwidget.ui \ - qt/pivx/forms/splash.ui + qt/forms/loadingdialog.ui \ + qt/forms/snackbar.ui \ + qt/forms/navmenuwidget.ui \ + qt/forms/lockunlock.ui \ + qt/forms/expandablebutton.ui \ + qt/forms/receivedialog.ui \ + qt/forms/balancebubble.ui \ + qt/forms/topbar.ui \ + qt/forms/txrow.ui \ + qt/forms/dashboardwidget.ui \ + qt/forms/addresslabelrow.ui \ + qt/forms/contactdropdownrow.ui \ + qt/forms/mninfodialog.ui \ + qt/forms/optionbutton.ui \ + qt/forms/masternodewizarddialog.ui \ + qt/forms/mnrow.ui \ + qt/forms/masternodeswidget.ui \ + qt/forms/myaddressrow.ui \ + qt/forms/csrow.ui \ + qt/forms/sendmemodialog.ui \ + qt/forms/sendchangeaddressdialog.ui \ + qt/forms/sendconfirmdialog.ui \ + qt/forms/sendcustomfeedialog.ui \ + qt/forms/sendmultirow.ui \ + qt/forms/send.ui \ + qt/forms/addnewcontactdialog.ui \ + qt/forms/requestdialog.ui \ + qt/forms/receivewidget.ui \ + qt/forms/tooltipmenu.ui \ + qt/forms/addresseswidget.ui \ + qt/forms/defaultdialog.ui \ + qt/forms/coldstakingwidget.ui \ + qt/forms/proposalcard.ui \ + qt/forms/mnselectiondialog.ui \ + qt/forms/votedialog.ui \ + qt/forms/createproposaldialog.ui \ + qt/forms/proposalinfodialog.ui \ + qt/forms/governancewidget.ui \ + qt/settings/forms/backupwallet.ui \ + qt/settings/forms/exportcsv.ui \ + qt/settings/forms/bittoolwidget.ui \ + qt/settings/forms/consolewidget.ui \ + qt/settings/forms/displayoptionswidget.ui \ + qt/settings/forms/faqwidget.ui \ + qt/settings/forms/informationwidget.ui \ + qt/settings/forms/mainoptionswidget.ui \ + qt/settings/forms/signmessagewidgets.ui \ + qt/settings/forms/walletoptionswidget.ui \ + qt/settings/forms/walletrepairwidget.ui \ + qt/settings/forms/settingswidget.ui \ + qt/forms/welcomecontentwidget.ui \ + qt/forms/splash.ui QT_MOC_CPP = \ qt/moc_addresstablemodel.cpp \ qt/moc_askpassphrasedialog.cpp \ qt/moc_bantablemodel.cpp \ qt/moc_bitcoinaddressvalidator.cpp \ - qt/pivx/moc_pivxgui.cpp \ + qt/moc_pivxgui.cpp \ qt/moc_bitcoinunits.cpp \ qt/moc_clientmodel.cpp \ qt/moc_coincontroldialog.cpp \ @@ -99,64 +99,64 @@ QT_MOC_CPP = \ qt/moc_transactiontablemodel.cpp \ qt/moc_utilitydialog.cpp \ qt/moc_walletmodel.cpp \ - qt/pivx/moc_loadingdialog.cpp \ - qt/pivx/moc_pwidget.cpp \ - qt/pivx/moc_focuseddialog.cpp \ - qt/pivx/moc_snackbar.cpp \ - qt/pivx/moc_navmenuwidget.cpp \ - qt/pivx/moc_lockunlock.cpp \ - qt/pivx/moc_expandablebutton.cpp \ - qt/pivx/moc_furabstractlistitemdelegate.cpp \ - qt/pivx/moc_receivedialog.cpp \ - qt/pivx/moc_pfborderimage.cpp \ - qt/pivx/moc_topbar.cpp \ - qt/pivx/moc_txrow.cpp \ - qt/pivx/moc_dashboardwidget.cpp \ - qt/pivx/moc_addresslabelrow.cpp \ - qt/pivx/moc_contactdropdownrow.cpp \ - qt/pivx/moc_mninfodialog.cpp \ - qt/pivx/moc_optionbutton.cpp \ - qt/pivx/moc_coldstakingmodel.cpp \ - qt/pivx/moc_mnmodel.cpp \ - qt/pivx/moc_masternodewizarddialog.cpp \ - qt/pivx/moc_mnrow.cpp \ - qt/pivx/moc_masternodeswidget.cpp \ - qt/pivx/moc_myaddressrow.cpp \ - qt/pivx/moc_csrow.cpp \ - qt/pivx/moc_contactsdropdown.cpp \ - qt/pivx/moc_sendchangeaddressdialog.cpp \ - qt/pivx/moc_sendconfirmdialog.cpp \ - qt/pivx/moc_sendcustomfeedialog.cpp \ - qt/pivx/moc_sendmemodialog.cpp \ - qt/pivx/moc_sendmultirow.cpp \ - qt/pivx/moc_send.cpp \ - qt/pivx/moc_addnewcontactdialog.cpp \ - qt/pivx/moc_requestdialog.cpp \ - qt/pivx/moc_receivewidget.cpp \ - qt/pivx/moc_tooltipmenu.cpp \ - qt/pivx/moc_addresseswidget.cpp \ - qt/pivx/moc_defaultdialog.cpp \ - qt/pivx/moc_coldstakingwidget.cpp \ - qt/pivx/moc_proposalcard.cpp \ - qt/pivx/moc_mnselectiondialog.cpp \ - qt/pivx/moc_votedialog.cpp \ - qt/pivx/moc_createproposaldialog.cpp \ - qt/pivx/moc_proposalinfodialog.cpp \ - qt/pivx/moc_governancewidget.cpp \ - qt/pivx/settings/moc_backupwallet.cpp \ - qt/pivx/settings/moc_exportcsv.cpp \ - qt/pivx/settings/moc_bittoolwidget.cpp \ - qt/pivx/settings/moc_consolewidget.cpp \ - qt/pivx/settings/moc_displayoptionswidget.cpp \ - qt/pivx/settings/moc_faqwidget.cpp \ - qt/pivx/settings/moc_informationwidget.cpp \ - qt/pivx/settings/moc_mainoptionswidget.cpp \ - qt/pivx/settings/moc_signmessagewidgets.cpp \ - qt/pivx/settings/moc_walletoptionswidget.cpp \ - qt/pivx/settings/moc_walletrepairwidget.cpp \ - qt/pivx/settings/moc_settingswidget.cpp \ - qt/pivx/moc_welcomecontentwidget.cpp \ - qt/pivx/moc_splash.cpp + qt/moc_loadingdialog.cpp \ + qt/moc_pwidget.cpp \ + qt/moc_focuseddialog.cpp \ + qt/moc_snackbar.cpp \ + qt/moc_navmenuwidget.cpp \ + qt/moc_lockunlock.cpp \ + qt/moc_expandablebutton.cpp \ + qt/moc_furabstractlistitemdelegate.cpp \ + qt/moc_receivedialog.cpp \ + qt/moc_pfborderimage.cpp \ + qt/moc_topbar.cpp \ + qt/moc_txrow.cpp \ + qt/moc_dashboardwidget.cpp \ + qt/moc_addresslabelrow.cpp \ + qt/moc_contactdropdownrow.cpp \ + qt/moc_mninfodialog.cpp \ + qt/moc_optionbutton.cpp \ + qt/moc_coldstakingmodel.cpp \ + qt/moc_mnmodel.cpp \ + qt/moc_masternodewizarddialog.cpp \ + qt/moc_mnrow.cpp \ + qt/moc_masternodeswidget.cpp \ + qt/moc_myaddressrow.cpp \ + qt/moc_csrow.cpp \ + qt/moc_contactsdropdown.cpp \ + qt/moc_sendchangeaddressdialog.cpp \ + qt/moc_sendconfirmdialog.cpp \ + qt/moc_sendcustomfeedialog.cpp \ + qt/moc_sendmemodialog.cpp \ + qt/moc_sendmultirow.cpp \ + qt/moc_send.cpp \ + qt/moc_addnewcontactdialog.cpp \ + qt/moc_requestdialog.cpp \ + qt/moc_receivewidget.cpp \ + qt/moc_tooltipmenu.cpp \ + qt/moc_addresseswidget.cpp \ + qt/moc_defaultdialog.cpp \ + qt/moc_coldstakingwidget.cpp \ + qt/moc_proposalcard.cpp \ + qt/moc_mnselectiondialog.cpp \ + qt/moc_votedialog.cpp \ + qt/moc_createproposaldialog.cpp \ + qt/moc_proposalinfodialog.cpp \ + qt/moc_governancewidget.cpp \ + qt/settings/moc_backupwallet.cpp \ + qt/settings/moc_exportcsv.cpp \ + qt/settings/moc_bittoolwidget.cpp \ + qt/settings/moc_consolewidget.cpp \ + qt/settings/moc_displayoptionswidget.cpp \ + qt/settings/moc_faqwidget.cpp \ + qt/settings/moc_informationwidget.cpp \ + qt/settings/moc_mainoptionswidget.cpp \ + qt/settings/moc_signmessagewidgets.cpp \ + qt/settings/moc_walletoptionswidget.cpp \ + qt/settings/moc_walletrepairwidget.cpp \ + qt/settings/moc_settingswidget.cpp \ + qt/moc_welcomecontentwidget.cpp \ + qt/moc_splash.cpp BITCOIN_MM = \ qt/macdockiconhandler.mm \ @@ -176,7 +176,7 @@ BITCOIN_QT_H = \ qt/askpassphrasedialog.h \ qt/bantablemodel.h \ qt/bitcoinaddressvalidator.h \ - qt/pivx/pivxgui.h \ + qt/pivxgui.h \ qt/bitcoinunits.h \ qt/clientmodel.h \ qt/coincontroldialog.h \ @@ -205,74 +205,74 @@ BITCOIN_QT_H = \ qt/utilitydialog.h \ qt/walletmodel.h \ qt/walletmodeltransaction.h \ - qt/pivx/prunnable.h \ - qt/pivx/pfborderimage.h \ - qt/pivx/loadingdialog.h \ + qt/prunnable.h \ + qt/pfborderimage.h \ + qt/loadingdialog.h \ qt/winshutdownmonitor.h \ - qt/pivx/pwidget.h \ - qt/pivx/focuseddialog.h \ - qt/pivx/guitransactionsutils.h \ - qt/pivx/snackbar.h \ - qt/pivx/navmenuwidget.h \ - qt/pivx/lockunlock.h \ - qt/pivx/receivedialog.h \ - qt/pivx/furlistrow.h \ - qt/pivx/furabstractlistitemdelegate.h \ - qt/pivx/txviewholder.h \ - qt/pivx/qtutils.h \ - qt/pivx/expandablebutton.h \ - qt/pivx/balancebubble.h \ - qt/pivx/topbar.h \ - qt/pivx/txrow.h \ - qt/pivx/addressholder.h \ - qt/pivx/addressfilterproxymodel.h \ - qt/pivx/dashboardwidget.h \ - qt/pivx/addresslabelrow.h \ - qt/pivx/contactdropdownrow.h \ - qt/pivx/mninfodialog.h \ - qt/pivx/optionbutton.h \ - qt/pivx/coldstakingmodel.h \ - qt/pivx/mnmodel.h \ - qt/pivx/masternodewizarddialog.h \ - qt/pivx/mnrow.h \ - qt/pivx/masternodeswidget.h \ - qt/pivx/myaddressrow.h \ - qt/pivx/csrow.h \ - qt/pivx/contactsdropdown.h \ - qt/pivx/sendchangeaddressdialog.h \ - qt/pivx/sendconfirmdialog.h \ - qt/pivx/sendcustomfeedialog.h \ - qt/pivx/sendmemodialog.h \ - qt/pivx/sendmultirow.h \ - qt/pivx/send.h \ - qt/pivx/addnewcontactdialog.h \ - qt/pivx/requestdialog.h \ - qt/pivx/receivewidget.h \ - qt/pivx/tooltipmenu.h \ - qt/pivx/addresseswidget.h \ - qt/pivx/defaultdialog.h \ - qt/pivx/coldstakingwidget.h \ - qt/pivx/governancemodel.h \ - qt/pivx/proposalcard.h \ - qt/pivx/mnselectiondialog.h \ - qt/pivx/votedialog.h \ - qt/pivx/createproposaldialog.h \ - qt/pivx/proposalinfodialog.h \ - qt/pivx/governancewidget.h \ - qt/pivx/settings/backupwallet.h \ - qt/pivx/settings/exportcsv.h \ - qt/pivx/settings/bittoolwidget.h \ - qt/pivx/settings/consolewidget.h \ - qt/pivx/settings/displayoptionswidget.h \ - qt/pivx/settings/faqwidget.h \ - qt/pivx/settings/informationwidget.h \ - qt/pivx/settings/mainoptionswidget.h \ - qt/pivx/settings/signmessagewidgets.h \ - qt/pivx/settings/walletoptionswidget.h \ - qt/pivx/settings/walletrepairwidget.h \ - qt/pivx/settings/settingswidget.h \ - qt/pivx/welcomecontentwidget.h \ - qt/pivx/splash.h + qt/pwidget.h \ + qt/focuseddialog.h \ + qt/guitransactionsutils.h \ + qt/snackbar.h \ + qt/navmenuwidget.h \ + qt/lockunlock.h \ + qt/receivedialog.h \ + qt/furlistrow.h \ + qt/furabstractlistitemdelegate.h \ + qt/txviewholder.h \ + qt/qtutils.h \ + qt/expandablebutton.h \ + qt/balancebubble.h \ + qt/topbar.h \ + qt/txrow.h \ + qt/addressholder.h \ + qt/addressfilterproxymodel.h \ + qt/dashboardwidget.h \ + qt/addresslabelrow.h \ + qt/contactdropdownrow.h \ + qt/mninfodialog.h \ + qt/optionbutton.h \ + qt/coldstakingmodel.h \ + qt/mnmodel.h \ + qt/masternodewizarddialog.h \ + qt/mnrow.h \ + qt/masternodeswidget.h \ + qt/myaddressrow.h \ + qt/csrow.h \ + qt/contactsdropdown.h \ + qt/sendchangeaddressdialog.h \ + qt/sendconfirmdialog.h \ + qt/sendcustomfeedialog.h \ + qt/sendmemodialog.h \ + qt/sendmultirow.h \ + qt/send.h \ + qt/addnewcontactdialog.h \ + qt/requestdialog.h \ + qt/receivewidget.h \ + qt/tooltipmenu.h \ + qt/addresseswidget.h \ + qt/defaultdialog.h \ + qt/coldstakingwidget.h \ + qt/governancemodel.h \ + qt/proposalcard.h \ + qt/mnselectiondialog.h \ + qt/votedialog.h \ + qt/createproposaldialog.h \ + qt/proposalinfodialog.h \ + qt/governancewidget.h \ + qt/settings/backupwallet.h \ + qt/settings/exportcsv.h \ + qt/settings/bittoolwidget.h \ + qt/settings/consolewidget.h \ + qt/settings/displayoptionswidget.h \ + qt/settings/faqwidget.h \ + qt/settings/informationwidget.h \ + qt/settings/mainoptionswidget.h \ + qt/settings/signmessagewidgets.h \ + qt/settings/walletoptionswidget.h \ + qt/settings/walletrepairwidget.h \ + qt/settings/settingswidget.h \ + qt/welcomecontentwidget.h \ + qt/splash.h RES_ICONS = \ qt/res/icons/bitcoin.ico \ @@ -287,236 +287,236 @@ RES_ICONS = \ qt/res/icons/ic-transaction-mint.svg \ qt/res/icons/ic-transaction-sent.svg \ qt/res/icons/ic-transaction-staked.svg \ - qt/pivx/res/img/bg-dashboard-banner.png \ - qt/pivx/res/img/bg-multi-number-dark.svg \ - qt/pivx/res/img/ic-check-locked.svg \ - qt/pivx/res/img/ic-nav-address.svg \ - qt/pivx/res/img/ic-update.svg \ - qt/pivx/res/img/bg-multi-number.svg \ - qt/pivx/res/img/ic-check-mint-off.svg \ - qt/pivx/res/img/ic-nav-cold-staking.svg \ - qt/pivx/res/img/ic-nav-cold-staking-active.svg \ - qt/pivx/res/img/ic-nav-dashboard-active.svg \ - qt/pivx/res/img/ic-wallet-status-locked.svg \ - qt/pivx/res/img/bg-splash.svg \ - qt/pivx/res/img/bg-splash.png \ - qt/pivx/res/img/ic-check-mint.svg \ - qt/pivx/res/img/ic-nav-dashboard-hover.svg \ - qt/pivx/res/img/ic-wallet-status-staking.svg \ - qt/pivx/res/img/ic-check-peers-off.svg \ - qt/pivx/res/img/ic-nav-dashboard.svg \ - qt/pivx/res/img/ic-wallet-status-unlocked.svg \ - qt/pivx/res/img/ic-check-peers.svg \ - qt/pivx/res/img/ic-nav-master-active.svg \ - qt/pivx/res/img/ic-watch-password-white.svg \ - qt/pivx/res/img/bg-welcome-container.jpg \ - qt/pivx/res/img/bg-welcome-container.png \ - qt/pivx/res/img/bg-welcome-container.svg \ - qt/pivx/res/img/bg-welcome-container@2x.png \ - qt/pivx/res/img/bg-welcome-container@3x.png \ - qt/pivx/res/img/ic-check-staking-off.svg \ - qt/pivx/res/img/ic-nav-master-hover.svg \ - qt/pivx/res/img/ic-watch-password.svg \ - qt/pivx/res/img/bg-welcome.jpg \ - qt/pivx/res/img/bg-welcome.svg \ - qt/pivx/res/img/bg-welcome@2x.jpg \ - qt/pivx/res/img/bg-welcome@3x.jpg \ - qt/pivx/res/img/bg-welcome.png \ - qt/pivx/res/img/ic-check-staking.svg \ - qt/pivx/res/img/ic-nav-master.svg \ - qt/pivx/res/img/img-dashboard-banner.jpg \ - qt/pivx/res/img/btn-radio-active.svg \ - qt/pivx/res/img/ic-check-sync-off.svg \ - qt/pivx/res/img/ic-nav-privacy-active.svg \ - qt/pivx/res/img/img-empty-contacts.svg \ - qt/pivx/res/img/btn-radio-off.svg \ - qt/pivx/res/img/ic-check-sync.png \ - qt/pivx/res/img/ic-nav-privacy-hover.svg \ - qt/pivx/res/img/img-empty-dark-contacts.svg \ - qt/pivx/res/img/ic-contact-arrow-down.svg \ - qt/pivx/res/img/ic-contact-arrow-down-white.svg \ - qt/pivx/res/img/ic-check-sync.svg \ - qt/pivx/res/img/ic-check-faq.svg \ - qt/pivx/res/img/ic-nav-privacy.svg \ - qt/pivx/res/img/img-empty-dark-error.svg \ - qt/pivx/res/img/ic-add-label.svg \ - qt/pivx/res/img/ic-pending.svg \ - qt/pivx/res/img/ic-check-theme-dark.svg \ - qt/pivx/res/img/ic-nav-receive-active.svg \ - qt/pivx/res/img/img-empty-dark-masternode.svg \ - qt/pivx/res/img/ic-add-liliac.svg \ - qt/pivx/res/img/ic-check-theme-light.svg \ - qt/pivx/res/img/ic-nav-receive-hover.svg \ - qt/pivx/res/img/img-empty-dark-multisend.svg \ - qt/pivx/res/img/ic-add-purple.svg \ - qt/pivx/res/img/ic-check-white.svg \ - qt/pivx/res/img/ic-nav-receive.svg \ - qt/pivx/res/img/img-empty-dark-peers.svg \ - qt/pivx/res/img/ic-add.svg \ - qt/pivx/res/img/ic-check.svg \ - qt/pivx/res/img/ic-nav-send-active.svg \ - qt/pivx/res/img/img-empty-dark-staking-off.svg \ - qt/pivx/res/img/img-empty-dark-staking-on.svg \ - qt/pivx/res/img/ic-address-book-grey.svg \ - qt/pivx/res/img/ic-chevron-left.svg \ - qt/pivx/res/img/ic-nav-send-hover.svg \ - qt/pivx/res/img/img-empty-dark-transactions.svg \ - qt/pivx/res/img/ic-address-book-white.svg \ - qt/pivx/res/img/ic-chevron-right.svg \ - qt/pivx/res/img/ic-chevron-right-liliac.svg \ - qt/pivx/res/img/ic-nav-send.svg \ - qt/pivx/res/img/img-empty-error.svg \ - qt/pivx/res/img/ic-address-book.svg \ - qt/pivx/res/img/ic-clear-liliac.svg \ - qt/pivx/res/img/ic-nav-settings-active.svg \ - qt/pivx/res/img/img-empty-masternode.svg \ - qt/pivx/res/img/ic-address-send-white.svg \ - qt/pivx/res/img/ic-clear-purple.svg \ - qt/pivx/res/img/ic-nav-settings-hover.svg \ - qt/pivx/res/img/img-empty-multisend.svg \ - qt/pivx/res/img/ic-address-send.svg \ - qt/pivx/res/img/ic-close-white.svg \ - qt/pivx/res/img/ic-nav-settings.svg \ - qt/pivx/res/img/img-empty-peers.svg \ - qt/pivx/res/img/img-empty-privacy.svg \ - qt/pivx/res/img/img-empty-privacy-dark.svg \ - qt/pivx/res/img/ic-arrow-drop-down-white.svg \ - qt/pivx/res/img/ic-close.svg \ - qt/pivx/res/img/ic-radio-liliac-on.svg \ - qt/pivx/res/img/img-empty-staking-off.svg \ - qt/pivx/res/img/ic-arrow-drop-down.svg \ - qt/pivx/res/img/ic-coin-piv.svg \ - qt/pivx/res/img/ic-receive-off.svg \ - qt/pivx/res/img/img-empty-staking-on.svg \ - qt/pivx/res/img/ic-arrow-drop-up-white.svg \ - qt/pivx/res/img/ic-coin-zpiv.png \ - qt/pivx/res/img/ic-receive-on.svg \ - qt/pivx/res/img/img-empty-transactions.svg \ - qt/pivx/res/img/ic-arrow-drop-up.svg \ - qt/pivx/res/img/ic-coin-zpiv.svg \ - qt/pivx/res/img/ic-received.svg \ - qt/pivx/res/img/img-logo-pivx.png \ - qt/pivx/res/img/ic-arrow-drop-white-down.svg \ - qt/pivx/res/img/ic-combo-box.svg \ - qt/pivx/res/img/ic-send.svg \ - qt/pivx/res/img/img-logo-pivx@2x.png \ - qt/pivx/res/img/ic-arrow-purple-down.svg \ - qt/pivx/res/img/ic-connect.svg \ - qt/pivx/res/img/ic-submenu-lock.svg \ - qt/pivx/res/img/img-logo-pivx@3x.png \ - qt/pivx/res/img/img-logo-pivx.svg \ - qt/pivx/res/img/ic-arrow-right-white.svg \ - qt/pivx/res/img/ic-arrow-left-white.svg \ - qt/pivx/res/img/ic-arrow-left.svg \ - qt/pivx/res/img/ic-copy-liliac.svg \ - qt/pivx/res/img/ic-submenu-staking.svg \ - qt/pivx/res/img/img-nav-logo-pivx.png \ - qt/pivx/res/img/ic-arrow-right.svg \ - qt/pivx/res/img/ic-copy.svg \ - qt/pivx/res/img/ic-copy-big.svg \ - qt/pivx/res/img/ic-copy-big-white.svg \ - qt/pivx/res/img/ic-submenu-unlock.svg \ - qt/pivx/res/img/img-nav-logo.png \ - qt/pivx/res/img/ic-arrow-white-left.svg \ - qt/pivx/res/img/ic-exit.svg \ - qt/pivx/res/img/ic-switch-liliac-on.svg \ - qt/pivx/res/img/img-nav-logo.svg \ - qt/pivx/res/img/ic-arrow-white-right.svg \ - qt/pivx/res/img/ic-expand.svg \ - qt/pivx/res/img/ic-switch-off.svg \ - qt/pivx/res/img/img-qr-test-big.png \ - qt/pivx/res/img/ic-check-active.svg \ - qt/pivx/res/img/ic-folder.svg \ - qt/pivx/res/img/ic-switch-on.svg \ - qt/pivx/res/img/img-qr-test.png \ - qt/pivx/res/img/ic-check-box.svg \ - qt/pivx/res/img/ic-check-box-light.svg \ - qt/pivx/res/img/ic-check-box-dark-active.svg \ - qt/pivx/res/img/ic-check-box-indeterminate.svg \ - qt/pivx/res/img/ic-check-box-liliac-indeterminate.svg \ - qt/pivx/res/img/ic-label-liliac.svg \ - qt/pivx/res/img/ic-transaction-warning.svg \ - qt/pivx/res/img/ic-transaction-mint.svg \ - qt/pivx/res/img/ic-transaction-mint-inactive.svg \ - qt/pivx/res/img/ic-check-cold-staking.svg \ - qt/pivx/res/img/ic-check-cold-staking-off.svg \ - qt/pivx/res/img/ic-check-cold-staking-enabled.svg \ - qt/pivx/res/img/dark/ic-transaction-cs-contract.svg \ - qt/pivx/res/img/dark/ic-transaction-cs-contract-inactive.svg \ - qt/pivx/res/img/img-qr.svg \ - qt/pivx/res/img/ic-check-connect-off.svg \ - qt/pivx/res/img/ic-check-tor-off.svg \ - qt/pivx/res/img/ic-check-tor.svg \ - qt/pivx/res/img/ic-label.svg \ - qt/pivx/res/img/ic-transaction-received.svg \ - qt/pivx/res/img/ic-transaction-received-memo.svg \ - qt/pivx/res/img/dark/ic-transaction-received.svg \ - qt/pivx/res/img/dark/ic-transaction-received-memo.svg \ - qt/pivx/res/img/dark/ic-transaction-warning.svg \ - qt/pivx/res/img/dark/ic-transaction-mint.svg \ - qt/pivx/res/img/dark/ic-transaction-mint-inactive.svg \ - qt/pivx/res/img/ic-transaction-received-inactive.svg \ - qt/pivx/res/img/dark/ic-transaction-received-inactive.svg \ - qt/pivx/res/img/img-welcome-step1.png \ - qt/pivx/res/img/ic-check-connect.svg \ - qt/pivx/res/img/ic-menu-hover.svg \ - qt/pivx/res/img/ic-transaction-sent.svg \ - qt/pivx/res/img/ic-transaction-sent-inactive.svg \ - qt/pivx/res/img/dark/ic-transaction-sent.svg \ - qt/pivx/res/img/dark/ic-transaction-sent-inactive.svg \ - qt/pivx/res/img/img-welcome-step2.png \ - qt/pivx/res/img/ic-check-dark.svg \ - qt/pivx/res/img/ic-mint.svg \ - qt/pivx/res/img/ic-transaction-staked.svg \ - qt/pivx/res/img/ic-transaction-staked-inactive.svg \ - qt/pivx/res/img/dark/ic-transaction-staked.svg \ - qt/pivx/res/img/dark/ic-transaction-staked-inactive.svg \ - qt/pivx/res/img/img-welcome-step3.png \ - qt/pivx/res/img/ic-check-liliac-on.svg \ - qt/pivx/res/img/ic-nav-address-active.svg \ - qt/pivx/res/img/ic-unlock-staking.svg \ - qt/pivx/res/img/img-welcome-step4.png \ - qt/pivx/res/img/ic-check-locked-off.svg \ - qt/pivx/res/img/ic-nav-address-hover.svg \ - qt/pivx/res/img/ic-update-liliac.svg \ - qt/pivx/res/img/ic-arrow-drop-down-purple.svg \ - qt/pivx/res/img/ic-arrow-drop-up-purple.svg \ - qt/pivx/res/img/ic-check-liliac-indeterminate.svg \ - qt/pivx/res/img/ic-check-box-liliac-indeterminate.svg \ - qt/pivx/res/img/ic-transaction-stake-delegated.svg \ - qt/pivx/res/img/ic-transaction-stake-delegated-inactive.svg \ - qt/pivx/res/img/ic-transaction-stake-hot.svg \ - qt/pivx/res/img/ic-transaction-stake-hot-inactive.svg \ - qt/pivx/res/img/dark/ic-transaction-stake-hot.svg \ - qt/pivx/res/img/dark/ic-transaction-stake-hot-inactive.svg \ - qt/pivx/res/img/dark/ic-transaction-stake-delegated.svg \ - qt/pivx/res/img/dark/ic-transaction-stake-delegated-inactive.svg \ - qt/pivx/res/img/ic-transaction-cs-contract.svg \ - qt/pivx/res/img/ic-transaction-cs-contract-inactive.svg \ - qt/pivx/res/img/ic-check-box-indeterminate.svg \ - qt/pivx/res/img/ic-information.svg \ - qt/pivx/res/img/ic-information-hover.svg \ - qt/pivx/res/img/ani-loading-dark.gif \ - qt/pivx/res/img/ani-loading.gif \ - qt/pivx/res/img/ic-check-vote.svg \ - qt/pivx/res/img/ic-check-vote-active.svg \ - qt/pivx/res/img/ic-check-vote-dark.svg \ - qt/pivx/res/img/ic-check-vote-active-dark.svg \ - qt/pivx/res/img/ic-check-block.svg \ - qt/pivx/res/img/ic-filter.svg \ - qt/pivx/res/img/ic-link.svg \ - qt/pivx/res/img/ic-nav-governance.svg \ - qt/pivx/res/img/ic-nav-governance-active.svg \ - qt/pivx/res/img/ic-nav-governance-hover.svg \ - qt/pivx/res/img/ic-time.svg \ - qt/pivx/res/img/ic-link-hover.svg \ - qt/pivx/res/img/img-empty-governance.svg \ - qt/pivx/res/img/img-empty-dark-governance.svg + qt/res/images/bg-dashboard-banner.png \ + qt/res/images/bg-multi-number-dark.svg \ + qt/res/images/ic-check-locked.svg \ + qt/res/images/ic-nav-address.svg \ + qt/res/images/ic-update.svg \ + qt/res/images/bg-multi-number.svg \ + qt/res/images/ic-check-mint-off.svg \ + qt/res/images/ic-nav-cold-staking.svg \ + qt/res/images/ic-nav-cold-staking-active.svg \ + qt/res/images/ic-nav-dashboard-active.svg \ + qt/res/images/ic-wallet-status-locked.svg \ + qt/res/images/bg-splash.svg \ + qt/res/images/bg-splash.png \ + qt/res/images/ic-check-mint.svg \ + qt/res/images/ic-nav-dashboard-hover.svg \ + qt/res/images/ic-wallet-status-staking.svg \ + qt/res/images/ic-check-peers-off.svg \ + qt/res/images/ic-nav-dashboard.svg \ + qt/res/images/ic-wallet-status-unlocked.svg \ + qt/res/images/ic-check-peers.svg \ + qt/res/images/ic-nav-master-active.svg \ + qt/res/images/ic-watch-password-white.svg \ + qt/res/images/bg-welcome-container.jpg \ + qt/res/images/bg-welcome-container.png \ + qt/res/images/bg-welcome-container.svg \ + qt/res/images/bg-welcome-container@2x.png \ + qt/res/images/bg-welcome-container@3x.png \ + qt/res/images/ic-check-staking-off.svg \ + qt/res/images/ic-nav-master-hover.svg \ + qt/res/images/ic-watch-password.svg \ + qt/res/images/bg-welcome.jpg \ + qt/res/images/bg-welcome.svg \ + qt/res/images/bg-welcome@2x.jpg \ + qt/res/images/bg-welcome@3x.jpg \ + qt/res/images/bg-welcome.png \ + qt/res/images/ic-check-staking.svg \ + qt/res/images/ic-nav-master.svg \ + qt/res/images/img-dashboard-banner.jpg \ + qt/res/images/btn-radio-active.svg \ + qt/res/images/ic-check-sync-off.svg \ + qt/res/images/ic-nav-privacy-active.svg \ + qt/res/images/img-empty-contacts.svg \ + qt/res/images/btn-radio-off.svg \ + qt/res/images/ic-check-sync.png \ + qt/res/images/ic-nav-privacy-hover.svg \ + qt/res/images/img-empty-dark-contacts.svg \ + qt/res/images/ic-contact-arrow-down.svg \ + qt/res/images/ic-contact-arrow-down-white.svg \ + qt/res/images/ic-check-sync.svg \ + qt/res/images/ic-check-faq.svg \ + qt/res/images/ic-nav-privacy.svg \ + qt/res/images/img-empty-dark-error.svg \ + qt/res/images/ic-add-label.svg \ + qt/res/images/ic-pending.svg \ + qt/res/images/ic-check-theme-dark.svg \ + qt/res/images/ic-nav-receive-active.svg \ + qt/res/images/img-empty-dark-masternode.svg \ + qt/res/images/ic-add-liliac.svg \ + qt/res/images/ic-check-theme-light.svg \ + qt/res/images/ic-nav-receive-hover.svg \ + qt/res/images/img-empty-dark-multisend.svg \ + qt/res/images/ic-add-purple.svg \ + qt/res/images/ic-check-white.svg \ + qt/res/images/ic-nav-receive.svg \ + qt/res/images/img-empty-dark-peers.svg \ + qt/res/images/ic-add.svg \ + qt/res/images/ic-check.svg \ + qt/res/images/ic-nav-send-active.svg \ + qt/res/images/img-empty-dark-staking-off.svg \ + qt/res/images/img-empty-dark-staking-on.svg \ + qt/res/images/ic-address-book-grey.svg \ + qt/res/images/ic-chevron-left.svg \ + qt/res/images/ic-nav-send-hover.svg \ + qt/res/images/img-empty-dark-transactions.svg \ + qt/res/images/ic-address-book-white.svg \ + qt/res/images/ic-chevron-right.svg \ + qt/res/images/ic-chevron-right-liliac.svg \ + qt/res/images/ic-nav-send.svg \ + qt/res/images/img-empty-error.svg \ + qt/res/images/ic-address-book.svg \ + qt/res/images/ic-clear-liliac.svg \ + qt/res/images/ic-nav-settings-active.svg \ + qt/res/images/img-empty-masternode.svg \ + qt/res/images/ic-address-send-white.svg \ + qt/res/images/ic-clear-purple.svg \ + qt/res/images/ic-nav-settings-hover.svg \ + qt/res/images/img-empty-multisend.svg \ + qt/res/images/ic-address-send.svg \ + qt/res/images/ic-close-white.svg \ + qt/res/images/ic-nav-settings.svg \ + qt/res/images/img-empty-peers.svg \ + qt/res/images/img-empty-privacy.svg \ + qt/res/images/img-empty-privacy-dark.svg \ + qt/res/images/ic-arrow-drop-down-white.svg \ + qt/res/images/ic-close.svg \ + qt/res/images/ic-radio-liliac-on.svg \ + qt/res/images/img-empty-staking-off.svg \ + qt/res/images/ic-arrow-drop-down.svg \ + qt/res/images/ic-coin-piv.svg \ + qt/res/images/ic-receive-off.svg \ + qt/res/images/img-empty-staking-on.svg \ + qt/res/images/ic-arrow-drop-up-white.svg \ + qt/res/images/ic-coin-zpiv.png \ + qt/res/images/ic-receive-on.svg \ + qt/res/images/img-empty-transactions.svg \ + qt/res/images/ic-arrow-drop-up.svg \ + qt/res/images/ic-coin-zpiv.svg \ + qt/res/images/ic-received.svg \ + qt/res/images/img-logo-pivx.png \ + qt/res/images/ic-arrow-drop-white-down.svg \ + qt/res/images/ic-combo-box.svg \ + qt/res/images/ic-send.svg \ + qt/res/images/img-logo-pivx@2x.png \ + qt/res/images/ic-arrow-purple-down.svg \ + qt/res/images/ic-connect.svg \ + qt/res/images/ic-submenu-lock.svg \ + qt/res/images/img-logo-pivx@3x.png \ + qt/res/images/img-logo-pivx.svg \ + qt/res/images/ic-arrow-right-white.svg \ + qt/res/images/ic-arrow-left-white.svg \ + qt/res/images/ic-arrow-left.svg \ + qt/res/images/ic-copy-liliac.svg \ + qt/res/images/ic-submenu-staking.svg \ + qt/res/images/img-nav-logo-pivx.png \ + qt/res/images/ic-arrow-right.svg \ + qt/res/images/ic-copy.svg \ + qt/res/images/ic-copy-big.svg \ + qt/res/images/ic-copy-big-white.svg \ + qt/res/images/ic-submenu-unlock.svg \ + qt/res/images/img-nav-logo.png \ + qt/res/images/ic-arrow-white-left.svg \ + qt/res/images/ic-exit.svg \ + qt/res/images/ic-switch-liliac-on.svg \ + qt/res/images/img-nav-logo.svg \ + qt/res/images/ic-arrow-white-right.svg \ + qt/res/images/ic-expand.svg \ + qt/res/images/ic-switch-off.svg \ + qt/res/images/img-qr-test-big.png \ + qt/res/images/ic-check-active.svg \ + qt/res/images/ic-folder.svg \ + qt/res/images/ic-switch-on.svg \ + qt/res/images/img-qr-test.png \ + qt/res/images/ic-check-box.svg \ + qt/res/images/ic-check-box-light.svg \ + qt/res/images/ic-check-box-dark-active.svg \ + qt/res/images/ic-check-box-indeterminate.svg \ + qt/res/images/ic-check-box-liliac-indeterminate.svg \ + qt/res/images/ic-label-liliac.svg \ + qt/res/images/ic-transaction-warning.svg \ + qt/res/images/ic-transaction-mint.svg \ + qt/res/images/ic-transaction-mint-inactive.svg \ + qt/res/images/ic-check-cold-staking.svg \ + qt/res/images/ic-check-cold-staking-off.svg \ + qt/res/images/ic-check-cold-staking-enabled.svg \ + qt/res/images/dark/ic-transaction-cs-contract.svg \ + qt/res/images/dark/ic-transaction-cs-contract-inactive.svg \ + qt/res/images/img-qr.svg \ + qt/res/images/ic-check-connect-off.svg \ + qt/res/images/ic-check-tor-off.svg \ + qt/res/images/ic-check-tor.svg \ + qt/res/images/ic-label.svg \ + qt/res/images/ic-transaction-received.svg \ + qt/res/images/ic-transaction-received-memo.svg \ + qt/res/images/dark/ic-transaction-received.svg \ + qt/res/images/dark/ic-transaction-received-memo.svg \ + qt/res/images/dark/ic-transaction-warning.svg \ + qt/res/images/dark/ic-transaction-mint.svg \ + qt/res/images/dark/ic-transaction-mint-inactive.svg \ + qt/res/images/ic-transaction-received-inactive.svg \ + qt/res/images/dark/ic-transaction-received-inactive.svg \ + qt/res/images/img-welcome-step1.png \ + qt/res/images/ic-check-connect.svg \ + qt/res/images/ic-menu-hover.svg \ + qt/res/images/ic-transaction-sent.svg \ + qt/res/images/ic-transaction-sent-inactive.svg \ + qt/res/images/dark/ic-transaction-sent.svg \ + qt/res/images/dark/ic-transaction-sent-inactive.svg \ + qt/res/images/img-welcome-step2.png \ + qt/res/images/ic-check-dark.svg \ + qt/res/images/ic-mint.svg \ + qt/res/images/ic-transaction-staked.svg \ + qt/res/images/ic-transaction-staked-inactive.svg \ + qt/res/images/dark/ic-transaction-staked.svg \ + qt/res/images/dark/ic-transaction-staked-inactive.svg \ + qt/res/images/img-welcome-step3.png \ + qt/res/images/ic-check-liliac-on.svg \ + qt/res/images/ic-nav-address-active.svg \ + qt/res/images/ic-unlock-staking.svg \ + qt/res/images/img-welcome-step4.png \ + qt/res/images/ic-check-locked-off.svg \ + qt/res/images/ic-nav-address-hover.svg \ + qt/res/images/ic-update-liliac.svg \ + qt/res/images/ic-arrow-drop-down-purple.svg \ + qt/res/images/ic-arrow-drop-up-purple.svg \ + qt/res/images/ic-check-liliac-indeterminate.svg \ + qt/res/images/ic-check-box-liliac-indeterminate.svg \ + qt/res/images/ic-transaction-stake-delegated.svg \ + qt/res/images/ic-transaction-stake-delegated-inactive.svg \ + qt/res/images/ic-transaction-stake-hot.svg \ + qt/res/images/ic-transaction-stake-hot-inactive.svg \ + qt/res/images/dark/ic-transaction-stake-hot.svg \ + qt/res/images/dark/ic-transaction-stake-hot-inactive.svg \ + qt/res/images/dark/ic-transaction-stake-delegated.svg \ + qt/res/images/dark/ic-transaction-stake-delegated-inactive.svg \ + qt/res/images/ic-transaction-cs-contract.svg \ + qt/res/images/ic-transaction-cs-contract-inactive.svg \ + qt/res/images/ic-check-box-indeterminate.svg \ + qt/res/images/ic-information.svg \ + qt/res/images/ic-information-hover.svg \ + qt/res/images/ani-loading-dark.gif \ + qt/res/images/ani-loading.gif \ + qt/res/images/ic-check-vote.svg \ + qt/res/images/ic-check-vote-active.svg \ + qt/res/images/ic-check-vote-dark.svg \ + qt/res/images/ic-check-vote-active-dark.svg \ + qt/res/images/ic-check-block.svg \ + qt/res/images/ic-filter.svg \ + qt/res/images/ic-link.svg \ + qt/res/images/ic-nav-governance.svg \ + qt/res/images/ic-nav-governance-active.svg \ + qt/res/images/ic-nav-governance-hover.svg \ + qt/res/images/ic-time.svg \ + qt/res/images/ic-link-hover.svg \ + qt/res/images/img-empty-governance.svg \ + qt/res/images/img-empty-dark-governance.svg BITCOIN_QT_BASE_CPP = \ qt/bantablemodel.cpp \ qt/bitcoinaddressvalidator.cpp \ - qt/pivx/pivxgui.cpp \ + qt/pivxgui.cpp \ qt/bitcoinunits.cpp \ qt/clientmodel.cpp \ qt/csvmodelwriter.cpp \ @@ -548,70 +548,70 @@ BITCOIN_QT_WALLET_CPP = \ qt/transactiontablemodel.cpp \ qt/walletmodel.cpp \ qt/walletmodeltransaction.cpp \ - qt/pivx/loadingdialog.cpp \ - qt/pivx/pwidget.cpp \ - qt/pivx/focuseddialog.cpp \ - qt/pivx/guitransactionsutils.cpp \ - qt/pivx/snackbar.cpp \ - qt/pivx/navmenuwidget.cpp \ - qt/pivx/lockunlock.cpp \ - qt/pivx/receivedialog.cpp \ - qt/pivx/furabstractlistitemdelegate.cpp \ - qt/pivx/txviewholder.cpp \ - qt/pivx/qtutils.cpp \ - qt/pivx/expandablebutton.cpp \ - qt/pivx/balancebubble.cpp \ - qt/pivx/topbar.cpp \ - qt/pivx/txrow.cpp \ - qt/pivx/addressholder.cpp \ - qt/pivx/addressfilterproxymodel.cpp \ - qt/pivx/dashboardwidget.cpp \ - qt/pivx/addresslabelrow.cpp \ - qt/pivx/contactdropdownrow.cpp \ - qt/pivx/contactsdropdown.cpp \ - qt/pivx/optionbutton.cpp \ - qt/pivx/mninfodialog.cpp \ - qt/pivx/coldstakingmodel.cpp \ - qt/pivx/mnmodel.cpp \ - qt/pivx/masternodewizarddialog.cpp \ - qt/pivx/mnrow.cpp \ - qt/pivx/masternodeswidget.cpp \ - qt/pivx/myaddressrow.cpp \ - qt/pivx/csrow.cpp \ - qt/pivx/sendchangeaddressdialog.cpp \ - qt/pivx/sendconfirmdialog.cpp \ - qt/pivx/sendcustomfeedialog.cpp \ - qt/pivx/sendmemodialog.cpp \ - qt/pivx/sendmultirow.cpp \ - qt/pivx/send.cpp \ - qt/pivx/addnewcontactdialog.cpp \ - qt/pivx/requestdialog.cpp \ - qt/pivx/receivewidget.cpp \ - qt/pivx/tooltipmenu.cpp \ - qt/pivx/addresseswidget.cpp \ - qt/pivx/defaultdialog.cpp \ - qt/pivx/coldstakingwidget.cpp \ - qt/pivx/governancemodel.cpp \ - qt/pivx/proposalcard.cpp \ - qt/pivx/mnselectiondialog.cpp \ - qt/pivx/votedialog.cpp \ - qt/pivx/createproposaldialog.cpp \ - qt/pivx/proposalinfodialog.cpp \ - qt/pivx/governancewidget.cpp \ - qt/pivx/settings/backupwallet.cpp \ - qt/pivx/settings/exportcsv.cpp \ - qt/pivx/settings/bittoolwidget.cpp \ - qt/pivx/settings/consolewidget.cpp \ - qt/pivx/settings/displayoptionswidget.cpp \ - qt/pivx/settings/faqwidget.cpp \ - qt/pivx/settings/informationwidget.cpp \ - qt/pivx/settings/mainoptionswidget.cpp \ - qt/pivx/settings/signmessagewidgets.cpp \ - qt/pivx/settings/walletoptionswidget.cpp \ - qt/pivx/settings/walletrepairwidget.cpp \ - qt/pivx/settings/settingswidget.cpp \ - qt/pivx/welcomecontentwidget.cpp \ - qt/pivx/splash.cpp + qt/loadingdialog.cpp \ + qt/pwidget.cpp \ + qt/focuseddialog.cpp \ + qt/guitransactionsutils.cpp \ + qt/snackbar.cpp \ + qt/navmenuwidget.cpp \ + qt/lockunlock.cpp \ + qt/receivedialog.cpp \ + qt/furabstractlistitemdelegate.cpp \ + qt/txviewholder.cpp \ + qt/qtutils.cpp \ + qt/expandablebutton.cpp \ + qt/balancebubble.cpp \ + qt/topbar.cpp \ + qt/txrow.cpp \ + qt/addressholder.cpp \ + qt/addressfilterproxymodel.cpp \ + qt/dashboardwidget.cpp \ + qt/addresslabelrow.cpp \ + qt/contactdropdownrow.cpp \ + qt/contactsdropdown.cpp \ + qt/optionbutton.cpp \ + qt/mninfodialog.cpp \ + qt/coldstakingmodel.cpp \ + qt/mnmodel.cpp \ + qt/masternodewizarddialog.cpp \ + qt/mnrow.cpp \ + qt/masternodeswidget.cpp \ + qt/myaddressrow.cpp \ + qt/csrow.cpp \ + qt/sendchangeaddressdialog.cpp \ + qt/sendconfirmdialog.cpp \ + qt/sendcustomfeedialog.cpp \ + qt/sendmemodialog.cpp \ + qt/sendmultirow.cpp \ + qt/send.cpp \ + qt/addnewcontactdialog.cpp \ + qt/requestdialog.cpp \ + qt/receivewidget.cpp \ + qt/tooltipmenu.cpp \ + qt/addresseswidget.cpp \ + qt/defaultdialog.cpp \ + qt/coldstakingwidget.cpp \ + qt/governancemodel.cpp \ + qt/proposalcard.cpp \ + qt/mnselectiondialog.cpp \ + qt/votedialog.cpp \ + qt/createproposaldialog.cpp \ + qt/proposalinfodialog.cpp \ + qt/governancewidget.cpp \ + qt/settings/backupwallet.cpp \ + qt/settings/exportcsv.cpp \ + qt/settings/bittoolwidget.cpp \ + qt/settings/consolewidget.cpp \ + qt/settings/displayoptionswidget.cpp \ + qt/settings/faqwidget.cpp \ + qt/settings/informationwidget.cpp \ + qt/settings/mainoptionswidget.cpp \ + qt/settings/signmessagewidgets.cpp \ + qt/settings/walletoptionswidget.cpp \ + qt/settings/walletrepairwidget.cpp \ + qt/settings/settingswidget.cpp \ + qt/welcomecontentwidget.cpp \ + qt/splash.cpp BITCOIN_QT_CPP = $(BITCOIN_QT_BASE_CPP) @@ -630,8 +630,8 @@ RES_IMAGES = \ RES_CSS = \ qt/res/css/default.css \ - qt/pivx/res/css/style_dark.css \ - qt/pivx/res/css/style_light.css + qt/res/css/style_dark.css \ + qt/res/css/style_light.css BITCOIN_RC = qt/res/pivx-qt-res.rc @@ -706,7 +706,7 @@ $(QT_QRC_CPP): $(QT_QRC) $(QT_FORMS_H) $(RES_ICONS) $(RES_IMAGES) $(RES_CSS) $(AM_V_GEN) QT_SELECT=$(QT_SELECT) $(RCC) -name pivx $< | \ $(SED) -e '/^\*\*.*Created:/d' -e '/^\*\*.*by:/d' > $@ -CLEAN_QT = $(nodist_qt_libbitcoinqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda qt/*.gcno qt/pivx/*.gcda qt/pivx/*.gcno qt/pivx/settings/*.gcda qt/pivx/settings/*.gcno qt/temp_pivx_locale.qrc +CLEAN_QT = $(nodist_qt_libbitcoinqt_a_SOURCES) $(QT_QM) $(QT_FORMS_H) qt/*.gcda qt/*.gcno qt/settings/*.gcda qt/settings/*.gcno qt/temp_pivx_locale.qrc CLEANFILES += $(CLEAN_QT) diff --git a/src/llmq/quorums_signing.cpp b/src/llmq/quorums_signing.cpp index 7380e09bf0f25..d1f194b68a1f3 100644 --- a/src/llmq/quorums_signing.cpp +++ b/src/llmq/quorums_signing.cpp @@ -39,7 +39,7 @@ CRecoveredSigsDb::CRecoveredSigsDb(CDBWrapper& _db) : db(_db) } } -// This converts time values in "rs_t" from host endiannes to big endiannes, which is required to have proper ordering of the keys +// This converts time values in "rs_t" from host endianness to big endianness, which is required to have proper ordering of the keys void CRecoveredSigsDb::ConvertInvalidTimeKeys() { LogPrintf("CRecoveredSigsDb::%s -- converting invalid rs_t keys\n", __func__); diff --git a/src/qt/CMakeLists.txt b/src/qt/CMakeLists.txt index ce1020191b6f7..430d4e588aaf3 100644 --- a/src/qt/CMakeLists.txt +++ b/src/qt/CMakeLists.txt @@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.14) set(QT_MINIMUM_VERSION 5.5.1) set(CMAKE_INCLUDE_CURRENT_DIR ON) -set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/forms ${CMAKE_CURRENT_SOURCE_DIR}/pivx/forms ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/forms) +set(CMAKE_AUTOUIC_SEARCH_PATHS ${CMAKE_CURRENT_SOURCE_DIR}/forms ${CMAKE_CURRENT_SOURCE_DIR}/settings/forms) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(CMAKE_AUTOUIC ON) @@ -89,75 +89,75 @@ 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}/pivx/pivxgui.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/loadingdialog.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/pwidget.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/focuseddialog.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/guitransactionsutils.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/snackbar.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/navmenuwidget.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/lockunlock.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/receivedialog.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/furabstractlistitemdelegate.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/txviewholder.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/qtutils.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/balancebubble.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/expandablebutton.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/topbar.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/txrow.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/addressfilterproxymodel.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/dashboardwidget.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/addresslabelrow.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/contactdropdownrow.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/contactsdropdown.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/optionbutton.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/mninfodialog.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/coldstakingmodel.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/mnmodel.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/masternodewizarddialog.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/mnrow.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/masternodeswidget.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/sendchangeaddressdialog.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/sendconfirmdialog.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/sendcustomfeedialog.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/sendmemodialog.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/sendmultirow.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/send.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/addnewcontactdialog.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/requestdialog.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/receivewidget.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/myaddressrow.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/csrow.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/addressholder.cpp - ${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/coldstakingwidget.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/mnselectiondialog.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/proposalcard.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/votedialog.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/createproposaldialog.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/proposalinfodialog.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/governancewidget.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/backupwallet.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/bittoolwidget.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/consolewidget.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/displayoptionswidget.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/faqwidget.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/informationwidget.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/mainoptionswidget.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/signmessagewidgets.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/walletoptionswidget.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/walletrepairwidget.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/exportcsv.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings/settingswidget.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/welcomecontentwidget.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/splash.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/governancemodel.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/pivxgui.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/loadingdialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/pwidget.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/focuseddialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/guitransactionsutils.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/snackbar.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/navmenuwidget.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/lockunlock.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/receivedialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/furabstractlistitemdelegate.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/txviewholder.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/qtutils.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/balancebubble.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/expandablebutton.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/topbar.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/txrow.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/addressfilterproxymodel.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/dashboardwidget.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/addresslabelrow.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/contactdropdownrow.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/contactsdropdown.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/optionbutton.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/mninfodialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/coldstakingmodel.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/mnmodel.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/masternodewizarddialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/mnrow.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/masternodeswidget.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/sendchangeaddressdialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/sendconfirmdialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/sendcustomfeedialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/sendmemodialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/sendmultirow.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/send.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/addnewcontactdialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/requestdialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/receivewidget.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/myaddressrow.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/csrow.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/addressholder.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/tooltipmenu.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/addresseswidget.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/defaultdialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/coldstakingwidget.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/mnselectiondialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/proposalcard.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/votedialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/createproposaldialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/proposalinfodialog.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/governancewidget.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/settings/backupwallet.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/settings/bittoolwidget.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/settings/consolewidget.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/settings/displayoptionswidget.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/settings/faqwidget.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/settings/informationwidget.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/settings/mainoptionswidget.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/settings/signmessagewidgets.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/settings/walletoptionswidget.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/settings/walletrepairwidget.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/settings/exportcsv.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/settings/settingswidget.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/welcomecontentwidget.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/splash.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/governancemodel.cpp ) -qt5_generate_moc(pivx/pfborderimage.h ${CMAKE_CURRENT_SOURCE_DIR}/pivx/moc_pfborderimage.cpp) -list(APPEND QT_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/pivx/moc_pfborderimage.cpp) +qt5_generate_moc(pfborderimage.h ${CMAKE_CURRENT_SOURCE_DIR}/moc_pfborderimage.cpp) +list(APPEND QT_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/moc_pfborderimage.cpp) if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin") list(APPEND QT_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/macdockiconhandler.mm) @@ -173,8 +173,7 @@ target_include_directories(qt_stuff PUBLIC ${CMAKE_SOURCE_DIR}/src ${relic_SOURCE_DIR}/include ${relic_BINARY_DIR}/include ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/pivx - ${CMAKE_CURRENT_SOURCE_DIR}/pivx/settings + ${CMAKE_CURRENT_SOURCE_DIR}/settings ${BerkeleyDB_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} ) diff --git a/src/qt/pivx/addnewcontactdialog.cpp b/src/qt/addnewcontactdialog.cpp similarity index 94% rename from src/qt/pivx/addnewcontactdialog.cpp rename to src/qt/addnewcontactdialog.cpp index 1d501e1cad5ca..5c3e83a869218 100644 --- a/src/qt/pivx/addnewcontactdialog.cpp +++ b/src/qt/addnewcontactdialog.cpp @@ -2,9 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/addnewcontactdialog.h" -#include "qt/pivx/forms/ui_addnewcontactdialog.h" -#include "qt/pivx/qtutils.h" +#include "addnewcontactdialog.h" +#include "ui_addnewcontactdialog.h" + +#include "qtutils.h" AddNewContactDialog::AddNewContactDialog(QWidget *parent) : FocusedDialog(parent), diff --git a/src/qt/pivx/addnewcontactdialog.h b/src/qt/addnewcontactdialog.h similarity index 81% rename from src/qt/pivx/addnewcontactdialog.h rename to src/qt/addnewcontactdialog.h index b3da7270f4861..4fe4f7b8acef1 100644 --- a/src/qt/pivx/addnewcontactdialog.h +++ b/src/qt/addnewcontactdialog.h @@ -2,10 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_ADDNEWCONTACTDIALOG_H -#define PIVX_QT_PIVX_ADDNEWCONTACTDIALOG_H +#ifndef PIVX_QT_ADDNEWCONTACTDIALOG_H +#define PIVX_QT_ADDNEWCONTACTDIALOG_H -#include "qt/pivx/focuseddialog.h" +#include "focuseddialog.h" namespace Ui { class AddNewContactDialog; @@ -33,4 +33,4 @@ public Q_SLOTS: const char* message = nullptr; }; -#endif // PIVX_QT_PIVX_ADDNEWCONTACTDIALOG_H +#endif // PIVX_QT_ADDNEWCONTACTDIALOG_H diff --git a/src/qt/pivx/addresseswidget.cpp b/src/qt/addresseswidget.cpp similarity index 97% rename from src/qt/pivx/addresseswidget.cpp rename to src/qt/addresseswidget.cpp index 7573bd2243751..7b7a3515acacf 100644 --- a/src/qt/pivx/addresseswidget.cpp +++ b/src/qt/addresseswidget.cpp @@ -2,15 +2,15 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/addresseswidget.h" -#include "qt/pivx/forms/ui_addresseswidget.h" -#include "qt/pivx/addressfilterproxymodel.h" -#include "qt/pivx/addresslabelrow.h" -#include "qt/pivx/tooltipmenu.h" +#include "addresseswidget.h" +#include "ui_addresseswidget.h" -#include "qt/pivx/addnewcontactdialog.h" +#include "addressfilterproxymodel.h" +#include "addresslabelrow.h" +#include "tooltipmenu.h" +#include "addnewcontactdialog.h" #include "guiutil.h" -#include "qt/pivx/qtutils.h" +#include "qtutils.h" #include "walletmodel.h" #include diff --git a/src/qt/pivx/addresseswidget.h b/src/qt/addresseswidget.h similarity index 90% rename from src/qt/pivx/addresseswidget.h rename to src/qt/addresseswidget.h index 3250189fa94b8..89b1fefa34d10 100644 --- a/src/qt/pivx/addresseswidget.h +++ b/src/qt/addresseswidget.h @@ -2,12 +2,12 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_ADDRESSESWIDGET_H -#define PIVX_QT_PIVX_ADDRESSESWIDGET_H +#ifndef PIVX_QT_ADDRESSESWIDGET_H +#define PIVX_QT_ADDRESSESWIDGET_H -#include "qt/pivx/pwidget.h" #include "addresstablemodel.h" #include "furabstractlistitemdelegate.h" +#include "pwidget.h" #include @@ -65,4 +65,4 @@ private Q_SLOTS: void sortAddresses(); }; -#endif // PIVX_QT_PIVX_ADDRESSESWIDGET_H +#endif // PIVX_QT_ADDRESSESWIDGET_H diff --git a/src/qt/pivx/addressfilterproxymodel.cpp b/src/qt/addressfilterproxymodel.cpp similarity index 96% rename from src/qt/pivx/addressfilterproxymodel.cpp rename to src/qt/addressfilterproxymodel.cpp index 8875b358e0c17..6d1cce60b2ca6 100644 --- a/src/qt/pivx/addressfilterproxymodel.cpp +++ b/src/qt/addressfilterproxymodel.cpp @@ -2,7 +2,7 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/addressfilterproxymodel.h" +#include "addressfilterproxymodel.h" #include "qt/addresstablemodel.h" bool AddressFilterProxyModel::filterAcceptsRow(int row, const QModelIndex& parent) const diff --git a/src/qt/pivx/addressfilterproxymodel.h b/src/qt/addressfilterproxymodel.h similarity index 88% rename from src/qt/pivx/addressfilterproxymodel.h rename to src/qt/addressfilterproxymodel.h index 4d7b6b2e6d59f..7cda20db6e672 100644 --- a/src/qt/pivx/addressfilterproxymodel.h +++ b/src/qt/addressfilterproxymodel.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_ADDRESSFILTERPROXYMODEL_H -#define PIVX_QT_PIVX_ADDRESSFILTERPROXYMODEL_H +#ifndef PIVX_QT_ADDRESSFILTERPROXYMODEL_H +#define PIVX_QT_ADDRESSFILTERPROXYMODEL_H #include @@ -42,4 +42,4 @@ class AddressFilterProxyModel final : public QSortFilterProxyModel }; -#endif // PIVX_QT_PIVX_ADDRESSFILTERPROXYMODEL_H +#endif // PIVX_QT_ADDRESSFILTERPROXYMODEL_H diff --git a/src/qt/pivx/addressholder.cpp b/src/qt/addressholder.cpp similarity index 94% rename from src/qt/pivx/addressholder.cpp rename to src/qt/addressholder.cpp index 02964eb453082..e02836d250808 100644 --- a/src/qt/pivx/addressholder.cpp +++ b/src/qt/addressholder.cpp @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/addressholder.h" -#include "qt/pivx/qtutils.h" +#include "addressholder.h" +#include "qtutils.h" void AddressHolder::init(QWidget* holder,const QModelIndex &index, bool isHovered, bool isSelected) const { MyAddressRow *row = static_cast(holder); diff --git a/src/qt/pivx/addressholder.h b/src/qt/addressholder.h similarity index 83% rename from src/qt/pivx/addressholder.h rename to src/qt/addressholder.h index aef44da6693d9..ed349fd7296e9 100644 --- a/src/qt/pivx/addressholder.h +++ b/src/qt/addressholder.h @@ -2,14 +2,14 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_ADDRESSHOLDER_H -#define PIVX_QT_PIVX_ADDRESSHOLDER_H +#ifndef PIVX_QT_ADDRESSHOLDER_H +#define PIVX_QT_ADDRESSHOLDER_H -#include -#include -#include "qt/pivx/myaddressrow.h" -#include "qt/pivx/furlistrow.h" +#include "furlistrow.h" #include "guiutil.h" +#include "myaddressrow.h" +#include +#include class AddressHolder : public FurListRow @@ -38,4 +38,4 @@ class AddressHolder : public FurListRow }; -#endif // PIVX_QT_PIVX_ADDRESSHOLDER_H +#endif // PIVX_QT_ADDRESSHOLDER_H diff --git a/src/qt/pivx/addresslabelrow.cpp b/src/qt/addresslabelrow.cpp similarity index 93% rename from src/qt/pivx/addresslabelrow.cpp rename to src/qt/addresslabelrow.cpp index 99f6417a59986..a18f5fa5aab6a 100644 --- a/src/qt/pivx/addresslabelrow.cpp +++ b/src/qt/addresslabelrow.cpp @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/addresslabelrow.h" -#include "qt/pivx/forms/ui_addresslabelrow.h" +#include "addresslabelrow.h" +#include "ui_addresslabelrow.h" AddressLabelRow::AddressLabelRow(QWidget *parent) : QWidget(parent), diff --git a/src/qt/pivx/addresslabelrow.h b/src/qt/addresslabelrow.h similarity index 85% rename from src/qt/pivx/addresslabelrow.h rename to src/qt/addresslabelrow.h index ee8e4f8043dd4..a8dd1905a8346 100644 --- a/src/qt/pivx/addresslabelrow.h +++ b/src/qt/addresslabelrow.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_ADDRESSLABELROW_H -#define PIVX_QT_PIVX_ADDRESSLABELROW_H +#ifndef PIVX_QT_ADDRESSLABELROW_H +#define PIVX_QT_ADDRESSLABELROW_H #include @@ -31,4 +31,4 @@ class AddressLabelRow : public QWidget Ui::AddressLabelRow *ui; }; -#endif // PIVX_QT_PIVX_ADDRESSLABELROW_H +#endif // PIVX_QT_ADDRESSLABELROW_H diff --git a/src/qt/askpassphrasedialog.cpp b/src/qt/askpassphrasedialog.cpp index ee0c9c837710f..812cdb575d455 100644 --- a/src/qt/askpassphrasedialog.cpp +++ b/src/qt/askpassphrasedialog.cpp @@ -10,15 +10,15 @@ #include "askpassphrasedialog.h" #include "ui_askpassphrasedialog.h" -#include +#include "defaultdialog.h" #include "guiconstants.h" #include "guiutil.h" +#include "loadingdialog.h" +#include "qtutils.h" #include "walletmodel.h" -#include "qt/pivx/qtutils.h" -#include "qt/pivx/loadingdialog.h" -#include "qt/pivx/defaultdialog.h" +#include #include #include #include diff --git a/src/qt/askpassphrasedialog.h b/src/qt/askpassphrasedialog.h index bb2abd426405f..53e792af76a78 100644 --- a/src/qt/askpassphrasedialog.h +++ b/src/qt/askpassphrasedialog.h @@ -6,10 +6,10 @@ #ifndef PIVX_QT_ASKPASSPHRASEDIALOG_H #define PIVX_QT_ASKPASSPHRASEDIALOG_H -#include -#include "qt/pivx/prunnable.h" +#include "prunnable.h" #include "support/allocators/secure.h" #include +#include class WalletModel; class PIVXGUI; diff --git a/src/qt/pivx/balancebubble.cpp b/src/qt/balancebubble.cpp similarity index 95% rename from src/qt/pivx/balancebubble.cpp rename to src/qt/balancebubble.cpp index dad5b9c619246..a5ac7c4a36791 100644 --- a/src/qt/pivx/balancebubble.cpp +++ b/src/qt/balancebubble.cpp @@ -2,10 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or https://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/balancebubble.h" -#include "qt/pivx/forms/ui_balancebubble.h" +#include "balancebubble.h" +#include "ui_balancebubble.h" -#include "qt/pivx/qtutils.h" +#include "qtutils.h" #include #include diff --git a/src/qt/pivx/balancebubble.h b/src/qt/balancebubble.h similarity index 86% rename from src/qt/pivx/balancebubble.h rename to src/qt/balancebubble.h index e74ae719bd8f7..daaddd3cbf20c 100644 --- a/src/qt/pivx/balancebubble.h +++ b/src/qt/balancebubble.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or https://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_BALANCEBUBBLE_H -#define PIVX_QT_PIVX_BALANCEBUBBLE_H +#ifndef PIVX_QT_BALANCEBUBBLE_H +#define PIVX_QT_BALANCEBUBBLE_H #include #include @@ -32,4 +32,4 @@ public Q_SLOTS: QTimer* hideTimer{nullptr}; }; -#endif // PIVX_QT_PIVX_BALANCEBUBBLE_H +#endif // PIVX_QT_BALANCEBUBBLE_H diff --git a/src/qt/coincontroldialog.cpp b/src/qt/coincontroldialog.cpp index 7d6b3bbf9f7f4..7ae70b06713d7 100644 --- a/src/qt/coincontroldialog.cpp +++ b/src/qt/coincontroldialog.cpp @@ -18,7 +18,7 @@ #include "wallet/wallet.h" #include "walletmodel.h" -#include "qt/pivx/qtutils.h" +#include "qtutils.h" #include #include diff --git a/src/qt/coincontroldialog.h b/src/qt/coincontroldialog.h index ca3ecc375a553..051272c037956 100644 --- a/src/qt/coincontroldialog.h +++ b/src/qt/coincontroldialog.h @@ -7,8 +7,8 @@ #define PIVX_QT_COINCONTROLDIALOG_H #include "amount.h" -#include "qt/pivx/snackbar.h" #include "optional.h" +#include "snackbar.h" #include "uint256.h" #include diff --git a/src/qt/pivx/coldstakingmodel.cpp b/src/qt/coldstakingmodel.cpp similarity index 99% rename from src/qt/pivx/coldstakingmodel.cpp rename to src/qt/coldstakingmodel.cpp index 65b8297e4d3fe..7178b68e5cb0a 100644 --- a/src/qt/pivx/coldstakingmodel.cpp +++ b/src/qt/coldstakingmodel.cpp @@ -2,12 +2,12 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/coldstakingmodel.h" -#include "uint256.h" +#include "coldstakingmodel.h" +#include "addressbook.h" #include "bitcoinunits.h" #include "guiutil.h" +#include "uint256.h" #include -#include "addressbook.h" ColdStakingModel::ColdStakingModel(WalletModel* _model, TransactionTableModel* _tableModel, diff --git a/src/qt/pivx/coldstakingmodel.h b/src/qt/coldstakingmodel.h similarity index 95% rename from src/qt/pivx/coldstakingmodel.h rename to src/qt/coldstakingmodel.h index 554116ca10a51..681e220ec5bdb 100644 --- a/src/qt/pivx/coldstakingmodel.h +++ b/src/qt/coldstakingmodel.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_COLDSTAKINGMODEL_H -#define PIVX_QT_PIVX_COLDSTAKINGMODEL_H +#ifndef PIVX_QT_COLDSTAKINGMODEL_H +#define PIVX_QT_COLDSTAKINGMODEL_H #include #include "amount.h" @@ -89,4 +89,4 @@ public Q_SLOTS: bool parseCSDelegation(const CTxOut& out, CSDelegation& ret, const QString& txId, const int utxoIndex); }; -#endif // PIVX_QT_PIVX_COLDSTAKINGMODEL_H +#endif // PIVX_QT_COLDSTAKINGMODEL_H diff --git a/src/qt/pivx/coldstakingwidget.cpp b/src/qt/coldstakingwidget.cpp similarity index 98% rename from src/qt/pivx/coldstakingwidget.cpp rename to src/qt/coldstakingwidget.cpp index cadb9263f4660..c7414a8b83b15 100644 --- a/src/qt/pivx/coldstakingwidget.cpp +++ b/src/qt/coldstakingwidget.cpp @@ -2,22 +2,23 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/coldstakingwidget.h" -#include "qt/pivx/forms/ui_coldstakingwidget.h" -#include "qt/pivx/qtutils.h" +#include "coldstakingwidget.h" +#include "ui_coldstakingwidget.h" + +#include "addnewcontactdialog.h" #include "amount.h" +#include "coincontrol.h" +#include "coincontroldialog.h" +#include "csrow.h" +#include "furlistrow.h" +#include "guitransactionsutils.h" #include "guiutil.h" -#include "qt/pivx/requestdialog.h" -#include "qt/pivx/tooltipmenu.h" -#include "qt/pivx/furlistrow.h" -#include "qt/pivx/sendconfirmdialog.h" -#include "qt/pivx/addnewcontactdialog.h" -#include "qt/pivx/guitransactionsutils.h" -#include "walletmodel.h" #include "optionsmodel.h" -#include "coincontroldialog.h" -#include "coincontrol.h" -#include "qt/pivx/csrow.h" +#include "qtutils.h" +#include "requestdialog.h" +#include "sendconfirmdialog.h" +#include "tooltipmenu.h" +#include "walletmodel.h" #define DECORATION_SIZE 70 #define NUM_ITEMS 3 diff --git a/src/qt/pivx/coldstakingwidget.h b/src/qt/coldstakingwidget.h similarity index 89% rename from src/qt/pivx/coldstakingwidget.h rename to src/qt/coldstakingwidget.h index c02c49b6d4951..84e7843eaf185 100644 --- a/src/qt/pivx/coldstakingwidget.h +++ b/src/qt/coldstakingwidget.h @@ -2,21 +2,21 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_COLDSTAKINGWIDGET_H -#define PIVX_QT_PIVX_COLDSTAKINGWIDGET_H - -#include "qt/pivx/pwidget.h" -#include "qt/pivx/furabstractlistitemdelegate.h" -#include "qt/pivx/txviewholder.h" -#include "qt/pivx/tooltipmenu.h" -#include "qt/pivx/sendmultirow.h" -#include "qt/pivx/coldstakingmodel.h" -#include "qt/pivx/contactsdropdown.h" -#include "qt/pivx/addressholder.h" -#include "transactiontablemodel.h" -#include "addresstablemodel.h" +#ifndef PIVX_QT_COLDSTAKINGWIDGET_H +#define PIVX_QT_COLDSTAKINGWIDGET_H + #include "addressfilterproxymodel.h" +#include "addressholder.h" +#include "addresstablemodel.h" #include "coincontroldialog.h" +#include "coldstakingmodel.h" +#include "contactsdropdown.h" +#include "furabstractlistitemdelegate.h" +#include "pwidget.h" +#include "sendmultirow.h" +#include "tooltipmenu.h" +#include "transactiontablemodel.h" +#include "txviewholder.h" #include #include @@ -128,4 +128,4 @@ private Q_SLOTS: void setCoinControlPayAmounts(); }; -#endif // PIVX_QT_PIVX_COLDSTAKINGWIDGET_H +#endif // PIVX_QT_COLDSTAKINGWIDGET_H diff --git a/src/qt/pivx/contactdropdownrow.cpp b/src/qt/contactdropdownrow.cpp similarity index 91% rename from src/qt/pivx/contactdropdownrow.cpp rename to src/qt/contactdropdownrow.cpp index ff9efbaab3dbc..567c559000b55 100644 --- a/src/qt/pivx/contactdropdownrow.cpp +++ b/src/qt/contactdropdownrow.cpp @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/contactdropdownrow.h" -#include "qt/pivx/forms/ui_contactdropdownrow.h" +#include "contactdropdownrow.h" +#include "ui_contactdropdownrow.h" ContactDropdownRow::ContactDropdownRow(QWidget *parent) : QWidget(parent), diff --git a/src/qt/pivx/contactdropdownrow.h b/src/qt/contactdropdownrow.h similarity index 82% rename from src/qt/pivx/contactdropdownrow.h rename to src/qt/contactdropdownrow.h index 6d6f3d58f870c..e78729ccab7b5 100644 --- a/src/qt/pivx/contactdropdownrow.h +++ b/src/qt/contactdropdownrow.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_CONTACTDROPDOWNROW_H -#define PIVX_QT_PIVX_CONTACTDROPDOWNROW_H +#ifndef PIVX_QT_CONTACTDROPDOWNROW_H +#define PIVX_QT_CONTACTDROPDOWNROW_H #include @@ -27,4 +27,4 @@ class ContactDropdownRow : public QWidget Ui::ContactDropdownRow *ui; }; -#endif // PIVX_QT_PIVX_CONTACTDROPDOWNROW_H +#endif // PIVX_QT_CONTACTDROPDOWNROW_H diff --git a/src/qt/pivx/contactsdropdown.cpp b/src/qt/contactsdropdown.cpp similarity index 96% rename from src/qt/pivx/contactsdropdown.cpp rename to src/qt/contactsdropdown.cpp index ca04c81793fda..30c30be3746c7 100644 --- a/src/qt/pivx/contactsdropdown.cpp +++ b/src/qt/contactsdropdown.cpp @@ -2,16 +2,16 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/contactsdropdown.h" +#include "contactsdropdown.h" +#include "addresslabelrow.h" +#include "addresstablemodel.h" +#include "contactdropdownrow.h" +#include "furlistrow.h" +#include "qtutils.h" +#include "walletmodel.h" #include #include -#include "qt/pivx/addresslabelrow.h" -#include "qt/pivx/contactdropdownrow.h" -#include "qt/pivx/qtutils.h" -#include "qt/pivx/furlistrow.h" -#include "walletmodel.h" -#include "addresstablemodel.h" #define DECORATION_SIZE 70 #define NUM_ITEMS 2 diff --git a/src/qt/pivx/contactsdropdown.h b/src/qt/contactsdropdown.h similarity index 81% rename from src/qt/pivx/contactsdropdown.h rename to src/qt/contactsdropdown.h index da2a82d49ac42..108741ea52b9d 100644 --- a/src/qt/pivx/contactsdropdown.h +++ b/src/qt/contactsdropdown.h @@ -2,14 +2,14 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_CONTACTSDROPDOWN_H -#define PIVX_QT_PIVX_CONTACTSDROPDOWN_H +#ifndef PIVX_QT_CONTACTSDROPDOWN_H +#define PIVX_QT_CONTACTSDROPDOWN_H +#include "addressfilterproxymodel.h" #include "addresstablemodel.h" -#include "qt/pivx/pwidget.h" -#include "qt/pivx/contactdropdownrow.h" -#include "qt/pivx/furabstractlistitemdelegate.h" -#include "qt/pivx/addressfilterproxymodel.h" +#include "contactdropdownrow.h" +#include "furabstractlistitemdelegate.h" +#include "pwidget.h" #include #include #include @@ -49,4 +49,4 @@ private Q_SLOTS: void handleClick(const QModelIndex &index); }; -#endif // PIVX_QT_PIVX_CONTACTSDROPDOWN_H +#endif // PIVX_QT_CONTACTSDROPDOWN_H diff --git a/src/qt/pivx/createproposaldialog.cpp b/src/qt/createproposaldialog.cpp similarity index 98% rename from src/qt/pivx/createproposaldialog.cpp rename to src/qt/createproposaldialog.cpp index cd8b0abb1dfc2..1f1ba405941a1 100644 --- a/src/qt/pivx/createproposaldialog.cpp +++ b/src/qt/createproposaldialog.cpp @@ -2,14 +2,14 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or https://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/createproposaldialog.h" -#include "qt/pivx/forms/ui_createproposaldialog.h" - -#include "qt/pivx/contactsdropdown.h" -#include "qt/pivx/governancemodel.h" -#include "qt/pivx/pwidget.h" -#include "qt/pivx/qtutils.h" -#include "qt/pivx/snackbar.h" +#include "createproposaldialog.h" +#include "ui_createproposaldialog.h" + +#include "contactsdropdown.h" +#include "governancemodel.h" +#include "pwidget.h" +#include "qtutils.h" +#include "snackbar.h" void initPageIndexBtn(QPushButton* btn) { diff --git a/src/qt/pivx/createproposaldialog.h b/src/qt/createproposaldialog.h similarity index 92% rename from src/qt/pivx/createproposaldialog.h rename to src/qt/createproposaldialog.h index 79313d2f68e97..cbabcdc2d557c 100644 --- a/src/qt/pivx/createproposaldialog.h +++ b/src/qt/createproposaldialog.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or https://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_CREATEPROPOSALDIALOG_H -#define PIVX_QT_PIVX_CREATEPROPOSALDIALOG_H +#ifndef PIVX_QT_CREATEPROPOSALDIALOG_H +#define PIVX_QT_CREATEPROPOSALDIALOG_H #include @@ -64,4 +64,4 @@ public Q_SLOTS: void inform(const QString& text); }; -#endif // PIVX_QT_PIVX_CREATEPROPOSALDIALOG_H +#endif // PIVX_QT_CREATEPROPOSALDIALOG_H diff --git a/src/qt/pivx/csrow.cpp b/src/qt/csrow.cpp similarity index 96% rename from src/qt/pivx/csrow.cpp rename to src/qt/csrow.cpp index abf31cf4e439b..80a9fb201ebdb 100644 --- a/src/qt/pivx/csrow.cpp +++ b/src/qt/csrow.cpp @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/csrow.h" -#include "qt/pivx/forms/ui_csrow.h" +#include "csrow.h" +#include "ui_csrow.h" CSRow::CSRow(QWidget *parent) : QWidget(parent), diff --git a/src/qt/pivx/csrow.h b/src/qt/csrow.h similarity index 89% rename from src/qt/pivx/csrow.h rename to src/qt/csrow.h index 56f441a9f3ce7..217957c25f8d6 100644 --- a/src/qt/pivx/csrow.h +++ b/src/qt/csrow.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_CSROW_H -#define PIVX_QT_PIVX_CSROW_H +#ifndef PIVX_QT_CSROW_H +#define PIVX_QT_CSROW_H #include @@ -32,4 +32,4 @@ class CSRow : public QWidget bool fShowMenuButton = true; }; -#endif // PIVX_QT_PIVX_CSROW_H +#endif // PIVX_QT_CSROW_H diff --git a/src/qt/pivx/dashboardwidget.cpp b/src/qt/dashboardwidget.cpp similarity index 99% rename from src/qt/pivx/dashboardwidget.cpp rename to src/qt/dashboardwidget.cpp index ebcea027b4e52..1c0b8bb118eeb 100644 --- a/src/qt/pivx/dashboardwidget.cpp +++ b/src/qt/dashboardwidget.cpp @@ -2,19 +2,20 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/dashboardwidget.h" -#include "qt/pivx/forms/ui_dashboardwidget.h" -#include "qt/pivx/sendconfirmdialog.h" -#include "qt/pivx/txrow.h" -#include "qt/pivx/qtutils.h" -#include "guiutil.h" +#include "dashboardwidget.h" +#include "ui_dashboardwidget.h" + #include "clientmodel.h" +#include "guiutil.h" #include "optionsmodel.h" +#include "qtutils.h" +#include "sendconfirmdialog.h" +#include "txrow.h" #include "utiltime.h" -#include -#include -#include #include +#include +#include +#include #define DECORATION_SIZE 65 #define NUM_ITEMS 3 diff --git a/src/qt/pivx/dashboardwidget.h b/src/qt/dashboardwidget.h similarity index 94% rename from src/qt/pivx/dashboardwidget.h rename to src/qt/dashboardwidget.h index 2d76084510b8c..fa1c0896888a3 100644 --- a/src/qt/pivx/dashboardwidget.h +++ b/src/qt/dashboardwidget.h @@ -2,15 +2,15 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_DASHBOARDWIDGET_H -#define PIVX_QT_PIVX_DASHBOARDWIDGET_H +#ifndef PIVX_QT_DASHBOARDWIDGET_H +#define PIVX_QT_DASHBOARDWIDGET_H -#include "qt/pivx/pwidget.h" -#include "qt/pivx/furabstractlistitemdelegate.h" -#include "qt/pivx/furlistrow.h" -#include "transactiontablemodel.h" -#include "qt/pivx/txviewholder.h" +#include "furabstractlistitemdelegate.h" +#include "furlistrow.h" +#include "pwidget.h" #include "transactionfilterproxy.h" +#include "transactiontablemodel.h" +#include "txviewholder.h" #include #include @@ -191,4 +191,4 @@ private Q_SLOTS: }; -#endif // PIVX_QT_PIVX_DASHBOARDWIDGET_H +#endif // PIVX_QT_DASHBOARDWIDGET_H diff --git a/src/qt/pivx/defaultdialog.cpp b/src/qt/defaultdialog.cpp similarity index 95% rename from src/qt/pivx/defaultdialog.cpp rename to src/qt/defaultdialog.cpp index 06035ecc6217f..3401a57a1e292 100644 --- a/src/qt/pivx/defaultdialog.cpp +++ b/src/qt/defaultdialog.cpp @@ -2,8 +2,9 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/defaultdialog.h" -#include "qt/pivx/forms/ui_defaultdialog.h" +#include "defaultdialog.h" +#include "ui_defaultdialog.h" + #include "guiutil.h" DefaultDialog::DefaultDialog(QWidget *parent) : diff --git a/src/qt/pivx/defaultdialog.h b/src/qt/defaultdialog.h similarity index 80% rename from src/qt/pivx/defaultdialog.h rename to src/qt/defaultdialog.h index e583af386fc2f..02d84ba27b008 100644 --- a/src/qt/pivx/defaultdialog.h +++ b/src/qt/defaultdialog.h @@ -2,10 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_DEFAULTDIALOG_H -#define PIVX_QT_PIVX_DEFAULTDIALOG_H +#ifndef PIVX_QT_DEFAULTDIALOG_H +#define PIVX_QT_DEFAULTDIALOG_H -#include "qt/pivx/focuseddialog.h" +#include "focuseddialog.h" namespace Ui { class DefaultDialog; @@ -30,4 +30,4 @@ public Q_SLOTS: Ui::DefaultDialog *ui; }; -#endif // PIVX_QT_PIVX_DEFAULTDIALOG_H +#endif // PIVX_QT_DEFAULTDIALOG_H diff --git a/src/qt/pivx/expandablebutton.cpp b/src/qt/expandablebutton.cpp similarity index 95% rename from src/qt/pivx/expandablebutton.cpp rename to src/qt/expandablebutton.cpp index 1f3a4e1fb91c6..1ab675600955a 100644 --- a/src/qt/pivx/expandablebutton.cpp +++ b/src/qt/expandablebutton.cpp @@ -2,9 +2,11 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/expandablebutton.h" -#include "qt/pivx/forms/ui_expandablebutton.h" -#include "qt/pivx/qtutils.h" +#include "expandablebutton.h" +#include "ui_expandablebutton.h" + +#include "qtutils.h" + #include #include #include diff --git a/src/qt/pivx/expandablebutton.h b/src/qt/expandablebutton.h similarity index 92% rename from src/qt/pivx/expandablebutton.h rename to src/qt/expandablebutton.h index ad0a78f0ef264..6c2cd67ee986e 100644 --- a/src/qt/pivx/expandablebutton.h +++ b/src/qt/expandablebutton.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_EXPANDABLEBUTTON_H -#define PIVX_QT_PIVX_EXPANDABLEBUTTON_H +#ifndef PIVX_QT_EXPANDABLEBUTTON_H +#define PIVX_QT_EXPANDABLEBUTTON_H #include #include @@ -69,4 +69,4 @@ private Q_SLOTS: bool keepExpanded = false; }; -#endif // PIVX_QT_PIVX_EXPANDABLEBUTTON_H +#endif // PIVX_QT_EXPANDABLEBUTTON_H diff --git a/src/qt/pivx/focuseddialog.cpp b/src/qt/focuseddialog.cpp similarity index 95% rename from src/qt/pivx/focuseddialog.cpp rename to src/qt/focuseddialog.cpp index fe52b56136817..c3049062fc629 100644 --- a/src/qt/pivx/focuseddialog.cpp +++ b/src/qt/focuseddialog.cpp @@ -2,7 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/focuseddialog.h" +#include "focuseddialog.h" + #include FocusedDialog::FocusedDialog(QWidget *parent) : diff --git a/src/qt/pivx/focuseddialog.h b/src/qt/focuseddialog.h similarity index 82% rename from src/qt/pivx/focuseddialog.h rename to src/qt/focuseddialog.h index 41a43696ee5c7..fb0d8b287c59b 100644 --- a/src/qt/pivx/focuseddialog.h +++ b/src/qt/focuseddialog.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_FOCUSEDDIALOG_H -#define PIVX_QT_PIVX_FOCUSEDDIALOG_H +#ifndef PIVX_QT_FOCUSEDDIALOG_H +#define PIVX_QT_FOCUSEDDIALOG_H #include @@ -23,4 +23,4 @@ class FocusedDialog : public QDialog void keyPressEvent(QKeyEvent *e); }; -#endif // PIVX_QT_PIVX_FOCUSEDDIALOG_H +#endif // PIVX_QT_FOCUSEDDIALOG_H diff --git a/src/qt/pivx/forms/addnewcontactdialog.ui b/src/qt/forms/addnewcontactdialog.ui similarity index 100% rename from src/qt/pivx/forms/addnewcontactdialog.ui rename to src/qt/forms/addnewcontactdialog.ui diff --git a/src/qt/pivx/forms/addresseswidget.ui b/src/qt/forms/addresseswidget.ui similarity index 99% rename from src/qt/pivx/forms/addresseswidget.ui rename to src/qt/forms/addresseswidget.ui index 1ad460afa6103..a1dd96ee83ef1 100644 --- a/src/qt/pivx/forms/addresseswidget.ui +++ b/src/qt/forms/addresseswidget.ui @@ -482,7 +482,7 @@ OptionButton QWidget -
qt/pivx/optionbutton.h
+
qt/optionbutton.h
1 diff --git a/src/qt/pivx/forms/addresslabelrow.ui b/src/qt/forms/addresslabelrow.ui similarity index 100% rename from src/qt/pivx/forms/addresslabelrow.ui rename to src/qt/forms/addresslabelrow.ui diff --git a/src/qt/pivx/forms/balancebubble.ui b/src/qt/forms/balancebubble.ui similarity index 100% rename from src/qt/pivx/forms/balancebubble.ui rename to src/qt/forms/balancebubble.ui diff --git a/src/qt/pivx/forms/coldstakingwidget.ui b/src/qt/forms/coldstakingwidget.ui similarity index 99% rename from src/qt/pivx/forms/coldstakingwidget.ui rename to src/qt/forms/coldstakingwidget.ui index edf7ff0d6b64d..308ca7d3e1d59 100644 --- a/src/qt/pivx/forms/coldstakingwidget.ui +++ b/src/qt/forms/coldstakingwidget.ui @@ -912,7 +912,7 @@ stake on your behalf, while you keep the keys securely offline. OptionButton QWidget -
qt/pivx/optionbutton.h
+
qt/optionbutton.h
1 diff --git a/src/qt/pivx/forms/contactdropdownrow.ui b/src/qt/forms/contactdropdownrow.ui similarity index 100% rename from src/qt/pivx/forms/contactdropdownrow.ui rename to src/qt/forms/contactdropdownrow.ui diff --git a/src/qt/pivx/forms/createproposaldialog.ui b/src/qt/forms/createproposaldialog.ui similarity index 100% rename from src/qt/pivx/forms/createproposaldialog.ui rename to src/qt/forms/createproposaldialog.ui diff --git a/src/qt/pivx/forms/csrow.ui b/src/qt/forms/csrow.ui similarity index 100% rename from src/qt/pivx/forms/csrow.ui rename to src/qt/forms/csrow.ui diff --git a/src/qt/pivx/forms/dashboardwidget.ui b/src/qt/forms/dashboardwidget.ui similarity index 100% rename from src/qt/pivx/forms/dashboardwidget.ui rename to src/qt/forms/dashboardwidget.ui diff --git a/src/qt/pivx/forms/defaultdialog.ui b/src/qt/forms/defaultdialog.ui similarity index 100% rename from src/qt/pivx/forms/defaultdialog.ui rename to src/qt/forms/defaultdialog.ui diff --git a/src/qt/pivx/forms/expandablebutton.ui b/src/qt/forms/expandablebutton.ui similarity index 100% rename from src/qt/pivx/forms/expandablebutton.ui rename to src/qt/forms/expandablebutton.ui diff --git a/src/qt/pivx/forms/governancewidget.ui b/src/qt/forms/governancewidget.ui similarity index 99% rename from src/qt/pivx/forms/governancewidget.ui rename to src/qt/forms/governancewidget.ui index e7deeadbae867..98fe3f1d570b9 100644 --- a/src/qt/pivx/forms/governancewidget.ui +++ b/src/qt/forms/governancewidget.ui @@ -785,7 +785,7 @@ OptionButton QWidget -
qt/pivx/optionbutton.h
+
qt/optionbutton.h
1 diff --git a/src/qt/pivx/forms/loadingdialog.ui b/src/qt/forms/loadingdialog.ui similarity index 100% rename from src/qt/pivx/forms/loadingdialog.ui rename to src/qt/forms/loadingdialog.ui diff --git a/src/qt/pivx/forms/lockunlock.ui b/src/qt/forms/lockunlock.ui similarity index 100% rename from src/qt/pivx/forms/lockunlock.ui rename to src/qt/forms/lockunlock.ui diff --git a/src/qt/pivx/forms/masternodeswidget.ui b/src/qt/forms/masternodeswidget.ui similarity index 99% rename from src/qt/pivx/forms/masternodeswidget.ui rename to src/qt/forms/masternodeswidget.ui index ba26e0558b308..1863964551f81 100644 --- a/src/qt/pivx/forms/masternodeswidget.ui +++ b/src/qt/forms/masternodeswidget.ui @@ -390,7 +390,7 @@ and vote on the treasury system receiving a periodic reward. OptionButton QWidget -
qt/pivx/optionbutton.h
+
qt/optionbutton.h
1 diff --git a/src/qt/pivx/forms/masternodewizarddialog.ui b/src/qt/forms/masternodewizarddialog.ui similarity index 100% rename from src/qt/pivx/forms/masternodewizarddialog.ui rename to src/qt/forms/masternodewizarddialog.ui diff --git a/src/qt/pivx/forms/mninfodialog.ui b/src/qt/forms/mninfodialog.ui similarity index 100% rename from src/qt/pivx/forms/mninfodialog.ui rename to src/qt/forms/mninfodialog.ui diff --git a/src/qt/pivx/forms/mnrow.ui b/src/qt/forms/mnrow.ui similarity index 100% rename from src/qt/pivx/forms/mnrow.ui rename to src/qt/forms/mnrow.ui diff --git a/src/qt/pivx/forms/mnselectiondialog.ui b/src/qt/forms/mnselectiondialog.ui similarity index 100% rename from src/qt/pivx/forms/mnselectiondialog.ui rename to src/qt/forms/mnselectiondialog.ui diff --git a/src/qt/pivx/forms/myaddressrow.ui b/src/qt/forms/myaddressrow.ui similarity index 100% rename from src/qt/pivx/forms/myaddressrow.ui rename to src/qt/forms/myaddressrow.ui diff --git a/src/qt/pivx/forms/navmenuwidget.ui b/src/qt/forms/navmenuwidget.ui similarity index 100% rename from src/qt/pivx/forms/navmenuwidget.ui rename to src/qt/forms/navmenuwidget.ui diff --git a/src/qt/pivx/forms/optionbutton.ui b/src/qt/forms/optionbutton.ui similarity index 100% rename from src/qt/pivx/forms/optionbutton.ui rename to src/qt/forms/optionbutton.ui diff --git a/src/qt/pivx/forms/proposalcard.ui b/src/qt/forms/proposalcard.ui similarity index 100% rename from src/qt/pivx/forms/proposalcard.ui rename to src/qt/forms/proposalcard.ui diff --git a/src/qt/pivx/forms/proposalinfodialog.ui b/src/qt/forms/proposalinfodialog.ui similarity index 100% rename from src/qt/pivx/forms/proposalinfodialog.ui rename to src/qt/forms/proposalinfodialog.ui diff --git a/src/qt/pivx/forms/receivedialog.ui b/src/qt/forms/receivedialog.ui similarity index 100% rename from src/qt/pivx/forms/receivedialog.ui rename to src/qt/forms/receivedialog.ui diff --git a/src/qt/pivx/forms/receivewidget.ui b/src/qt/forms/receivewidget.ui similarity index 99% rename from src/qt/pivx/forms/receivewidget.ui rename to src/qt/forms/receivewidget.ui index acbf0929f672d..0d272d4575f19 100644 --- a/src/qt/pivx/forms/receivewidget.ui +++ b/src/qt/forms/receivewidget.ui @@ -606,7 +606,7 @@ OptionButton QWidget -
qt/pivx/optionbutton.h
+
qt/optionbutton.h
1 diff --git a/src/qt/pivx/forms/requestdialog.ui b/src/qt/forms/requestdialog.ui similarity index 100% rename from src/qt/pivx/forms/requestdialog.ui rename to src/qt/forms/requestdialog.ui diff --git a/src/qt/pivx/forms/send.ui b/src/qt/forms/send.ui similarity index 99% rename from src/qt/pivx/forms/send.ui rename to src/qt/forms/send.ui index 9bee888acfcac..915ab0a4f47de 100644 --- a/src/qt/pivx/forms/send.ui +++ b/src/qt/forms/send.ui @@ -834,7 +834,7 @@ padding-top:2px; OptionButton QWidget -
qt/pivx/optionbutton.h
+
qt/optionbutton.h
1 diff --git a/src/qt/pivx/forms/sendchangeaddressdialog.ui b/src/qt/forms/sendchangeaddressdialog.ui similarity index 100% rename from src/qt/pivx/forms/sendchangeaddressdialog.ui rename to src/qt/forms/sendchangeaddressdialog.ui diff --git a/src/qt/pivx/forms/sendconfirmdialog.ui b/src/qt/forms/sendconfirmdialog.ui similarity index 100% rename from src/qt/pivx/forms/sendconfirmdialog.ui rename to src/qt/forms/sendconfirmdialog.ui diff --git a/src/qt/pivx/forms/sendcustomfeedialog.ui b/src/qt/forms/sendcustomfeedialog.ui similarity index 100% rename from src/qt/pivx/forms/sendcustomfeedialog.ui rename to src/qt/forms/sendcustomfeedialog.ui diff --git a/src/qt/pivx/forms/sendmemodialog.ui b/src/qt/forms/sendmemodialog.ui similarity index 100% rename from src/qt/pivx/forms/sendmemodialog.ui rename to src/qt/forms/sendmemodialog.ui diff --git a/src/qt/pivx/forms/sendmultirow.ui b/src/qt/forms/sendmultirow.ui similarity index 100% rename from src/qt/pivx/forms/sendmultirow.ui rename to src/qt/forms/sendmultirow.ui diff --git a/src/qt/pivx/forms/snackbar.ui b/src/qt/forms/snackbar.ui similarity index 100% rename from src/qt/pivx/forms/snackbar.ui rename to src/qt/forms/snackbar.ui diff --git a/src/qt/pivx/forms/splash.ui b/src/qt/forms/splash.ui similarity index 100% rename from src/qt/pivx/forms/splash.ui rename to src/qt/forms/splash.ui diff --git a/src/qt/pivx/forms/tooltipmenu.ui b/src/qt/forms/tooltipmenu.ui similarity index 100% rename from src/qt/pivx/forms/tooltipmenu.ui rename to src/qt/forms/tooltipmenu.ui diff --git a/src/qt/pivx/forms/topbar.ui b/src/qt/forms/topbar.ui similarity index 99% rename from src/qt/pivx/forms/topbar.ui rename to src/qt/forms/topbar.ui index c1f214d2ad9a1..3da9b3d7376f4 100644 --- a/src/qt/pivx/forms/topbar.ui +++ b/src/qt/forms/topbar.ui @@ -738,13 +738,13 @@ border:none; ExpandableButton QWidget -
qt/pivx/expandablebutton.h
+
qt/expandablebutton.h
1 PFBorderImage QFrame -
qt/pivx/pfborderimage.h
+
qt/pfborderimage.h
1 diff --git a/src/qt/pivx/forms/txrow.ui b/src/qt/forms/txrow.ui similarity index 100% rename from src/qt/pivx/forms/txrow.ui rename to src/qt/forms/txrow.ui diff --git a/src/qt/pivx/forms/votedialog.ui b/src/qt/forms/votedialog.ui similarity index 100% rename from src/qt/pivx/forms/votedialog.ui rename to src/qt/forms/votedialog.ui diff --git a/src/qt/pivx/forms/welcomecontentwidget.ui b/src/qt/forms/welcomecontentwidget.ui similarity index 99% rename from src/qt/pivx/forms/welcomecontentwidget.ui rename to src/qt/forms/welcomecontentwidget.ui index 083879050ca61..a2056be059d8a 100644 --- a/src/qt/pivx/forms/welcomecontentwidget.ui +++ b/src/qt/forms/welcomecontentwidget.ui @@ -1181,7 +1181,7 @@ PFBorderImage QFrame -
qt/pivx/pfborderimage.h
+
qt/pfborderimage.h
1 diff --git a/src/qt/pivx/furabstractlistitemdelegate.cpp b/src/qt/furabstractlistitemdelegate.cpp similarity index 96% rename from src/qt/pivx/furabstractlistitemdelegate.cpp rename to src/qt/furabstractlistitemdelegate.cpp index c69b5aace8f89..a1c469f1b97f3 100644 --- a/src/qt/pivx/furabstractlistitemdelegate.cpp +++ b/src/qt/furabstractlistitemdelegate.cpp @@ -2,7 +2,7 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/furabstractlistitemdelegate.h" +#include "furabstractlistitemdelegate.h" FurAbstractListItemDelegate::FurAbstractListItemDelegate(int _rowHeight, FurListRow<> *_row, QObject *parent) : QAbstractItemDelegate(parent), rowHeight(_rowHeight), row(_row){} diff --git a/src/qt/pivx/furabstractlistitemdelegate.h b/src/qt/furabstractlistitemdelegate.h similarity index 82% rename from src/qt/pivx/furabstractlistitemdelegate.h rename to src/qt/furabstractlistitemdelegate.h index 6050e44c38e31..83b7fa2572e17 100644 --- a/src/qt/pivx/furabstractlistitemdelegate.h +++ b/src/qt/furabstractlistitemdelegate.h @@ -2,10 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_FURABSTRACTLISTITEMDELEGATE_H -#define PIVX_QT_PIVX_FURABSTRACTLISTITEMDELEGATE_H +#ifndef PIVX_QT_FURABSTRACTLISTITEMDELEGATE_H +#define PIVX_QT_FURABSTRACTLISTITEMDELEGATE_H -#include "qt/pivx/furlistrow.h" +#include "furlistrow.h" #include #include @@ -36,4 +36,4 @@ class FurAbstractListItemDelegate : public QAbstractItemDelegate }; -#endif // PIVX_QT_PIVX_FURABSTRACTLISTITEMDELEGATE_H +#endif // PIVX_QT_FURABSTRACTLISTITEMDELEGATE_H diff --git a/src/qt/pivx/furlistrow.h b/src/qt/furlistrow.h similarity index 85% rename from src/qt/pivx/furlistrow.h rename to src/qt/furlistrow.h index 66401b70d3243..e2a017f257f2d 100644 --- a/src/qt/pivx/furlistrow.h +++ b/src/qt/furlistrow.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_FURLISTROW_H -#define PIVX_QT_PIVX_FURLISTROW_H +#ifndef PIVX_QT_FURLISTROW_H +#define PIVX_QT_FURLISTROW_H #include #include @@ -28,4 +28,4 @@ class FurListRow{ } }; -#endif // PIVX_QT_PIVX_FURLISTROW_H +#endif // PIVX_QT_FURLISTROW_H diff --git a/src/qt/pivx/governancemodel.cpp b/src/qt/governancemodel.cpp similarity index 99% rename from src/qt/pivx/governancemodel.cpp rename to src/qt/governancemodel.cpp index f9d0721288da1..510418f75dfb0 100644 --- a/src/qt/pivx/governancemodel.cpp +++ b/src/qt/governancemodel.cpp @@ -2,15 +2,15 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or https://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/governancemodel.h" +#include "governancemodel.h" #include "budget/budgetmanager.h" #include "budget/budgetutil.h" #include "destination_io.h" #include "guiconstants.h" -#include "qt/transactiontablemodel.h" +#include "mnmodel.h" #include "qt/transactionrecord.h" -#include "qt/pivx/mnmodel.h" +#include "qt/transactiontablemodel.h" #include "tiertwo/tiertwo_sync_state.h" #include "utilmoneystr.h" #include "utilstrencodings.h" diff --git a/src/qt/pivx/governancemodel.h b/src/qt/governancemodel.h similarity index 98% rename from src/qt/pivx/governancemodel.h rename to src/qt/governancemodel.h index 2a362a5504d53..e14255f6ce88f 100644 --- a/src/qt/pivx/governancemodel.h +++ b/src/qt/governancemodel.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or https://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_GOVERNANCEMODEL_H -#define PIVX_QT_PIVX_GOVERNANCEMODEL_H +#ifndef PIVX_QT_GOVERNANCEMODEL_H +#define PIVX_QT_GOVERNANCEMODEL_H #include "clientmodel.h" #include "operationresult.h" @@ -165,4 +165,4 @@ public Q_SLOTS: ProposalInfo buildProposalInfo(const CBudgetProposal* prop, bool isPassing, bool isPending); }; -#endif // PIVX_QT_PIVX_GOVERNANCEMODEL_H +#endif // PIVX_QT_GOVERNANCEMODEL_H diff --git a/src/qt/pivx/governancewidget.cpp b/src/qt/governancewidget.cpp similarity index 98% rename from src/qt/pivx/governancewidget.cpp rename to src/qt/governancewidget.cpp index cf6f91803ca5d..738f6bf5d2e67 100644 --- a/src/qt/pivx/governancewidget.cpp +++ b/src/qt/governancewidget.cpp @@ -2,15 +2,15 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/governancewidget.h" -#include "qt/pivx/forms/ui_governancewidget.h" - -#include "qt/pivx/createproposaldialog.h" -#include "qt/pivx/governancemodel.h" -#include "qt/pivx/mnmodel.h" -#include "qt/pivx/proposalinfodialog.h" -#include "qt/pivx/qtutils.h" -#include "qt/pivx/votedialog.h" +#include "governancewidget.h" +#include "ui_governancewidget.h" + +#include "createproposaldialog.h" +#include "governancemodel.h" +#include "mnmodel.h" +#include "proposalinfodialog.h" +#include "qtutils.h" +#include "votedialog.h" #include #include diff --git a/src/qt/pivx/governancewidget.h b/src/qt/governancewidget.h similarity index 93% rename from src/qt/pivx/governancewidget.h rename to src/qt/governancewidget.h index afbe7acb1ccb0..673273047bab7 100644 --- a/src/qt/pivx/governancewidget.h +++ b/src/qt/governancewidget.h @@ -2,11 +2,11 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or https://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_GOVERNANCEWIDGET_H -#define PIVX_QT_PIVX_GOVERNANCEWIDGET_H +#ifndef PIVX_QT_GOVERNANCEWIDGET_H +#define PIVX_QT_GOVERNANCEWIDGET_H -#include "qt/pivx/pwidget.h" -#include "qt/pivx/proposalcard.h" +#include "proposalcard.h" +#include "pwidget.h" #include #include @@ -104,4 +104,4 @@ public Q_SLOTS: int calculateColumnsPerRow(); }; -#endif // PIVX_QT_PIVX_GOVERNANCEWIDGET_H +#endif // PIVX_QT_GOVERNANCEWIDGET_H diff --git a/src/qt/pivx/guitransactionsutils.cpp b/src/qt/guitransactionsutils.cpp similarity index 99% rename from src/qt/pivx/guitransactionsutils.cpp rename to src/qt/guitransactionsutils.cpp index 801ba82199734..53f5e29ba128e 100644 --- a/src/qt/pivx/guitransactionsutils.cpp +++ b/src/qt/guitransactionsutils.cpp @@ -2,7 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/guitransactionsutils.h" +#include "guitransactionsutils.h" + #include "bitcoinunits.h" #include "optionsmodel.h" diff --git a/src/qt/pivx/guitransactionsutils.h b/src/qt/guitransactionsutils.h similarity index 86% rename from src/qt/pivx/guitransactionsutils.h rename to src/qt/guitransactionsutils.h index ac3a44cd5bb30..88e31cf0b985a 100644 --- a/src/qt/pivx/guitransactionsutils.h +++ b/src/qt/guitransactionsutils.h @@ -2,11 +2,11 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_GUITRANSACTIONSUTILS_H -#define PIVX_QT_PIVX_GUITRANSACTIONSUTILS_H +#ifndef PIVX_QT_GUITRANSACTIONSUTILS_H +#define PIVX_QT_GUITRANSACTIONSUTILS_H +#include "pwidget.h" #include "walletmodel.h" -#include "qt/pivx/pwidget.h" namespace GuiTransactionsUtils { @@ -33,4 +33,4 @@ namespace GuiTransactionsUtils { } -#endif // PIVX_QT_PIVX_GUITRANSACTIONSUTILS_H +#endif // PIVX_QT_GUITRANSACTIONSUTILS_H diff --git a/src/qt/intro.cpp b/src/qt/intro.cpp index 996cebd1ddd51..266f76fa535d2 100644 --- a/src/qt/intro.cpp +++ b/src/qt/intro.cpp @@ -14,8 +14,8 @@ #include "fs.h" #include "guiutil.h" +#include "qtutils.h" #include "util/system.h" -#include "qt/pivx/qtutils.h" #include #include diff --git a/src/qt/pivx/loadingdialog.cpp b/src/qt/loadingdialog.cpp similarity index 97% rename from src/qt/pivx/loadingdialog.cpp rename to src/qt/loadingdialog.cpp index 664801172d726..c8265540b0f4f 100644 --- a/src/qt/pivx/loadingdialog.cpp +++ b/src/qt/loadingdialog.cpp @@ -2,8 +2,9 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/loadingdialog.h" -#include "qt/pivx/forms/ui_loadingdialog.h" +#include "loadingdialog.h" +#include "ui_loadingdialog.h" + #include void Worker::process(){ diff --git a/src/qt/pivx/loadingdialog.h b/src/qt/loadingdialog.h similarity index 92% rename from src/qt/pivx/loadingdialog.h rename to src/qt/loadingdialog.h index 39b61a29d6d2d..133899736d8bf 100644 --- a/src/qt/pivx/loadingdialog.h +++ b/src/qt/loadingdialog.h @@ -2,16 +2,16 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_LOADINGDIALOG_H -#define PIVX_QT_PIVX_LOADINGDIALOG_H +#ifndef PIVX_QT_LOADINGDIALOG_H +#define PIVX_QT_LOADINGDIALOG_H +#include "prunnable.h" +#include "qt/walletmodel.h" #include -#include #include -#include +#include #include -#include "qt/pivx/prunnable.h" -#include "qt/walletmodel.h" +#include namespace Ui { class LoadingDialog; @@ -80,4 +80,4 @@ public Q_SLOTS: int loading = 0; }; -#endif // PIVX_QT_PIVX_LOADINGDIALOG_H +#endif // PIVX_QT_LOADINGDIALOG_H diff --git a/src/qt/pivx/lockunlock.cpp b/src/qt/lockunlock.cpp similarity index 97% rename from src/qt/pivx/lockunlock.cpp rename to src/qt/lockunlock.cpp index a2c91b4d1c9ea..8a707758728a7 100644 --- a/src/qt/pivx/lockunlock.cpp +++ b/src/qt/lockunlock.cpp @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/lockunlock.h" -#include "qt/pivx/forms/ui_lockunlock.h" +#include "lockunlock.h" +#include "ui_lockunlock.h" LockUnlock::LockUnlock(QWidget *parent) : QWidget(parent), diff --git a/src/qt/pivx/lockunlock.h b/src/qt/lockunlock.h similarity index 89% rename from src/qt/pivx/lockunlock.h rename to src/qt/lockunlock.h index c1350e0846e05..247c370020082 100644 --- a/src/qt/pivx/lockunlock.h +++ b/src/qt/lockunlock.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_LOCKUNLOCK_H -#define PIVX_QT_PIVX_LOCKUNLOCK_H +#ifndef PIVX_QT_LOCKUNLOCK_H +#define PIVX_QT_LOCKUNLOCK_H #include #include "walletmodel.h" @@ -46,4 +46,4 @@ public Q_SLOTS: bool isOnHover = false; }; -#endif // PIVX_QT_PIVX_LOCKUNLOCK_H +#endif // PIVX_QT_LOCKUNLOCK_H diff --git a/src/qt/pivx/masternodeswidget.cpp b/src/qt/masternodeswidget.cpp similarity index 98% rename from src/qt/pivx/masternodeswidget.cpp rename to src/qt/masternodeswidget.cpp index 24f61e2b02a97..1656a90e9b332 100644 --- a/src/qt/pivx/masternodeswidget.cpp +++ b/src/qt/masternodeswidget.cpp @@ -2,19 +2,19 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/masternodeswidget.h" -#include "coincontrol.h" -#include "qt/pivx/forms/ui_masternodeswidget.h" +#include "masternodeswidget.h" +#include "ui_masternodeswidget.h" -#include "qt/pivx/qtutils.h" -#include "qt/pivx/mnrow.h" -#include "qt/pivx/mninfodialog.h" -#include "qt/pivx/masternodewizarddialog.h" +#include "coincontrol.h" +#include "masternodewizarddialog.h" +#include "mninfodialog.h" +#include "mnrow.h" +#include "qtutils.h" #include "clientmodel.h" #include "guiutil.h" -#include "qt/pivx/mnmodel.h" -#include "qt/pivx/optionbutton.h" +#include "mnmodel.h" +#include "optionbutton.h" #include "qt/walletmodel.h" #define DECORATION_SIZE 65 diff --git a/src/qt/pivx/masternodeswidget.h b/src/qt/masternodeswidget.h similarity index 87% rename from src/qt/pivx/masternodeswidget.h rename to src/qt/masternodeswidget.h index 0eedde2a29ead..891db4b724b69 100644 --- a/src/qt/pivx/masternodeswidget.h +++ b/src/qt/masternodeswidget.h @@ -2,13 +2,13 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_MASTERNODESWIDGET_H -#define PIVX_QT_PIVX_MASTERNODESWIDGET_H +#ifndef PIVX_QT_MASTERNODESWIDGET_H +#define PIVX_QT_MASTERNODESWIDGET_H #include "coincontroldialog.h" -#include "qt/pivx/furabstractlistitemdelegate.h" -#include "qt/pivx/pwidget.h" -#include "qt/pivx/tooltipmenu.h" +#include "furabstractlistitemdelegate.h" +#include "pwidget.h" +#include "tooltipmenu.h" #include @@ -71,4 +71,4 @@ private Q_SLOTS: bool startAll(QString& failedMN, bool onlyMissing); }; -#endif // PIVX_QT_PIVX_MASTERNODESWIDGET_H +#endif // PIVX_QT_MASTERNODESWIDGET_H diff --git a/src/qt/pivx/masternodewizarddialog.cpp b/src/qt/masternodewizarddialog.cpp similarity index 98% rename from src/qt/pivx/masternodewizarddialog.cpp rename to src/qt/masternodewizarddialog.cpp index c13f965bdf085..5aebe9fb770f4 100644 --- a/src/qt/pivx/masternodewizarddialog.cpp +++ b/src/qt/masternodewizarddialog.cpp @@ -2,13 +2,13 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/masternodewizarddialog.h" -#include "qt/pivx/forms/ui_masternodewizarddialog.h" +#include "masternodewizarddialog.h" +#include "ui_masternodewizarddialog.h" #include "key_io.h" -#include "qt/pivx/mnmodel.h" -#include "qt/pivx/qtutils.h" +#include "mnmodel.h" #include "qt/walletmodel.h" +#include "qtutils.h" #include #include diff --git a/src/qt/pivx/masternodewizarddialog.h b/src/qt/masternodewizarddialog.h similarity index 84% rename from src/qt/pivx/masternodewizarddialog.h rename to src/qt/masternodewizarddialog.h index bc20a4d9a4c76..728a55e7c1edb 100644 --- a/src/qt/pivx/masternodewizarddialog.h +++ b/src/qt/masternodewizarddialog.h @@ -2,13 +2,13 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_MASTERNODEWIZARDDIALOG_H -#define PIVX_QT_PIVX_MASTERNODEWIZARDDIALOG_H +#ifndef PIVX_QT_MASTERNODEWIZARDDIALOG_H +#define PIVX_QT_MASTERNODEWIZARDDIALOG_H -#include "qt/pivx/focuseddialog.h" -#include "qt/pivx/snackbar.h" +#include "focuseddialog.h" #include "masternodeconfig.h" -#include "qt/pivx/pwidget.h" +#include "pwidget.h" +#include "snackbar.h" class MNModel; class WalletModel; @@ -51,4 +51,4 @@ private Q_SLOTS: void inform(const QString& text); }; -#endif // PIVX_QT_PIVX_MASTERNODEWIZARDDIALOG_H +#endif // PIVX_QT_MASTERNODEWIZARDDIALOG_H diff --git a/src/qt/pivx/mninfodialog.cpp b/src/qt/mninfodialog.cpp similarity index 96% rename from src/qt/pivx/mninfodialog.cpp rename to src/qt/mninfodialog.cpp index 0364a0d98e449..c9566dab452fd 100644 --- a/src/qt/pivx/mninfodialog.cpp +++ b/src/qt/mninfodialog.cpp @@ -2,11 +2,11 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/mninfodialog.h" -#include "qt/pivx/forms/ui_mninfodialog.h" +#include "mninfodialog.h" +#include "ui_mninfodialog.h" #include "guiutil.h" -#include "qt/pivx/qtutils.h" +#include "qtutils.h" MnInfoDialog::MnInfoDialog(QWidget *parent) : FocusedDialog(parent), diff --git a/src/qt/pivx/mninfodialog.h b/src/qt/mninfodialog.h similarity index 83% rename from src/qt/pivx/mninfodialog.h rename to src/qt/mninfodialog.h index d1aafe80825b8..d756544270dad 100644 --- a/src/qt/pivx/mninfodialog.h +++ b/src/qt/mninfodialog.h @@ -2,11 +2,11 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_MNINFODIALOG_H -#define PIVX_QT_PIVX_MNINFODIALOG_H +#ifndef PIVX_QT_MNINFODIALOG_H +#define PIVX_QT_MNINFODIALOG_H -#include "qt/pivx/focuseddialog.h" -#include "qt/pivx/snackbar.h" +#include "focuseddialog.h" +#include "snackbar.h" class WalletModel; @@ -40,4 +40,4 @@ public Q_SLOTS: void copyInform(const QString& copyStr, const QString& message); }; -#endif // PIVX_QT_PIVX_MNINFODIALOG_H +#endif // PIVX_QT_MNINFODIALOG_H diff --git a/src/qt/pivx/mnmodel.cpp b/src/qt/mnmodel.cpp similarity index 99% rename from src/qt/pivx/mnmodel.cpp rename to src/qt/mnmodel.cpp index 7b8fa1f59dda6..8defec03ea1d6 100644 --- a/src/qt/pivx/mnmodel.cpp +++ b/src/qt/mnmodel.cpp @@ -2,16 +2,16 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/mnmodel.h" +#include "mnmodel.h" #include "coincontrol.h" +#include "guitransactionsutils.h" #include "masternode.h" #include "masternodeman.h" #include "net.h" // for validateMasternodeIP #include "primitives/transaction.h" #include "qt/bitcoinunits.h" #include "qt/optionsmodel.h" -#include "qt/pivx/guitransactionsutils.h" #include "qt/walletmodel.h" #include "qt/walletmodeltransaction.h" #include "tiertwo/tiertwo_sync_state.h" diff --git a/src/qt/pivx/mnmodel.h b/src/qt/mnmodel.h similarity index 97% rename from src/qt/pivx/mnmodel.h rename to src/qt/mnmodel.h index f1525fb3d468c..d9bb68f93bffa 100644 --- a/src/qt/pivx/mnmodel.h +++ b/src/qt/mnmodel.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_MNMODEL_H -#define PIVX_QT_PIVX_MNMODEL_H +#ifndef PIVX_QT_MNMODEL_H +#define PIVX_QT_MNMODEL_H #include #include "masternodeconfig.h" @@ -88,4 +88,4 @@ class MNModel : public QAbstractTableModel QMap collateralTxAccepted; }; -#endif // PIVX_QT_PIVX_MNMODEL_H +#endif // PIVX_QT_MNMODEL_H diff --git a/src/qt/pivx/mnrow.cpp b/src/qt/mnrow.cpp similarity index 91% rename from src/qt/pivx/mnrow.cpp rename to src/qt/mnrow.cpp index 07a23caf1f4ec..55900e595285c 100644 --- a/src/qt/pivx/mnrow.cpp +++ b/src/qt/mnrow.cpp @@ -2,9 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/mnrow.h" -#include "qt/pivx/forms/ui_mnrow.h" -#include "qt/pivx/qtutils.h" +#include "mnrow.h" +#include "ui_mnrow.h" + +#include "qtutils.h" MNRow::MNRow(QWidget *parent) : QWidget(parent), diff --git a/src/qt/pivx/mnrow.h b/src/qt/mnrow.h similarity index 85% rename from src/qt/pivx/mnrow.h rename to src/qt/mnrow.h index 4177615cd8e9f..cd25530f39db3 100644 --- a/src/qt/pivx/mnrow.h +++ b/src/qt/mnrow.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_MNROW_H -#define PIVX_QT_PIVX_MNROW_H +#ifndef PIVX_QT_MNROW_H +#define PIVX_QT_MNROW_H #include @@ -27,4 +27,4 @@ class MNRow : public QWidget Ui::MNRow *ui; }; -#endif // PIVX_QT_PIVX_MNROW_H +#endif // PIVX_QT_MNROW_H diff --git a/src/qt/pivx/mnselectiondialog.cpp b/src/qt/mnselectiondialog.cpp similarity index 98% rename from src/qt/pivx/mnselectiondialog.cpp rename to src/qt/mnselectiondialog.cpp index 1d7bede48911e..b6134bbda77e2 100644 --- a/src/qt/pivx/mnselectiondialog.cpp +++ b/src/qt/mnselectiondialog.cpp @@ -2,10 +2,11 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or https://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/mnselectiondialog.h" -#include "qt/pivx/forms/ui_mnselectiondialog.h" -#include "qt/pivx/mnmodel.h" -#include "qt/pivx/qtutils.h" +#include "mnselectiondialog.h" +#include "ui_mnselectiondialog.h" + +#include "mnmodel.h" +#include "qtutils.h" MnSelectionDialog::MnSelectionDialog(QWidget *parent) : QDialog(parent), diff --git a/src/qt/pivx/mnselectiondialog.h b/src/qt/mnselectiondialog.h similarity index 93% rename from src/qt/pivx/mnselectiondialog.h rename to src/qt/mnselectiondialog.h index 5a6faa0c0ead2..fda9237338f35 100644 --- a/src/qt/pivx/mnselectiondialog.h +++ b/src/qt/mnselectiondialog.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or https://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_MNSELECTIONDIALOG_H -#define PIVX_QT_PIVX_MNSELECTIONDIALOG_H +#ifndef PIVX_QT_MNSELECTIONDIALOG_H +#define PIVX_QT_MNSELECTIONDIALOG_H #include #include @@ -62,4 +62,4 @@ public Q_SLOTS: VoteInfo* ptrVoteInfo); }; -#endif // PIVX_QT_PIVX_MNSELECTIONDIALOG_H +#endif // PIVX_QT_MNSELECTIONDIALOG_H diff --git a/src/qt/pivx/myaddressrow.cpp b/src/qt/myaddressrow.cpp similarity index 92% rename from src/qt/pivx/myaddressrow.cpp rename to src/qt/myaddressrow.cpp index 9ba8afad0737c..61f1cce018ebb 100644 --- a/src/qt/pivx/myaddressrow.cpp +++ b/src/qt/myaddressrow.cpp @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/myaddressrow.h" -#include "qt/pivx/forms/ui_myaddressrow.h" +#include "myaddressrow.h" +#include "ui_myaddressrow.h" MyAddressRow::MyAddressRow(QWidget *parent) : QWidget(parent), diff --git a/src/qt/pivx/myaddressrow.h b/src/qt/myaddressrow.h similarity index 82% rename from src/qt/pivx/myaddressrow.h rename to src/qt/myaddressrow.h index 2e5a552f01ad1..f72ecf068aa38 100644 --- a/src/qt/pivx/myaddressrow.h +++ b/src/qt/myaddressrow.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_MYADDRESSROW_H -#define PIVX_QT_PIVX_MYADDRESSROW_H +#ifndef PIVX_QT_MYADDRESSROW_H +#define PIVX_QT_MYADDRESSROW_H #include @@ -25,4 +25,4 @@ class MyAddressRow : public QWidget Ui::MyAddressRow *ui; }; -#endif // PIVX_QT_PIVX_MYADDRESSROW_H +#endif // PIVX_QT_MYADDRESSROW_H diff --git a/src/qt/pivx/navmenuwidget.cpp b/src/qt/navmenuwidget.cpp similarity index 98% rename from src/qt/pivx/navmenuwidget.cpp rename to src/qt/navmenuwidget.cpp index 83dc1747ad2b2..824ed4efd8573 100644 --- a/src/qt/pivx/navmenuwidget.cpp +++ b/src/qt/navmenuwidget.cpp @@ -2,11 +2,13 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/navmenuwidget.h" -#include "qt/pivx/forms/ui_navmenuwidget.h" -#include "qt/pivx/qtutils.h" +#include "navmenuwidget.h" +#include "ui_navmenuwidget.h" + #include "clientversion.h" #include "optionsmodel.h" +#include "qtutils.h" + #include NavMenuWidget::NavMenuWidget(PIVXGUI *mainWindow, QWidget *parent) : diff --git a/src/qt/pivx/navmenuwidget.h b/src/qt/navmenuwidget.h similarity index 88% rename from src/qt/pivx/navmenuwidget.h rename to src/qt/navmenuwidget.h index 20c8cf2bc41cf..5fc231391c344 100644 --- a/src/qt/pivx/navmenuwidget.h +++ b/src/qt/navmenuwidget.h @@ -2,11 +2,11 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_NAVMENUWIDGET_H -#define PIVX_QT_PIVX_NAVMENUWIDGET_H +#ifndef PIVX_QT_NAVMENUWIDGET_H +#define PIVX_QT_NAVMENUWIDGET_H +#include "pwidget.h" #include -#include "qt/pivx/pwidget.h" class PIVXGUI; @@ -49,4 +49,4 @@ private Q_SLOTS: bool init = false; }; -#endif // PIVX_QT_PIVX_NAVMENUWIDGET_H +#endif // PIVX_QT_NAVMENUWIDGET_H diff --git a/src/qt/openuridialog.cpp b/src/qt/openuridialog.cpp index ee023ba1f4a5e..103e1713b8a38 100644 --- a/src/qt/openuridialog.cpp +++ b/src/qt/openuridialog.cpp @@ -6,8 +6,8 @@ #include "ui_openuridialog.h" #include "guiutil.h" +#include "qtutils.h" #include "walletmodel.h" -#include "qt/pivx/qtutils.h" #include #include diff --git a/src/qt/openuridialog.h b/src/qt/openuridialog.h index 9b9cd2b027c67..04b0b1a85d977 100644 --- a/src/qt/openuridialog.h +++ b/src/qt/openuridialog.h @@ -5,8 +5,8 @@ #ifndef PIVX_QT_OPENURIDIALOG_H #define PIVX_QT_OPENURIDIALOG_H +#include "snackbar.h" #include -#include "qt/pivx/snackbar.h" namespace Ui { diff --git a/src/qt/pivx/optionbutton.cpp b/src/qt/optionbutton.cpp similarity index 95% rename from src/qt/pivx/optionbutton.cpp rename to src/qt/optionbutton.cpp index 08554cabf9263..85a596cbf562b 100644 --- a/src/qt/pivx/optionbutton.cpp +++ b/src/qt/optionbutton.cpp @@ -2,9 +2,11 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/optionbutton.h" -#include "qt/pivx/forms/ui_optionbutton.h" -#include "qt/pivx/qtutils.h" +#include "optionbutton.h" +#include "ui_optionbutton.h" + +#include "qtutils.h" + #include OptionButton::OptionButton(QWidget *parent) : diff --git a/src/qt/pivx/optionbutton.h b/src/qt/optionbutton.h similarity index 88% rename from src/qt/pivx/optionbutton.h rename to src/qt/optionbutton.h index 0bc1e7d8fcf2b..282b6fd8a2308 100644 --- a/src/qt/pivx/optionbutton.h +++ b/src/qt/optionbutton.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_OPTIONBUTTON_H -#define PIVX_QT_PIVX_OPTIONBUTTON_H +#ifndef PIVX_QT_OPTIONBUTTON_H +#define PIVX_QT_OPTIONBUTTON_H #include @@ -36,4 +36,4 @@ class OptionButton : public QWidget Ui::OptionButton *ui; }; -#endif // PIVX_QT_PIVX_OPTIONBUTTON_H +#endif // PIVX_QT_OPTIONBUTTON_H diff --git a/src/qt/pivx/pfborderimage.h b/src/qt/pfborderimage.h similarity index 92% rename from src/qt/pivx/pfborderimage.h rename to src/qt/pfborderimage.h index e7a4d5a0e4bd2..dd27905d3c2cd 100644 --- a/src/qt/pivx/pfborderimage.h +++ b/src/qt/pfborderimage.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_PFBORDERIMAGE_H -#define PIVX_QT_PIVX_PFBORDERIMAGE_H +#ifndef PIVX_QT_PFBORDERIMAGE_H +#define PIVX_QT_PFBORDERIMAGE_H #include #include @@ -52,4 +52,4 @@ class PFBorderImage : public QFrame }; -#endif // PIVX_QT_PIVX_PFBORDERIMAGE_H +#endif // PIVX_QT_PFBORDERIMAGE_H diff --git a/src/qt/pivx.cpp b/src/qt/pivx.cpp index 77b9c5b029213..22654bd962993 100644 --- a/src/qt/pivx.cpp +++ b/src/qt/pivx.cpp @@ -8,8 +8,7 @@ #include "config/pivx-config.h" #endif -#include "qt/pivx/pivxgui.h" - +#include "pivxgui.h" #include "fs.h" #include "guiinterface.h" @@ -19,20 +18,20 @@ #include "qt/guiconstants.h" #include "qt/guiutil.h" #include "qt/intro.h" -#include "qt/optionsmodel.h" #include "qt/networkstyle.h" -#include "qt/pivx/splash.h" -#include "qt/pivx/welcomecontentwidget.h" +#include "qt/optionsmodel.h" #include "qt/winshutdownmonitor.h" #include "rpc/server.h" #include "shutdown.h" +#include "splash.h" #include "util/system.h" #include "utilitydialog.h" #include "warnings.h" +#include "welcomecontentwidget.h" #ifdef ENABLE_WALLET -#include "qt/pivx/governancemodel.h" -#include "qt/pivx/mnmodel.h" +#include "governancemodel.h" +#include "mnmodel.h" #include "paymentserver.h" #include "walletmodel.h" #include "interfaces/wallet.h" diff --git a/src/qt/pivx.qrc b/src/qt/pivx.qrc index c10a47dd53b80..9d462d732f531 100644 --- a/src/qt/pivx.qrc +++ b/src/qt/pivx.qrc @@ -13,8 +13,8 @@ res/css/default.css - pivx/res/css/style_dark.css - pivx/res/css/style_light.css + res/css/style_dark.css + res/css/style_light.css res/images/about.png @@ -23,221 +23,221 @@ res/images/splash_regtest.png - pivx/res/img/bg-splash.svg - pivx/res/img/bg-splash.png - pivx/res/img/img-logo-pivx.png - pivx/res/img/img-logo-pivx@2x.png - pivx/res/img/img-logo-pivx@3x.png - pivx/res/img/img-nav-logo-pivx.png - pivx/res/img/img-qr-test-big.png - pivx/res/img/img-qr-test.png - pivx/res/img/img-welcome-step1.png - pivx/res/img/img-welcome-step2.png - pivx/res/img/img-welcome-step3.png - pivx/res/img/img-welcome-step4.png - pivx/res/img/bg-multi-number-dark.svg - pivx/res/img/bg-multi-number.svg - pivx/res/img/btn-radio-active.svg - pivx/res/img/btn-radio-off.svg - pivx/res/img/ic-add-label.svg - pivx/res/img/ic-add-liliac.svg - pivx/res/img/ic-add-purple.svg - pivx/res/img/ic-add.svg - pivx/res/img/ic-address-book-grey.svg - pivx/res/img/ic-address-book-white.svg - pivx/res/img/ic-address-book.svg - pivx/res/img/ic-address-send-white.svg - pivx/res/img/ic-address-send.svg - pivx/res/img/ic-arrow-drop-down-white.svg - pivx/res/img/ic-arrow-drop-down.svg - pivx/res/img/ic-arrow-drop-up-white.svg - pivx/res/img/ic-arrow-drop-up.svg - pivx/res/img/ic-arrow-drop-white-down.svg - pivx/res/img/ic-arrow-purple-down.svg - pivx/res/img/ic-arrow-right-white.svg - pivx/res/img/ic-arrow-right.svg - pivx/res/img/ic-arrow-left-white.svg - pivx/res/img/ic-arrow-left.svg - pivx/res/img/ic-arrow-white-left.svg - pivx/res/img/ic-arrow-white-right.svg - pivx/res/img/ic-check-active.svg - pivx/res/img/ic-check-box.svg - pivx/res/img/ic-check-box-light.svg - pivx/res/img/ic-check-box-liliac-indeterminate.svg - pivx/res/img/ic-check-connect-off.svg - pivx/res/img/ic-check-connect.svg - pivx/res/img/ic-check-tor-off.svg - pivx/res/img/ic-check-tor.svg - pivx/res/img/ic-check-dark.svg - pivx/res/img/ic-check-liliac-on.svg - pivx/res/img/ic-check-locked-off.svg - pivx/res/img/ic-check-locked.svg - pivx/res/img/ic-check-mint-off.svg - pivx/res/img/ic-check-mint.svg - pivx/res/img/ic-check-peers-off.svg - pivx/res/img/ic-check-peers.svg - pivx/res/img/ic-check-staking-off.svg - pivx/res/img/ic-check-staking.svg - pivx/res/img/ic-check-sync-off.svg - pivx/res/img/ic-check-sync.svg - pivx/res/img/ic-check-faq.svg - pivx/res/img/ic-check-theme-dark.svg - pivx/res/img/ic-check-theme-light.svg - pivx/res/img/ic-check-white.svg - pivx/res/img/ic-check.svg - pivx/res/img/ic-chevron-left.svg - pivx/res/img/ic-chevron-right.svg - pivx/res/img/ic-chevron-right-liliac.svg - pivx/res/img/ic-clear-liliac.svg - pivx/res/img/ic-clear-purple.svg - pivx/res/img/ic-close-white.svg - pivx/res/img/ic-close.svg - pivx/res/img/ic-coin-piv.svg - pivx/res/img/ic-coin-zpiv.svg - pivx/res/img/ic-combo-box.svg - pivx/res/img/ic-connect.svg - pivx/res/img/ic-copy-liliac.svg - pivx/res/img/ic-copy.svg - pivx/res/img/ic-copy-big.svg - pivx/res/img/ic-copy-big-white.svg - pivx/res/img/ic-exit.svg - pivx/res/img/ic-expand.svg - pivx/res/img/ic-folder.svg - pivx/res/img/ic-label-liliac.svg - pivx/res/img/ic-label.svg - pivx/res/img/ic-menu-hover.svg - pivx/res/img/ic-mint.svg - pivx/res/img/ic-nav-address-active.svg - pivx/res/img/ic-nav-address-hover.svg - pivx/res/img/ic-nav-address.svg - pivx/res/img/ic-nav-dashboard-active.svg - pivx/res/img/ic-nav-dashboard-hover.svg - pivx/res/img/ic-nav-dashboard.svg - pivx/res/img/ic-nav-master-active.svg - pivx/res/img/ic-nav-master-hover.svg - pivx/res/img/ic-nav-master.svg - pivx/res/img/ic-nav-privacy-active.svg - pivx/res/img/ic-nav-privacy-hover.svg - pivx/res/img/ic-nav-privacy.svg - pivx/res/img/ic-nav-receive-active.svg - pivx/res/img/ic-nav-receive-hover.svg - pivx/res/img/ic-nav-receive.svg - pivx/res/img/ic-nav-send-active.svg - pivx/res/img/ic-nav-send-hover.svg - pivx/res/img/ic-nav-send.svg - pivx/res/img/ic-nav-settings-active.svg - pivx/res/img/ic-nav-settings-hover.svg - pivx/res/img/ic-nav-settings.svg - pivx/res/img/ic-radio-liliac-on.svg - pivx/res/img/ic-receive-off.svg - pivx/res/img/ic-receive-on.svg - pivx/res/img/ic-received.svg - pivx/res/img/ic-send.svg - pivx/res/img/ic-submenu-lock.svg - pivx/res/img/ic-submenu-staking.svg - pivx/res/img/ic-submenu-unlock.svg - pivx/res/img/ic-switch-liliac-on.svg - pivx/res/img/ic-switch-off.svg - pivx/res/img/ic-switch-on.svg - pivx/res/img/ic-transaction-warning.svg - pivx/res/img/ic-transaction-mint.svg - pivx/res/img/ic-transaction-received.svg - pivx/res/img/ic-transaction-received-memo.svg - pivx/res/img/ic-transaction-sent.svg - pivx/res/img/ic-transaction-staked.svg - pivx/res/img/dark/ic-transaction-mint.svg - pivx/res/img/dark/ic-transaction-received.svg - pivx/res/img/dark/ic-transaction-received-memo.svg - pivx/res/img/dark/ic-transaction-sent.svg - pivx/res/img/dark/ic-transaction-staked.svg - pivx/res/img/ic-transaction-mint-inactive.svg - pivx/res/img/ic-transaction-received-inactive.svg - pivx/res/img/ic-transaction-sent-inactive.svg - pivx/res/img/ic-transaction-staked-inactive.svg - pivx/res/img/dark/ic-transaction-mint-inactive.svg - pivx/res/img/dark/ic-transaction-received-inactive.svg - pivx/res/img/dark/ic-transaction-sent-inactive.svg - pivx/res/img/dark/ic-transaction-staked-inactive.svg - pivx/res/img/ic-unlock-staking.svg - pivx/res/img/ic-update-liliac.svg - pivx/res/img/ic-update.svg - pivx/res/img/ic-wallet-status-locked.svg - pivx/res/img/ic-wallet-status-staking.svg - pivx/res/img/ic-wallet-status-unlocked.svg - pivx/res/img/ic-watch-password-white.svg - pivx/res/img/ic-watch-password.svg - pivx/res/img/img-empty-contacts.svg - pivx/res/img/img-empty-dark-contacts.svg - pivx/res/img/img-empty-dark-error.svg - pivx/res/img/img-empty-dark-masternode.svg - pivx/res/img/img-empty-dark-multisend.svg - pivx/res/img/img-empty-dark-peers.svg - pivx/res/img/img-empty-dark-staking-on.svg - pivx/res/img/img-empty-dark-staking-off.svg - pivx/res/img/img-empty-dark-transactions.svg - pivx/res/img/img-empty-privacy-dark.svg - pivx/res/img/img-empty-error.svg - pivx/res/img/img-empty-masternode.svg - pivx/res/img/img-empty-multisend.svg - pivx/res/img/img-empty-peers.svg - pivx/res/img/img-empty-privacy.svg - pivx/res/img/img-empty-staking-off.svg - pivx/res/img/img-empty-staking-on.svg - pivx/res/img/img-empty-transactions.svg - pivx/res/img/img-nav-logo.svg - pivx/res/img/img-qr.svg - pivx/res/img/ic-contact-arrow-down.svg - pivx/res/img/ic-contact-arrow-down-white.svg - pivx/res/img/ic-arrow-drop-down-purple.svg - pivx/res/img/ic-arrow-drop-up-purple.svg - pivx/res/img/bg-welcome@2x.jpg - pivx/res/img/bg-welcome@3x.jpg - pivx/res/img/img-logo-pivx.svg - pivx/res/img/bg-welcome.svg - pivx/res/img/bg-welcome-container.svg - pivx/res/img/bg-welcome.png - pivx/res/img/bg-welcome-container.png - pivx/res/img/bg-welcome-container@2x.png - pivx/res/img/bg-welcome-container@3x.png - pivx/res/img/bg-dashboard-banner.png - pivx/res/img/ic-check-box-dark-active.svg - pivx/res/img/ic-check-box-indeterminate.svg - pivx/res/img/ic-check-liliac-indeterminate.svg - pivx/res/img/ani-loading-dark.gif - pivx/res/img/ani-loading.gif - pivx/res/img/ic-pending.svg - pivx/res/img/ic-transaction-stake-delegated.svg - pivx/res/img/ic-transaction-stake-delegated-inactive.svg - pivx/res/img/dark/ic-transaction-stake-delegated.svg - pivx/res/img/dark/ic-transaction-stake-delegated-inactive.svg - pivx/res/img/ic-transaction-stake-hot.svg - pivx/res/img/ic-transaction-stake-hot-inactive.svg - pivx/res/img/dark/ic-transaction-stake-hot.svg - pivx/res/img/dark/ic-transaction-stake-hot-inactive.svg - pivx/res/img/ic-transaction-cs-contract.svg - pivx/res/img/dark/ic-transaction-cs-contract.svg - pivx/res/img/dark/ic-transaction-cs-contract-inactive.svg - pivx/res/img/ic-transaction-cs-contract-inactive.svg - pivx/res/img/ic-nav-cold-staking.svg - pivx/res/img/ic-nav-cold-staking-active.svg - pivx/res/img/ic-check-cold-staking.svg - pivx/res/img/ic-check-cold-staking-off.svg - pivx/res/img/ic-check-cold-staking-enabled.svg - pivx/res/img/ic-information.svg - pivx/res/img/ic-information-hover.svg - pivx/res/img/ic-check-vote.svg - pivx/res/img/ic-check-vote-active.svg - pivx/res/img/ic-check-vote-dark.svg - pivx/res/img/ic-check-vote-active-dark.svg - pivx/res/img/ic-filter.svg - pivx/res/img/ic-link.svg - pivx/res/img/ic-link-hover.svg - pivx/res/img/ic-nav-governance.svg - pivx/res/img/ic-nav-governance-active.svg - pivx/res/img/ic-nav-governance-hover.svg - pivx/res/img/ic-time.svg - pivx/res/img/img-empty-governance.svg - pivx/res/img/img-empty-dark-governance.svg - pivx/res/img/ic-check-block.svg + res/images/bg-splash.svg + res/images/bg-splash.png + res/images/img-logo-pivx.png + res/images/img-logo-pivx@2x.png + res/images/img-logo-pivx@3x.png + res/images/img-nav-logo-pivx.png + res/images/img-qr-test-big.png + res/images/img-qr-test.png + res/images/img-welcome-step1.png + res/images/img-welcome-step2.png + res/images/img-welcome-step3.png + res/images/img-welcome-step4.png + res/images/bg-multi-number-dark.svg + res/images/bg-multi-number.svg + res/images/btn-radio-active.svg + res/images/btn-radio-off.svg + res/images/ic-add-label.svg + res/images/ic-add-liliac.svg + res/images/ic-add-purple.svg + res/images/ic-add.svg + res/images/ic-address-book-grey.svg + res/images/ic-address-book-white.svg + res/images/ic-address-book.svg + res/images/ic-address-send-white.svg + res/images/ic-address-send.svg + res/images/ic-arrow-drop-down-white.svg + res/images/ic-arrow-drop-down.svg + res/images/ic-arrow-drop-up-white.svg + res/images/ic-arrow-drop-up.svg + res/images/ic-arrow-drop-white-down.svg + res/images/ic-arrow-purple-down.svg + res/images/ic-arrow-right-white.svg + res/images/ic-arrow-right.svg + res/images/ic-arrow-left-white.svg + res/images/ic-arrow-left.svg + res/images/ic-arrow-white-left.svg + res/images/ic-arrow-white-right.svg + res/images/ic-check-active.svg + res/images/ic-check-box.svg + res/images/ic-check-box-light.svg + res/images/ic-check-box-liliac-indeterminate.svg + res/images/ic-check-connect-off.svg + res/images/ic-check-connect.svg + res/images/ic-check-tor-off.svg + res/images/ic-check-tor.svg + res/images/ic-check-dark.svg + res/images/ic-check-liliac-on.svg + res/images/ic-check-locked-off.svg + res/images/ic-check-locked.svg + res/images/ic-check-mint-off.svg + res/images/ic-check-mint.svg + res/images/ic-check-peers-off.svg + res/images/ic-check-peers.svg + res/images/ic-check-staking-off.svg + res/images/ic-check-staking.svg + res/images/ic-check-sync-off.svg + res/images/ic-check-sync.svg + res/images/ic-check-faq.svg + res/images/ic-check-theme-dark.svg + res/images/ic-check-theme-light.svg + res/images/ic-check-white.svg + res/images/ic-check.svg + res/images/ic-chevron-left.svg + res/images/ic-chevron-right.svg + res/images/ic-chevron-right-liliac.svg + res/images/ic-clear-liliac.svg + res/images/ic-clear-purple.svg + res/images/ic-close-white.svg + res/images/ic-close.svg + res/images/ic-coin-piv.svg + res/images/ic-coin-zpiv.svg + res/images/ic-combo-box.svg + res/images/ic-connect.svg + res/images/ic-copy-liliac.svg + res/images/ic-copy.svg + res/images/ic-copy-big.svg + res/images/ic-copy-big-white.svg + res/images/ic-exit.svg + res/images/ic-expand.svg + res/images/ic-folder.svg + res/images/ic-label-liliac.svg + res/images/ic-label.svg + res/images/ic-menu-hover.svg + res/images/ic-mint.svg + res/images/ic-nav-address-active.svg + res/images/ic-nav-address-hover.svg + res/images/ic-nav-address.svg + res/images/ic-nav-dashboard-active.svg + res/images/ic-nav-dashboard-hover.svg + res/images/ic-nav-dashboard.svg + res/images/ic-nav-master-active.svg + res/images/ic-nav-master-hover.svg + res/images/ic-nav-master.svg + res/images/ic-nav-privacy-active.svg + res/images/ic-nav-privacy-hover.svg + res/images/ic-nav-privacy.svg + res/images/ic-nav-receive-active.svg + res/images/ic-nav-receive-hover.svg + res/images/ic-nav-receive.svg + res/images/ic-nav-send-active.svg + res/images/ic-nav-send-hover.svg + res/images/ic-nav-send.svg + res/images/ic-nav-settings-active.svg + res/images/ic-nav-settings-hover.svg + res/images/ic-nav-settings.svg + res/images/ic-radio-liliac-on.svg + res/images/ic-receive-off.svg + res/images/ic-receive-on.svg + res/images/ic-received.svg + res/images/ic-send.svg + res/images/ic-submenu-lock.svg + res/images/ic-submenu-staking.svg + res/images/ic-submenu-unlock.svg + res/images/ic-switch-liliac-on.svg + res/images/ic-switch-off.svg + res/images/ic-switch-on.svg + res/images/ic-transaction-warning.svg + res/images/ic-transaction-mint.svg + res/images/ic-transaction-received.svg + res/images/ic-transaction-received-memo.svg + res/images/ic-transaction-sent.svg + res/images/ic-transaction-staked.svg + res/images/dark/ic-transaction-mint.svg + res/images/dark/ic-transaction-received.svg + res/images/dark/ic-transaction-received-memo.svg + res/images/dark/ic-transaction-sent.svg + res/images/dark/ic-transaction-staked.svg + res/images/ic-transaction-mint-inactive.svg + res/images/ic-transaction-received-inactive.svg + res/images/ic-transaction-sent-inactive.svg + res/images/ic-transaction-staked-inactive.svg + res/images/dark/ic-transaction-mint-inactive.svg + res/images/dark/ic-transaction-received-inactive.svg + res/images/dark/ic-transaction-sent-inactive.svg + res/images/dark/ic-transaction-staked-inactive.svg + res/images/ic-unlock-staking.svg + res/images/ic-update-liliac.svg + res/images/ic-update.svg + res/images/ic-wallet-status-locked.svg + res/images/ic-wallet-status-staking.svg + res/images/ic-wallet-status-unlocked.svg + res/images/ic-watch-password-white.svg + res/images/ic-watch-password.svg + res/images/img-empty-contacts.svg + res/images/img-empty-dark-contacts.svg + res/images/img-empty-dark-error.svg + res/images/img-empty-dark-masternode.svg + res/images/img-empty-dark-multisend.svg + res/images/img-empty-dark-peers.svg + res/images/img-empty-dark-staking-on.svg + res/images/img-empty-dark-staking-off.svg + res/images/img-empty-dark-transactions.svg + res/images/img-empty-privacy-dark.svg + res/images/img-empty-error.svg + res/images/img-empty-masternode.svg + res/images/img-empty-multisend.svg + res/images/img-empty-peers.svg + res/images/img-empty-privacy.svg + res/images/img-empty-staking-off.svg + res/images/img-empty-staking-on.svg + res/images/img-empty-transactions.svg + res/images/img-nav-logo.svg + res/images/img-qr.svg + res/images/ic-contact-arrow-down.svg + res/images/ic-contact-arrow-down-white.svg + res/images/ic-arrow-drop-down-purple.svg + res/images/ic-arrow-drop-up-purple.svg + res/images/bg-welcome@2x.jpg + res/images/bg-welcome@3x.jpg + res/images/img-logo-pivx.svg + res/images/bg-welcome.svg + res/images/bg-welcome-container.svg + res/images/bg-welcome.png + res/images/bg-welcome-container.png + res/images/bg-welcome-container@2x.png + res/images/bg-welcome-container@3x.png + res/images/bg-dashboard-banner.png + res/images/ic-check-box-dark-active.svg + res/images/ic-check-box-indeterminate.svg + res/images/ic-check-liliac-indeterminate.svg + res/images/ani-loading-dark.gif + res/images/ani-loading.gif + res/images/ic-pending.svg + res/images/ic-transaction-stake-delegated.svg + res/images/ic-transaction-stake-delegated-inactive.svg + res/images/dark/ic-transaction-stake-delegated.svg + res/images/dark/ic-transaction-stake-delegated-inactive.svg + res/images/ic-transaction-stake-hot.svg + res/images/ic-transaction-stake-hot-inactive.svg + res/images/dark/ic-transaction-stake-hot.svg + res/images/dark/ic-transaction-stake-hot-inactive.svg + res/images/ic-transaction-cs-contract.svg + res/images/dark/ic-transaction-cs-contract.svg + res/images/dark/ic-transaction-cs-contract-inactive.svg + res/images/ic-transaction-cs-contract-inactive.svg + res/images/ic-nav-cold-staking.svg + res/images/ic-nav-cold-staking-active.svg + res/images/ic-check-cold-staking.svg + res/images/ic-check-cold-staking-off.svg + res/images/ic-check-cold-staking-enabled.svg + res/images/ic-information.svg + res/images/ic-information-hover.svg + res/images/ic-check-vote.svg + res/images/ic-check-vote-active.svg + res/images/ic-check-vote-dark.svg + res/images/ic-check-vote-active-dark.svg + res/images/ic-filter.svg + res/images/ic-link.svg + res/images/ic-link-hover.svg + res/images/ic-nav-governance.svg + res/images/ic-nav-governance-active.svg + res/images/ic-nav-governance-hover.svg + res/images/ic-time.svg + res/images/img-empty-governance.svg + res/images/img-empty-dark-governance.svg + res/images/ic-check-block.svg diff --git a/src/qt/pivx/pivxgui.cpp b/src/qt/pivxgui.cpp similarity index 99% rename from src/qt/pivx/pivxgui.cpp rename to src/qt/pivxgui.cpp index 4e1415de57c86..1a37cd6ddf24e 100644 --- a/src/qt/pivx/pivxgui.cpp +++ b/src/qt/pivxgui.cpp @@ -2,21 +2,21 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/pivxgui.h" +#include "pivxgui.h" #ifdef Q_OS_MAC #include "macdockiconhandler.h" #endif -#include "qt/guiutil.h" #include "clientmodel.h" +#include "defaultdialog.h" +#include "guiinterface.h" #include "interfaces/handler.h" -#include "optionsmodel.h" #include "networkstyle.h" #include "notificator.h" -#include "guiinterface.h" -#include "qt/pivx/qtutils.h" -#include "qt/pivx/defaultdialog.h" +#include "optionsmodel.h" +#include "qt/guiutil.h" +#include "qtutils.h" #include "shutdown.h" #include "util/system.h" diff --git a/src/qt/pivx/pivxgui.h b/src/qt/pivxgui.h similarity index 92% rename from src/qt/pivx/pivxgui.h rename to src/qt/pivxgui.h index a442b1da9ff76..c0971f0b8e2f6 100644 --- a/src/qt/pivx/pivxgui.h +++ b/src/qt/pivxgui.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_PIVXGUI_H -#define PIVX_QT_PIVX_PIVXGUI_H +#ifndef PIVX_QT_PIVXGUI_H +#define PIVX_QT_PIVXGUI_H #if defined(HAVE_CONFIG_H) #include "config/pivx-config.h" @@ -14,19 +14,19 @@ #include #include -#include "qt/pivx/addresseswidget.h" -#include "qt/pivx/coldstakingwidget.h" -#include "qt/pivx/dashboardwidget.h" -#include "qt/pivx/governancewidget.h" -#include "qt/pivx/masternodeswidget.h" -#include "qt/pivx/navmenuwidget.h" -#include "qt/pivx/receivewidget.h" -#include "qt/pivx/send.h" -#include "qt/pivx/settings/faqwidget.h" -#include "qt/pivx/settings/settingswidget.h" -#include "qt/pivx/snackbar.h" -#include "qt/pivx/topbar.h" +#include "addresseswidget.h" +#include "coldstakingwidget.h" +#include "dashboardwidget.h" +#include "governancewidget.h" +#include "masternodeswidget.h" +#include "navmenuwidget.h" +#include "qt/settings/faqwidget.h" +#include "qt/settings/settingswidget.h" #include "qt/rpcconsole.h" +#include "receivewidget.h" +#include "send.h" +#include "snackbar.h" +#include "topbar.h" namespace interfaces { class Handler; @@ -201,4 +201,4 @@ private Q_SLOTS: }; -#endif // PIVX_QT_PIVX_PIVXGUI_H +#endif // PIVX_QT_PIVXGUI_H diff --git a/src/qt/pivx/proposalcard.cpp b/src/qt/proposalcard.cpp similarity index 97% rename from src/qt/pivx/proposalcard.cpp rename to src/qt/proposalcard.cpp index 0f08b6d1538b3..2346e365bf8e3 100644 --- a/src/qt/pivx/proposalcard.cpp +++ b/src/qt/proposalcard.cpp @@ -2,10 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or https://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/proposalcard.h" -#include "qt/pivx/forms/ui_proposalcard.h" +#include "proposalcard.h" +#include "ui_proposalcard.h" -#include "qt/pivx/qtutils.h" +#include "qtutils.h" ProposalCard::ProposalCard(QWidget *parent) : QWidget(parent), diff --git a/src/qt/pivx/proposalcard.h b/src/qt/proposalcard.h similarity index 87% rename from src/qt/pivx/proposalcard.h rename to src/qt/proposalcard.h index dc2d3044e3332..715ec313a4432 100644 --- a/src/qt/pivx/proposalcard.h +++ b/src/qt/proposalcard.h @@ -2,10 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or https://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_PROPOSALCARD_H -#define PIVX_QT_PIVX_PROPOSALCARD_H +#ifndef PIVX_QT_PROPOSALCARD_H +#define PIVX_QT_PROPOSALCARD_H -#include "qt/pivx/governancemodel.h" +#include "governancemodel.h" #include #include @@ -45,4 +45,4 @@ public Q_SLOTS: void setStatusAndVotes(const QString& msg, int value); }; -#endif // PIVX_QT_PIVX_PROPOSALCARD_H +#endif // PIVX_QT_PROPOSALCARD_H diff --git a/src/qt/pivx/proposalinfodialog.cpp b/src/qt/proposalinfodialog.cpp similarity index 95% rename from src/qt/pivx/proposalinfodialog.cpp rename to src/qt/proposalinfodialog.cpp index 0105371205e2d..d577f93bf386e 100644 --- a/src/qt/pivx/proposalinfodialog.cpp +++ b/src/qt/proposalinfodialog.cpp @@ -2,12 +2,12 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/proposalinfodialog.h" -#include "qt/pivx/forms/ui_proposalinfodialog.h" +#include "proposalinfodialog.h" +#include "ui_proposalinfodialog.h" #include "guiutil.h" -#include "qt/pivx/snackbar.h" -#include "qt/pivx/qtutils.h" +#include "qtutils.h" +#include "snackbar.h" #include diff --git a/src/qt/pivx/proposalinfodialog.h b/src/qt/proposalinfodialog.h similarity index 78% rename from src/qt/pivx/proposalinfodialog.h rename to src/qt/proposalinfodialog.h index b6ae18256217d..0bf7b38cd1a94 100644 --- a/src/qt/pivx/proposalinfodialog.h +++ b/src/qt/proposalinfodialog.h @@ -2,11 +2,11 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_PROPOSALINFODIALOG_H -#define PIVX_QT_PIVX_PROPOSALINFODIALOG_H +#ifndef PIVX_QT_PROPOSALINFODIALOG_H +#define PIVX_QT_PROPOSALINFODIALOG_H -#include "qt/pivx/focuseddialog.h" -#include "qt/pivx/governancemodel.h" +#include "focuseddialog.h" +#include "governancemodel.h" struct ProposalInfo; class SnackBar; @@ -37,4 +37,4 @@ public Q_SLOTS: void inform(const QString& msg); }; -#endif // PIVX_QT_PIVX_PROPOSALINFODIALOG_H +#endif // PIVX_QT_PROPOSALINFODIALOG_H diff --git a/src/qt/pivx/prunnable.h b/src/qt/prunnable.h similarity index 74% rename from src/qt/pivx/prunnable.h rename to src/qt/prunnable.h index 238b51e71f380..29f19413c930f 100644 --- a/src/qt/pivx/prunnable.h +++ b/src/qt/prunnable.h @@ -2,8 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_PRUNNABLE_H -#define PIVX_QT_PIVX_PRUNNABLE_H +#ifndef PIVX_QT_PRUNNABLE_H +#define PIVX_QT_PRUNNABLE_H + +#include class Runnable { public: @@ -11,4 +13,4 @@ class Runnable { virtual void onError(QString error, int type) = 0; }; -#endif // PIVX_QT_PIVX_PRUNNABLE_H +#endif // PIVX_QT_PRUNNABLE_H diff --git a/src/qt/pivx/pwidget.cpp b/src/qt/pwidget.cpp similarity index 97% rename from src/qt/pivx/pwidget.cpp rename to src/qt/pwidget.cpp index 38b0a8b2fdf83..16045c828d00b 100644 --- a/src/qt/pivx/pwidget.cpp +++ b/src/qt/pwidget.cpp @@ -2,9 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/pwidget.h" -#include "qt/pivx/qtutils.h" -#include "qt/pivx/loadingdialog.h" +#include "pwidget.h" +#include "loadingdialog.h" +#include "qtutils.h" + #include #include diff --git a/src/qt/pivx/pwidget.h b/src/qt/pwidget.h similarity index 94% rename from src/qt/pivx/pwidget.h rename to src/qt/pwidget.h index fbadfd559a7d4..38b55ab6233d4 100644 --- a/src/qt/pivx/pwidget.h +++ b/src/qt/pwidget.h @@ -2,14 +2,14 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_PWIDGET_H -#define PIVX_QT_PIVX_PWIDGET_H +#ifndef PIVX_QT_PWIDGET_H +#define PIVX_QT_PWIDGET_H +#include "prunnable.h" +#include "walletmodel.h" #include -#include #include -#include "qt/pivx/prunnable.h" -#include "walletmodel.h" +#include class PIVXGUI; class ClientModel; @@ -78,4 +78,4 @@ private Q_SLOTS: }; -#endif // PIVX_QT_PIVX_PWIDGET_H +#endif // PIVX_QT_PWIDGET_H diff --git a/src/qt/pivx/qtutils.cpp b/src/qt/qtutils.cpp similarity index 99% rename from src/qt/pivx/qtutils.cpp rename to src/qt/qtutils.cpp index 422d9e6ccbb8c..6bdc4af6604c6 100644 --- a/src/qt/pivx/qtutils.cpp +++ b/src/qt/qtutils.cpp @@ -2,11 +2,11 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/qtutils.h" +#include "qtutils.h" #include "guiconstants.h" #include "qrencode.h" -#include "qt/pivx/snackbar.h" +#include "snackbar.h" #include #include diff --git a/src/qt/pivx/qtutils.h b/src/qt/qtutils.h similarity index 95% rename from src/qt/pivx/qtutils.h rename to src/qt/qtutils.h index 8a180fd66b218..f11307750574a 100644 --- a/src/qt/pivx/qtutils.h +++ b/src/qt/qtutils.h @@ -2,10 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_QTUTILS_H -#define PIVX_QT_PIVX_QTUTILS_H +#ifndef PIVX_QT_QTUTILS_H +#define PIVX_QT_QTUTILS_H -#include "qt/pivx/pivxgui.h" +#include "pivxgui.h" #include #include @@ -76,4 +76,4 @@ void setCssProperty(QWidget* wid, const QString& value, bool forceUpdate = false void forceUpdateStyle(QWidget* widget, bool forceUpdate); void forceUpdateStyle(std::initializer_list args); -#endif // PIVX_QT_PIVX_QTUTILS_H +#endif // PIVX_QT_QTUTILS_H diff --git a/src/qt/pivx/receivedialog.cpp b/src/qt/receivedialog.cpp similarity index 95% rename from src/qt/pivx/receivedialog.cpp rename to src/qt/receivedialog.cpp index 12147fb2ed4fa..2963138d1ea67 100644 --- a/src/qt/pivx/receivedialog.cpp +++ b/src/qt/receivedialog.cpp @@ -2,10 +2,11 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/receivedialog.h" -#include "qt/pivx/forms/ui_receivedialog.h" -#include "qt/pivx/qtutils.h" +#include "receivedialog.h" +#include "ui_receivedialog.h" + #include "qt/walletmodel.h" +#include "qtutils.h" #include diff --git a/src/qt/pivx/receivedialog.h b/src/qt/receivedialog.h similarity index 79% rename from src/qt/pivx/receivedialog.h rename to src/qt/receivedialog.h index 2de11913d56f3..9a6ddb1157112 100644 --- a/src/qt/pivx/receivedialog.h +++ b/src/qt/receivedialog.h @@ -2,10 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_RECEIVEDIALOG_H -#define PIVX_QT_PIVX_RECEIVEDIALOG_H +#ifndef PIVX_QT_RECEIVEDIALOG_H +#define PIVX_QT_RECEIVEDIALOG_H -#include "qt/pivx/focuseddialog.h" +#include "focuseddialog.h" class SendCoinsRecipient; @@ -30,4 +30,4 @@ private Q_SLOTS: SendCoinsRecipient *info{nullptr}; }; -#endif // PIVX_QT_PIVX_RECEIVEDIALOG_H +#endif // PIVX_QT_RECEIVEDIALOG_H diff --git a/src/qt/pivx/receivewidget.cpp b/src/qt/receivewidget.cpp similarity index 98% rename from src/qt/pivx/receivewidget.cpp rename to src/qt/receivewidget.cpp index b76833660eb6c..1e495be717292 100644 --- a/src/qt/pivx/receivewidget.cpp +++ b/src/qt/receivewidget.cpp @@ -2,15 +2,16 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/receivewidget.h" -#include "qt/pivx/forms/ui_receivewidget.h" -#include "qt/pivx/requestdialog.h" -#include "qt/pivx/addnewcontactdialog.h" -#include "qt/pivx/qtutils.h" -#include "qt/pivx/myaddressrow.h" -#include "qt/pivx/addressholder.h" -#include "walletmodel.h" +#include "receivewidget.h" +#include "ui_receivewidget.h" + +#include "addnewcontactdialog.h" +#include "addressholder.h" #include "guiutil.h" +#include "myaddressrow.h" +#include "qtutils.h" +#include "requestdialog.h" +#include "walletmodel.h" #include #include diff --git a/src/qt/pivx/receivewidget.h b/src/qt/receivewidget.h similarity index 89% rename from src/qt/pivx/receivewidget.h rename to src/qt/receivewidget.h index 1d1f568d441fc..d3d62627b77b6 100644 --- a/src/qt/pivx/receivewidget.h +++ b/src/qt/receivewidget.h @@ -2,13 +2,13 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_RECEIVEWIDGET_H -#define PIVX_QT_PIVX_RECEIVEWIDGET_H +#ifndef PIVX_QT_RECEIVEWIDGET_H +#define PIVX_QT_RECEIVEWIDGET_H -#include "qt/pivx/pwidget.h" +#include "addressfilterproxymodel.h" #include "addresstablemodel.h" -#include "qt/pivx/furabstractlistitemdelegate.h" -#include "qt/pivx/addressfilterproxymodel.h" +#include "furabstractlistitemdelegate.h" +#include "pwidget.h" #include #include @@ -79,4 +79,4 @@ private Q_SLOTS: }; -#endif // PIVX_QT_PIVX_RECEIVEWIDGET_H +#endif // PIVX_QT_RECEIVEWIDGET_H diff --git a/src/qt/pivx/requestdialog.cpp b/src/qt/requestdialog.cpp similarity index 98% rename from src/qt/pivx/requestdialog.cpp rename to src/qt/requestdialog.cpp index 33e281d836dc1..7d8a375e941ec 100644 --- a/src/qt/pivx/requestdialog.cpp +++ b/src/qt/requestdialog.cpp @@ -2,13 +2,14 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/requestdialog.h" -#include "qt/pivx/forms/ui_requestdialog.h" -#include +#include "requestdialog.h" +#include "ui_requestdialog.h" -#include "qt/pivx/qtutils.h" #include "guiutil.h" #include "optionsmodel.h" +#include "qtutils.h" + +#include RequestDialog::RequestDialog(QWidget *parent) : FocusedDialog(parent), diff --git a/src/qt/pivx/requestdialog.h b/src/qt/requestdialog.h similarity index 85% rename from src/qt/pivx/requestdialog.h rename to src/qt/requestdialog.h index b04f41485faea..5d5994f2677c6 100644 --- a/src/qt/pivx/requestdialog.h +++ b/src/qt/requestdialog.h @@ -2,11 +2,11 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_REQUESTDIALOG_H -#define PIVX_QT_PIVX_REQUESTDIALOG_H +#ifndef PIVX_QT_REQUESTDIALOG_H +#define PIVX_QT_REQUESTDIALOG_H -#include "qt/pivx/focuseddialog.h" -#include "qt/pivx/snackbar.h" +#include "focuseddialog.h" +#include "snackbar.h" #include "walletmodel.h" #include @@ -49,4 +49,4 @@ private Q_SLOTS: void inform(const QString& text); }; -#endif // PIVX_QT_PIVX_REQUESTDIALOG_H +#endif // PIVX_QT_REQUESTDIALOG_H diff --git a/src/qt/pivx/res/css/style_dark.css b/src/qt/res/css/style_dark.css similarity index 100% rename from src/qt/pivx/res/css/style_dark.css rename to src/qt/res/css/style_dark.css diff --git a/src/qt/pivx/res/css/style_light.css b/src/qt/res/css/style_light.css similarity index 100% rename from src/qt/pivx/res/css/style_light.css rename to src/qt/res/css/style_light.css diff --git a/src/qt/pivx/res/img/ani-loading-dark.gif b/src/qt/res/images/ani-loading-dark.gif similarity index 100% rename from src/qt/pivx/res/img/ani-loading-dark.gif rename to src/qt/res/images/ani-loading-dark.gif diff --git a/src/qt/pivx/res/img/ani-loading.gif b/src/qt/res/images/ani-loading.gif similarity index 100% rename from src/qt/pivx/res/img/ani-loading.gif rename to src/qt/res/images/ani-loading.gif diff --git a/src/qt/pivx/res/img/bg-dashboard-banner.png b/src/qt/res/images/bg-dashboard-banner.png similarity index 100% rename from src/qt/pivx/res/img/bg-dashboard-banner.png rename to src/qt/res/images/bg-dashboard-banner.png diff --git a/src/qt/pivx/res/img/bg-multi-number-dark.svg b/src/qt/res/images/bg-multi-number-dark.svg similarity index 100% rename from src/qt/pivx/res/img/bg-multi-number-dark.svg rename to src/qt/res/images/bg-multi-number-dark.svg diff --git a/src/qt/pivx/res/img/bg-multi-number.svg b/src/qt/res/images/bg-multi-number.svg similarity index 100% rename from src/qt/pivx/res/img/bg-multi-number.svg rename to src/qt/res/images/bg-multi-number.svg diff --git a/src/qt/pivx/res/img/bg-splash.png b/src/qt/res/images/bg-splash.png similarity index 100% rename from src/qt/pivx/res/img/bg-splash.png rename to src/qt/res/images/bg-splash.png diff --git a/src/qt/pivx/res/img/bg-splash.svg b/src/qt/res/images/bg-splash.svg similarity index 100% rename from src/qt/pivx/res/img/bg-splash.svg rename to src/qt/res/images/bg-splash.svg diff --git a/src/qt/pivx/res/img/bg-welcome-container.jpg b/src/qt/res/images/bg-welcome-container.jpg similarity index 100% rename from src/qt/pivx/res/img/bg-welcome-container.jpg rename to src/qt/res/images/bg-welcome-container.jpg diff --git a/src/qt/pivx/res/img/bg-welcome-container.png b/src/qt/res/images/bg-welcome-container.png similarity index 100% rename from src/qt/pivx/res/img/bg-welcome-container.png rename to src/qt/res/images/bg-welcome-container.png diff --git a/src/qt/pivx/res/img/bg-welcome-container.svg b/src/qt/res/images/bg-welcome-container.svg similarity index 100% rename from src/qt/pivx/res/img/bg-welcome-container.svg rename to src/qt/res/images/bg-welcome-container.svg diff --git a/src/qt/pivx/res/img/bg-welcome-container@2x.png b/src/qt/res/images/bg-welcome-container@2x.png similarity index 100% rename from src/qt/pivx/res/img/bg-welcome-container@2x.png rename to src/qt/res/images/bg-welcome-container@2x.png diff --git a/src/qt/pivx/res/img/bg-welcome-container@3x.png b/src/qt/res/images/bg-welcome-container@3x.png similarity index 100% rename from src/qt/pivx/res/img/bg-welcome-container@3x.png rename to src/qt/res/images/bg-welcome-container@3x.png diff --git a/src/qt/pivx/res/img/bg-welcome.jpg b/src/qt/res/images/bg-welcome.jpg similarity index 100% rename from src/qt/pivx/res/img/bg-welcome.jpg rename to src/qt/res/images/bg-welcome.jpg diff --git a/src/qt/pivx/res/img/bg-welcome.png b/src/qt/res/images/bg-welcome.png similarity index 100% rename from src/qt/pivx/res/img/bg-welcome.png rename to src/qt/res/images/bg-welcome.png diff --git a/src/qt/pivx/res/img/bg-welcome.svg b/src/qt/res/images/bg-welcome.svg similarity index 100% rename from src/qt/pivx/res/img/bg-welcome.svg rename to src/qt/res/images/bg-welcome.svg diff --git a/src/qt/pivx/res/img/bg-welcome@2x.jpg b/src/qt/res/images/bg-welcome@2x.jpg similarity index 100% rename from src/qt/pivx/res/img/bg-welcome@2x.jpg rename to src/qt/res/images/bg-welcome@2x.jpg diff --git a/src/qt/pivx/res/img/bg-welcome@3x.jpg b/src/qt/res/images/bg-welcome@3x.jpg similarity index 100% rename from src/qt/pivx/res/img/bg-welcome@3x.jpg rename to src/qt/res/images/bg-welcome@3x.jpg diff --git a/src/qt/pivx/res/img/btn-radio-active.svg b/src/qt/res/images/btn-radio-active.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/btn-radio-active.svg rename to src/qt/res/images/btn-radio-active.svg diff --git a/src/qt/pivx/res/img/btn-radio-off.svg b/src/qt/res/images/btn-radio-off.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/btn-radio-off.svg rename to src/qt/res/images/btn-radio-off.svg diff --git a/src/qt/pivx/res/img/dark/ic-transaction-cs-contract-inactive.svg b/src/qt/res/images/dark/ic-transaction-cs-contract-inactive.svg similarity index 100% rename from src/qt/pivx/res/img/dark/ic-transaction-cs-contract-inactive.svg rename to src/qt/res/images/dark/ic-transaction-cs-contract-inactive.svg diff --git a/src/qt/pivx/res/img/dark/ic-transaction-cs-contract.svg b/src/qt/res/images/dark/ic-transaction-cs-contract.svg similarity index 100% rename from src/qt/pivx/res/img/dark/ic-transaction-cs-contract.svg rename to src/qt/res/images/dark/ic-transaction-cs-contract.svg diff --git a/src/qt/pivx/res/img/dark/ic-transaction-mint-inactive.svg b/src/qt/res/images/dark/ic-transaction-mint-inactive.svg similarity index 100% rename from src/qt/pivx/res/img/dark/ic-transaction-mint-inactive.svg rename to src/qt/res/images/dark/ic-transaction-mint-inactive.svg diff --git a/src/qt/pivx/res/img/dark/ic-transaction-mint.svg b/src/qt/res/images/dark/ic-transaction-mint.svg similarity index 100% rename from src/qt/pivx/res/img/dark/ic-transaction-mint.svg rename to src/qt/res/images/dark/ic-transaction-mint.svg diff --git a/src/qt/pivx/res/img/dark/ic-transaction-received-inactive.svg b/src/qt/res/images/dark/ic-transaction-received-inactive.svg similarity index 100% rename from src/qt/pivx/res/img/dark/ic-transaction-received-inactive.svg rename to src/qt/res/images/dark/ic-transaction-received-inactive.svg diff --git a/src/qt/pivx/res/img/dark/ic-transaction-received-memo.svg b/src/qt/res/images/dark/ic-transaction-received-memo.svg similarity index 100% rename from src/qt/pivx/res/img/dark/ic-transaction-received-memo.svg rename to src/qt/res/images/dark/ic-transaction-received-memo.svg diff --git a/src/qt/pivx/res/img/dark/ic-transaction-received.svg b/src/qt/res/images/dark/ic-transaction-received.svg similarity index 100% rename from src/qt/pivx/res/img/dark/ic-transaction-received.svg rename to src/qt/res/images/dark/ic-transaction-received.svg diff --git a/src/qt/pivx/res/img/dark/ic-transaction-sent-inactive.svg b/src/qt/res/images/dark/ic-transaction-sent-inactive.svg similarity index 100% rename from src/qt/pivx/res/img/dark/ic-transaction-sent-inactive.svg rename to src/qt/res/images/dark/ic-transaction-sent-inactive.svg diff --git a/src/qt/pivx/res/img/dark/ic-transaction-sent.svg b/src/qt/res/images/dark/ic-transaction-sent.svg similarity index 100% rename from src/qt/pivx/res/img/dark/ic-transaction-sent.svg rename to src/qt/res/images/dark/ic-transaction-sent.svg diff --git a/src/qt/pivx/res/img/dark/ic-transaction-stake-delegated-inactive.svg b/src/qt/res/images/dark/ic-transaction-stake-delegated-inactive.svg similarity index 100% rename from src/qt/pivx/res/img/dark/ic-transaction-stake-delegated-inactive.svg rename to src/qt/res/images/dark/ic-transaction-stake-delegated-inactive.svg diff --git a/src/qt/pivx/res/img/dark/ic-transaction-stake-delegated.svg b/src/qt/res/images/dark/ic-transaction-stake-delegated.svg similarity index 100% rename from src/qt/pivx/res/img/dark/ic-transaction-stake-delegated.svg rename to src/qt/res/images/dark/ic-transaction-stake-delegated.svg diff --git a/src/qt/pivx/res/img/dark/ic-transaction-stake-hot-inactive.svg b/src/qt/res/images/dark/ic-transaction-stake-hot-inactive.svg similarity index 100% rename from src/qt/pivx/res/img/dark/ic-transaction-stake-hot-inactive.svg rename to src/qt/res/images/dark/ic-transaction-stake-hot-inactive.svg diff --git a/src/qt/pivx/res/img/dark/ic-transaction-stake-hot.svg b/src/qt/res/images/dark/ic-transaction-stake-hot.svg similarity index 100% rename from src/qt/pivx/res/img/dark/ic-transaction-stake-hot.svg rename to src/qt/res/images/dark/ic-transaction-stake-hot.svg diff --git a/src/qt/pivx/res/img/dark/ic-transaction-staked-inactive.svg b/src/qt/res/images/dark/ic-transaction-staked-inactive.svg similarity index 100% rename from src/qt/pivx/res/img/dark/ic-transaction-staked-inactive.svg rename to src/qt/res/images/dark/ic-transaction-staked-inactive.svg diff --git a/src/qt/pivx/res/img/dark/ic-transaction-staked.svg b/src/qt/res/images/dark/ic-transaction-staked.svg similarity index 100% rename from src/qt/pivx/res/img/dark/ic-transaction-staked.svg rename to src/qt/res/images/dark/ic-transaction-staked.svg diff --git a/src/qt/pivx/res/img/dark/ic-transaction-warning.svg b/src/qt/res/images/dark/ic-transaction-warning.svg similarity index 100% rename from src/qt/pivx/res/img/dark/ic-transaction-warning.svg rename to src/qt/res/images/dark/ic-transaction-warning.svg diff --git a/src/qt/pivx/res/img/ic-add-label.svg b/src/qt/res/images/ic-add-label.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/ic-add-label.svg rename to src/qt/res/images/ic-add-label.svg diff --git a/src/qt/pivx/res/img/ic-add-liliac.svg b/src/qt/res/images/ic-add-liliac.svg similarity index 100% rename from src/qt/pivx/res/img/ic-add-liliac.svg rename to src/qt/res/images/ic-add-liliac.svg diff --git a/src/qt/pivx/res/img/ic-add-purple.svg b/src/qt/res/images/ic-add-purple.svg similarity index 100% rename from src/qt/pivx/res/img/ic-add-purple.svg rename to src/qt/res/images/ic-add-purple.svg diff --git a/src/qt/pivx/res/img/ic-add.svg b/src/qt/res/images/ic-add.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/ic-add.svg rename to src/qt/res/images/ic-add.svg diff --git a/src/qt/pivx/res/img/ic-address-book-grey.svg b/src/qt/res/images/ic-address-book-grey.svg similarity index 100% rename from src/qt/pivx/res/img/ic-address-book-grey.svg rename to src/qt/res/images/ic-address-book-grey.svg diff --git a/src/qt/pivx/res/img/ic-address-book-white.svg b/src/qt/res/images/ic-address-book-white.svg similarity index 100% rename from src/qt/pivx/res/img/ic-address-book-white.svg rename to src/qt/res/images/ic-address-book-white.svg diff --git a/src/qt/pivx/res/img/ic-address-book.svg b/src/qt/res/images/ic-address-book.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/ic-address-book.svg rename to src/qt/res/images/ic-address-book.svg diff --git a/src/qt/pivx/res/img/ic-address-send-white.svg b/src/qt/res/images/ic-address-send-white.svg similarity index 100% rename from src/qt/pivx/res/img/ic-address-send-white.svg rename to src/qt/res/images/ic-address-send-white.svg diff --git a/src/qt/pivx/res/img/ic-address-send.svg b/src/qt/res/images/ic-address-send.svg similarity index 100% rename from src/qt/pivx/res/img/ic-address-send.svg rename to src/qt/res/images/ic-address-send.svg diff --git a/src/qt/pivx/res/img/ic-arrow-drop-down-purple.svg b/src/qt/res/images/ic-arrow-drop-down-purple.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/ic-arrow-drop-down-purple.svg rename to src/qt/res/images/ic-arrow-drop-down-purple.svg diff --git a/src/qt/pivx/res/img/ic-arrow-drop-down-white.svg b/src/qt/res/images/ic-arrow-drop-down-white.svg similarity index 100% rename from src/qt/pivx/res/img/ic-arrow-drop-down-white.svg rename to src/qt/res/images/ic-arrow-drop-down-white.svg diff --git a/src/qt/pivx/res/img/ic-arrow-drop-down.svg b/src/qt/res/images/ic-arrow-drop-down.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/ic-arrow-drop-down.svg rename to src/qt/res/images/ic-arrow-drop-down.svg diff --git a/src/qt/pivx/res/img/ic-arrow-drop-up-purple.svg b/src/qt/res/images/ic-arrow-drop-up-purple.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/ic-arrow-drop-up-purple.svg rename to src/qt/res/images/ic-arrow-drop-up-purple.svg diff --git a/src/qt/pivx/res/img/ic-arrow-drop-up-white.svg b/src/qt/res/images/ic-arrow-drop-up-white.svg similarity index 100% rename from src/qt/pivx/res/img/ic-arrow-drop-up-white.svg rename to src/qt/res/images/ic-arrow-drop-up-white.svg diff --git a/src/qt/pivx/res/img/ic-arrow-drop-up.svg b/src/qt/res/images/ic-arrow-drop-up.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/ic-arrow-drop-up.svg rename to src/qt/res/images/ic-arrow-drop-up.svg diff --git a/src/qt/pivx/res/img/ic-arrow-drop-white-down.svg b/src/qt/res/images/ic-arrow-drop-white-down.svg similarity index 100% rename from src/qt/pivx/res/img/ic-arrow-drop-white-down.svg rename to src/qt/res/images/ic-arrow-drop-white-down.svg diff --git a/src/qt/pivx/res/img/ic-arrow-left-white.svg b/src/qt/res/images/ic-arrow-left-white.svg similarity index 100% rename from src/qt/pivx/res/img/ic-arrow-left-white.svg rename to src/qt/res/images/ic-arrow-left-white.svg diff --git a/src/qt/pivx/res/img/ic-arrow-left.svg b/src/qt/res/images/ic-arrow-left.svg similarity index 100% rename from src/qt/pivx/res/img/ic-arrow-left.svg rename to src/qt/res/images/ic-arrow-left.svg diff --git a/src/qt/pivx/res/img/ic-arrow-purple-down.svg b/src/qt/res/images/ic-arrow-purple-down.svg similarity index 100% rename from src/qt/pivx/res/img/ic-arrow-purple-down.svg rename to src/qt/res/images/ic-arrow-purple-down.svg diff --git a/src/qt/pivx/res/img/ic-arrow-right-white.svg b/src/qt/res/images/ic-arrow-right-white.svg similarity index 100% rename from src/qt/pivx/res/img/ic-arrow-right-white.svg rename to src/qt/res/images/ic-arrow-right-white.svg diff --git a/src/qt/pivx/res/img/ic-arrow-right.svg b/src/qt/res/images/ic-arrow-right.svg similarity index 100% rename from src/qt/pivx/res/img/ic-arrow-right.svg rename to src/qt/res/images/ic-arrow-right.svg diff --git a/src/qt/pivx/res/img/ic-arrow-white-left.svg b/src/qt/res/images/ic-arrow-white-left.svg similarity index 100% rename from src/qt/pivx/res/img/ic-arrow-white-left.svg rename to src/qt/res/images/ic-arrow-white-left.svg diff --git a/src/qt/pivx/res/img/ic-arrow-white-right.svg b/src/qt/res/images/ic-arrow-white-right.svg similarity index 100% rename from src/qt/pivx/res/img/ic-arrow-white-right.svg rename to src/qt/res/images/ic-arrow-white-right.svg diff --git a/src/qt/pivx/res/img/ic-check-active.svg b/src/qt/res/images/ic-check-active.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/ic-check-active.svg rename to src/qt/res/images/ic-check-active.svg diff --git a/src/qt/pivx/res/img/ic-check-block.svg b/src/qt/res/images/ic-check-block.svg similarity index 100% rename from src/qt/pivx/res/img/ic-check-block.svg rename to src/qt/res/images/ic-check-block.svg diff --git a/src/qt/pivx/res/img/ic-check-box-dark-active.svg b/src/qt/res/images/ic-check-box-dark-active.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/ic-check-box-dark-active.svg rename to src/qt/res/images/ic-check-box-dark-active.svg diff --git a/src/qt/pivx/res/img/ic-check-box-indeterminate.svg b/src/qt/res/images/ic-check-box-indeterminate.svg similarity index 100% rename from src/qt/pivx/res/img/ic-check-box-indeterminate.svg rename to src/qt/res/images/ic-check-box-indeterminate.svg diff --git a/src/qt/pivx/res/img/ic-check-box-light.svg b/src/qt/res/images/ic-check-box-light.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/ic-check-box-light.svg rename to src/qt/res/images/ic-check-box-light.svg diff --git a/src/qt/pivx/res/img/ic-check-box-liliac-indeterminate.svg b/src/qt/res/images/ic-check-box-liliac-indeterminate.svg similarity index 100% rename from src/qt/pivx/res/img/ic-check-box-liliac-indeterminate.svg rename to src/qt/res/images/ic-check-box-liliac-indeterminate.svg diff --git a/src/qt/pivx/res/img/ic-check-box.svg b/src/qt/res/images/ic-check-box.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/ic-check-box.svg rename to src/qt/res/images/ic-check-box.svg diff --git a/src/qt/pivx/res/img/ic-check-cold-staking-enabled.svg b/src/qt/res/images/ic-check-cold-staking-enabled.svg similarity index 100% rename from src/qt/pivx/res/img/ic-check-cold-staking-enabled.svg rename to src/qt/res/images/ic-check-cold-staking-enabled.svg diff --git a/src/qt/pivx/res/img/ic-check-cold-staking-off.svg b/src/qt/res/images/ic-check-cold-staking-off.svg similarity index 100% rename from src/qt/pivx/res/img/ic-check-cold-staking-off.svg rename to src/qt/res/images/ic-check-cold-staking-off.svg diff --git a/src/qt/pivx/res/img/ic-check-cold-staking.svg b/src/qt/res/images/ic-check-cold-staking.svg similarity index 100% rename from src/qt/pivx/res/img/ic-check-cold-staking.svg rename to src/qt/res/images/ic-check-cold-staking.svg diff --git a/src/qt/pivx/res/img/ic-check-connect-off.svg b/src/qt/res/images/ic-check-connect-off.svg similarity index 100% rename from src/qt/pivx/res/img/ic-check-connect-off.svg rename to src/qt/res/images/ic-check-connect-off.svg diff --git a/src/qt/pivx/res/img/ic-check-connect.svg b/src/qt/res/images/ic-check-connect.svg similarity index 100% rename from src/qt/pivx/res/img/ic-check-connect.svg rename to src/qt/res/images/ic-check-connect.svg diff --git a/src/qt/pivx/res/img/ic-check-dark.svg b/src/qt/res/images/ic-check-dark.svg similarity index 100% rename from src/qt/pivx/res/img/ic-check-dark.svg rename to src/qt/res/images/ic-check-dark.svg diff --git a/src/qt/pivx/res/img/ic-check-faq.svg b/src/qt/res/images/ic-check-faq.svg similarity index 100% rename from src/qt/pivx/res/img/ic-check-faq.svg rename to src/qt/res/images/ic-check-faq.svg diff --git a/src/qt/pivx/res/img/ic-check-liliac-indeterminate.svg b/src/qt/res/images/ic-check-liliac-indeterminate.svg similarity index 100% rename from src/qt/pivx/res/img/ic-check-liliac-indeterminate.svg rename to src/qt/res/images/ic-check-liliac-indeterminate.svg diff --git a/src/qt/pivx/res/img/ic-check-liliac-on.svg b/src/qt/res/images/ic-check-liliac-on.svg similarity index 100% rename from src/qt/pivx/res/img/ic-check-liliac-on.svg rename to src/qt/res/images/ic-check-liliac-on.svg diff --git a/src/qt/pivx/res/img/ic-check-locked-off.svg b/src/qt/res/images/ic-check-locked-off.svg similarity index 100% rename from src/qt/pivx/res/img/ic-check-locked-off.svg rename to src/qt/res/images/ic-check-locked-off.svg diff --git a/src/qt/pivx/res/img/ic-check-locked.svg b/src/qt/res/images/ic-check-locked.svg similarity index 100% rename from src/qt/pivx/res/img/ic-check-locked.svg rename to src/qt/res/images/ic-check-locked.svg diff --git a/src/qt/pivx/res/img/ic-check-mint-off.svg b/src/qt/res/images/ic-check-mint-off.svg similarity index 100% rename from src/qt/pivx/res/img/ic-check-mint-off.svg rename to src/qt/res/images/ic-check-mint-off.svg diff --git a/src/qt/pivx/res/img/ic-check-mint.svg b/src/qt/res/images/ic-check-mint.svg similarity index 100% rename from src/qt/pivx/res/img/ic-check-mint.svg rename to src/qt/res/images/ic-check-mint.svg diff --git a/src/qt/pivx/res/img/ic-check-peers-off.svg b/src/qt/res/images/ic-check-peers-off.svg similarity index 100% rename from src/qt/pivx/res/img/ic-check-peers-off.svg rename to src/qt/res/images/ic-check-peers-off.svg diff --git a/src/qt/pivx/res/img/ic-check-peers.svg b/src/qt/res/images/ic-check-peers.svg similarity index 100% rename from src/qt/pivx/res/img/ic-check-peers.svg rename to src/qt/res/images/ic-check-peers.svg diff --git a/src/qt/pivx/res/img/ic-check-staking-off.svg b/src/qt/res/images/ic-check-staking-off.svg similarity index 100% rename from src/qt/pivx/res/img/ic-check-staking-off.svg rename to src/qt/res/images/ic-check-staking-off.svg diff --git a/src/qt/pivx/res/img/ic-check-staking.svg b/src/qt/res/images/ic-check-staking.svg similarity index 100% rename from src/qt/pivx/res/img/ic-check-staking.svg rename to src/qt/res/images/ic-check-staking.svg diff --git a/src/qt/pivx/res/img/ic-check-sync-off.svg b/src/qt/res/images/ic-check-sync-off.svg similarity index 100% rename from src/qt/pivx/res/img/ic-check-sync-off.svg rename to src/qt/res/images/ic-check-sync-off.svg diff --git a/src/qt/pivx/res/img/ic-check-sync.png b/src/qt/res/images/ic-check-sync.png similarity index 100% rename from src/qt/pivx/res/img/ic-check-sync.png rename to src/qt/res/images/ic-check-sync.png diff --git a/src/qt/pivx/res/img/ic-check-sync.svg b/src/qt/res/images/ic-check-sync.svg similarity index 100% rename from src/qt/pivx/res/img/ic-check-sync.svg rename to src/qt/res/images/ic-check-sync.svg diff --git a/src/qt/pivx/res/img/ic-check-theme-dark.svg b/src/qt/res/images/ic-check-theme-dark.svg similarity index 100% rename from src/qt/pivx/res/img/ic-check-theme-dark.svg rename to src/qt/res/images/ic-check-theme-dark.svg diff --git a/src/qt/pivx/res/img/ic-check-theme-light.svg b/src/qt/res/images/ic-check-theme-light.svg similarity index 100% rename from src/qt/pivx/res/img/ic-check-theme-light.svg rename to src/qt/res/images/ic-check-theme-light.svg diff --git a/src/qt/pivx/res/img/ic-check-tor-off.svg b/src/qt/res/images/ic-check-tor-off.svg similarity index 100% rename from src/qt/pivx/res/img/ic-check-tor-off.svg rename to src/qt/res/images/ic-check-tor-off.svg diff --git a/src/qt/pivx/res/img/ic-check-tor.svg b/src/qt/res/images/ic-check-tor.svg similarity index 100% rename from src/qt/pivx/res/img/ic-check-tor.svg rename to src/qt/res/images/ic-check-tor.svg diff --git a/src/qt/pivx/res/img/ic-check-vote-active-dark.svg b/src/qt/res/images/ic-check-vote-active-dark.svg similarity index 100% rename from src/qt/pivx/res/img/ic-check-vote-active-dark.svg rename to src/qt/res/images/ic-check-vote-active-dark.svg diff --git a/src/qt/pivx/res/img/ic-check-vote-active.svg b/src/qt/res/images/ic-check-vote-active.svg similarity index 100% rename from src/qt/pivx/res/img/ic-check-vote-active.svg rename to src/qt/res/images/ic-check-vote-active.svg diff --git a/src/qt/pivx/res/img/ic-check-vote-dark.svg b/src/qt/res/images/ic-check-vote-dark.svg similarity index 100% rename from src/qt/pivx/res/img/ic-check-vote-dark.svg rename to src/qt/res/images/ic-check-vote-dark.svg diff --git a/src/qt/pivx/res/img/ic-check-vote.svg b/src/qt/res/images/ic-check-vote.svg similarity index 100% rename from src/qt/pivx/res/img/ic-check-vote.svg rename to src/qt/res/images/ic-check-vote.svg diff --git a/src/qt/pivx/res/img/ic-check-white.svg b/src/qt/res/images/ic-check-white.svg similarity index 100% rename from src/qt/pivx/res/img/ic-check-white.svg rename to src/qt/res/images/ic-check-white.svg diff --git a/src/qt/pivx/res/img/ic-check.svg b/src/qt/res/images/ic-check.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/ic-check.svg rename to src/qt/res/images/ic-check.svg diff --git a/src/qt/pivx/res/img/ic-chevron-left.svg b/src/qt/res/images/ic-chevron-left.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/ic-chevron-left.svg rename to src/qt/res/images/ic-chevron-left.svg diff --git a/src/qt/pivx/res/img/ic-chevron-right-liliac.svg b/src/qt/res/images/ic-chevron-right-liliac.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/ic-chevron-right-liliac.svg rename to src/qt/res/images/ic-chevron-right-liliac.svg diff --git a/src/qt/pivx/res/img/ic-chevron-right.svg b/src/qt/res/images/ic-chevron-right.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/ic-chevron-right.svg rename to src/qt/res/images/ic-chevron-right.svg diff --git a/src/qt/pivx/res/img/ic-clear-liliac.svg b/src/qt/res/images/ic-clear-liliac.svg similarity index 100% rename from src/qt/pivx/res/img/ic-clear-liliac.svg rename to src/qt/res/images/ic-clear-liliac.svg diff --git a/src/qt/pivx/res/img/ic-clear-purple.svg b/src/qt/res/images/ic-clear-purple.svg similarity index 100% rename from src/qt/pivx/res/img/ic-clear-purple.svg rename to src/qt/res/images/ic-clear-purple.svg diff --git a/src/qt/pivx/res/img/ic-close-white.svg b/src/qt/res/images/ic-close-white.svg similarity index 100% rename from src/qt/pivx/res/img/ic-close-white.svg rename to src/qt/res/images/ic-close-white.svg diff --git a/src/qt/pivx/res/img/ic-close.svg b/src/qt/res/images/ic-close.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/ic-close.svg rename to src/qt/res/images/ic-close.svg diff --git a/src/qt/pivx/res/img/ic-coin-piv.svg b/src/qt/res/images/ic-coin-piv.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/ic-coin-piv.svg rename to src/qt/res/images/ic-coin-piv.svg diff --git a/src/qt/pivx/res/img/ic-coin-zpiv.png b/src/qt/res/images/ic-coin-zpiv.png similarity index 100% rename from src/qt/pivx/res/img/ic-coin-zpiv.png rename to src/qt/res/images/ic-coin-zpiv.png diff --git a/src/qt/pivx/res/img/ic-coin-zpiv.svg b/src/qt/res/images/ic-coin-zpiv.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/ic-coin-zpiv.svg rename to src/qt/res/images/ic-coin-zpiv.svg diff --git a/src/qt/pivx/res/img/ic-combo-box.svg b/src/qt/res/images/ic-combo-box.svg similarity index 100% rename from src/qt/pivx/res/img/ic-combo-box.svg rename to src/qt/res/images/ic-combo-box.svg diff --git a/src/qt/pivx/res/img/ic-connect.svg b/src/qt/res/images/ic-connect.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/ic-connect.svg rename to src/qt/res/images/ic-connect.svg diff --git a/src/qt/pivx/res/img/ic-contact-arrow-down-white.svg b/src/qt/res/images/ic-contact-arrow-down-white.svg similarity index 100% rename from src/qt/pivx/res/img/ic-contact-arrow-down-white.svg rename to src/qt/res/images/ic-contact-arrow-down-white.svg diff --git a/src/qt/pivx/res/img/ic-contact-arrow-down.svg b/src/qt/res/images/ic-contact-arrow-down.svg similarity index 100% rename from src/qt/pivx/res/img/ic-contact-arrow-down.svg rename to src/qt/res/images/ic-contact-arrow-down.svg diff --git a/src/qt/pivx/res/img/ic-copy-big-white.svg b/src/qt/res/images/ic-copy-big-white.svg similarity index 100% rename from src/qt/pivx/res/img/ic-copy-big-white.svg rename to src/qt/res/images/ic-copy-big-white.svg diff --git a/src/qt/pivx/res/img/ic-copy-big.svg b/src/qt/res/images/ic-copy-big.svg similarity index 100% rename from src/qt/pivx/res/img/ic-copy-big.svg rename to src/qt/res/images/ic-copy-big.svg diff --git a/src/qt/pivx/res/img/ic-copy-liliac.svg b/src/qt/res/images/ic-copy-liliac.svg similarity index 100% rename from src/qt/pivx/res/img/ic-copy-liliac.svg rename to src/qt/res/images/ic-copy-liliac.svg diff --git a/src/qt/pivx/res/img/ic-copy.svg b/src/qt/res/images/ic-copy.svg similarity index 100% rename from src/qt/pivx/res/img/ic-copy.svg rename to src/qt/res/images/ic-copy.svg diff --git a/src/qt/pivx/res/img/ic-exit.svg b/src/qt/res/images/ic-exit.svg similarity index 100% rename from src/qt/pivx/res/img/ic-exit.svg rename to src/qt/res/images/ic-exit.svg diff --git a/src/qt/pivx/res/img/ic-expand.svg b/src/qt/res/images/ic-expand.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/ic-expand.svg rename to src/qt/res/images/ic-expand.svg diff --git a/src/qt/pivx/res/img/ic-filter.svg b/src/qt/res/images/ic-filter.svg similarity index 100% rename from src/qt/pivx/res/img/ic-filter.svg rename to src/qt/res/images/ic-filter.svg diff --git a/src/qt/pivx/res/img/ic-folder.svg b/src/qt/res/images/ic-folder.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/ic-folder.svg rename to src/qt/res/images/ic-folder.svg diff --git a/src/qt/pivx/res/img/ic-information-hover.svg b/src/qt/res/images/ic-information-hover.svg similarity index 100% rename from src/qt/pivx/res/img/ic-information-hover.svg rename to src/qt/res/images/ic-information-hover.svg diff --git a/src/qt/pivx/res/img/ic-information.svg b/src/qt/res/images/ic-information.svg similarity index 100% rename from src/qt/pivx/res/img/ic-information.svg rename to src/qt/res/images/ic-information.svg diff --git a/src/qt/pivx/res/img/ic-label-liliac.svg b/src/qt/res/images/ic-label-liliac.svg similarity index 100% rename from src/qt/pivx/res/img/ic-label-liliac.svg rename to src/qt/res/images/ic-label-liliac.svg diff --git a/src/qt/pivx/res/img/ic-label.svg b/src/qt/res/images/ic-label.svg similarity index 100% rename from src/qt/pivx/res/img/ic-label.svg rename to src/qt/res/images/ic-label.svg diff --git a/src/qt/pivx/res/img/ic-link-hover.svg b/src/qt/res/images/ic-link-hover.svg similarity index 100% rename from src/qt/pivx/res/img/ic-link-hover.svg rename to src/qt/res/images/ic-link-hover.svg diff --git a/src/qt/pivx/res/img/ic-link.svg b/src/qt/res/images/ic-link.svg similarity index 100% rename from src/qt/pivx/res/img/ic-link.svg rename to src/qt/res/images/ic-link.svg diff --git a/src/qt/pivx/res/img/ic-menu-hover.svg b/src/qt/res/images/ic-menu-hover.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/ic-menu-hover.svg rename to src/qt/res/images/ic-menu-hover.svg diff --git a/src/qt/pivx/res/img/ic-mint.svg b/src/qt/res/images/ic-mint.svg similarity index 100% rename from src/qt/pivx/res/img/ic-mint.svg rename to src/qt/res/images/ic-mint.svg diff --git a/src/qt/pivx/res/img/ic-nav-address-active.svg b/src/qt/res/images/ic-nav-address-active.svg similarity index 100% rename from src/qt/pivx/res/img/ic-nav-address-active.svg rename to src/qt/res/images/ic-nav-address-active.svg diff --git a/src/qt/pivx/res/img/ic-nav-address-hover.svg b/src/qt/res/images/ic-nav-address-hover.svg similarity index 100% rename from src/qt/pivx/res/img/ic-nav-address-hover.svg rename to src/qt/res/images/ic-nav-address-hover.svg diff --git a/src/qt/pivx/res/img/ic-nav-address.svg b/src/qt/res/images/ic-nav-address.svg similarity index 100% rename from src/qt/pivx/res/img/ic-nav-address.svg rename to src/qt/res/images/ic-nav-address.svg diff --git a/src/qt/pivx/res/img/ic-nav-cold-staking-active.svg b/src/qt/res/images/ic-nav-cold-staking-active.svg similarity index 100% rename from src/qt/pivx/res/img/ic-nav-cold-staking-active.svg rename to src/qt/res/images/ic-nav-cold-staking-active.svg diff --git a/src/qt/pivx/res/img/ic-nav-cold-staking.svg b/src/qt/res/images/ic-nav-cold-staking.svg similarity index 100% rename from src/qt/pivx/res/img/ic-nav-cold-staking.svg rename to src/qt/res/images/ic-nav-cold-staking.svg diff --git a/src/qt/pivx/res/img/ic-nav-dashboard-active.svg b/src/qt/res/images/ic-nav-dashboard-active.svg similarity index 100% rename from src/qt/pivx/res/img/ic-nav-dashboard-active.svg rename to src/qt/res/images/ic-nav-dashboard-active.svg diff --git a/src/qt/pivx/res/img/ic-nav-dashboard-hover.svg b/src/qt/res/images/ic-nav-dashboard-hover.svg similarity index 100% rename from src/qt/pivx/res/img/ic-nav-dashboard-hover.svg rename to src/qt/res/images/ic-nav-dashboard-hover.svg diff --git a/src/qt/pivx/res/img/ic-nav-dashboard.svg b/src/qt/res/images/ic-nav-dashboard.svg similarity index 100% rename from src/qt/pivx/res/img/ic-nav-dashboard.svg rename to src/qt/res/images/ic-nav-dashboard.svg diff --git a/src/qt/pivx/res/img/ic-nav-governance-active.svg b/src/qt/res/images/ic-nav-governance-active.svg similarity index 100% rename from src/qt/pivx/res/img/ic-nav-governance-active.svg rename to src/qt/res/images/ic-nav-governance-active.svg diff --git a/src/qt/pivx/res/img/ic-nav-governance-hover.svg b/src/qt/res/images/ic-nav-governance-hover.svg similarity index 100% rename from src/qt/pivx/res/img/ic-nav-governance-hover.svg rename to src/qt/res/images/ic-nav-governance-hover.svg diff --git a/src/qt/pivx/res/img/ic-nav-governance.svg b/src/qt/res/images/ic-nav-governance.svg similarity index 100% rename from src/qt/pivx/res/img/ic-nav-governance.svg rename to src/qt/res/images/ic-nav-governance.svg diff --git a/src/qt/pivx/res/img/ic-nav-master-active.svg b/src/qt/res/images/ic-nav-master-active.svg similarity index 100% rename from src/qt/pivx/res/img/ic-nav-master-active.svg rename to src/qt/res/images/ic-nav-master-active.svg diff --git a/src/qt/pivx/res/img/ic-nav-master-hover.svg b/src/qt/res/images/ic-nav-master-hover.svg similarity index 100% rename from src/qt/pivx/res/img/ic-nav-master-hover.svg rename to src/qt/res/images/ic-nav-master-hover.svg diff --git a/src/qt/pivx/res/img/ic-nav-master.svg b/src/qt/res/images/ic-nav-master.svg similarity index 100% rename from src/qt/pivx/res/img/ic-nav-master.svg rename to src/qt/res/images/ic-nav-master.svg diff --git a/src/qt/pivx/res/img/ic-nav-privacy-active.svg b/src/qt/res/images/ic-nav-privacy-active.svg similarity index 100% rename from src/qt/pivx/res/img/ic-nav-privacy-active.svg rename to src/qt/res/images/ic-nav-privacy-active.svg diff --git a/src/qt/pivx/res/img/ic-nav-privacy-hover.svg b/src/qt/res/images/ic-nav-privacy-hover.svg similarity index 100% rename from src/qt/pivx/res/img/ic-nav-privacy-hover.svg rename to src/qt/res/images/ic-nav-privacy-hover.svg diff --git a/src/qt/pivx/res/img/ic-nav-privacy.svg b/src/qt/res/images/ic-nav-privacy.svg similarity index 100% rename from src/qt/pivx/res/img/ic-nav-privacy.svg rename to src/qt/res/images/ic-nav-privacy.svg diff --git a/src/qt/pivx/res/img/ic-nav-receive-active.svg b/src/qt/res/images/ic-nav-receive-active.svg similarity index 100% rename from src/qt/pivx/res/img/ic-nav-receive-active.svg rename to src/qt/res/images/ic-nav-receive-active.svg diff --git a/src/qt/pivx/res/img/ic-nav-receive-hover.svg b/src/qt/res/images/ic-nav-receive-hover.svg similarity index 100% rename from src/qt/pivx/res/img/ic-nav-receive-hover.svg rename to src/qt/res/images/ic-nav-receive-hover.svg diff --git a/src/qt/pivx/res/img/ic-nav-receive.svg b/src/qt/res/images/ic-nav-receive.svg similarity index 100% rename from src/qt/pivx/res/img/ic-nav-receive.svg rename to src/qt/res/images/ic-nav-receive.svg diff --git a/src/qt/pivx/res/img/ic-nav-send-active.svg b/src/qt/res/images/ic-nav-send-active.svg similarity index 100% rename from src/qt/pivx/res/img/ic-nav-send-active.svg rename to src/qt/res/images/ic-nav-send-active.svg diff --git a/src/qt/pivx/res/img/ic-nav-send-hover.svg b/src/qt/res/images/ic-nav-send-hover.svg similarity index 100% rename from src/qt/pivx/res/img/ic-nav-send-hover.svg rename to src/qt/res/images/ic-nav-send-hover.svg diff --git a/src/qt/pivx/res/img/ic-nav-send.svg b/src/qt/res/images/ic-nav-send.svg similarity index 100% rename from src/qt/pivx/res/img/ic-nav-send.svg rename to src/qt/res/images/ic-nav-send.svg diff --git a/src/qt/pivx/res/img/ic-nav-settings-active.svg b/src/qt/res/images/ic-nav-settings-active.svg similarity index 100% rename from src/qt/pivx/res/img/ic-nav-settings-active.svg rename to src/qt/res/images/ic-nav-settings-active.svg diff --git a/src/qt/pivx/res/img/ic-nav-settings-hover.svg b/src/qt/res/images/ic-nav-settings-hover.svg similarity index 100% rename from src/qt/pivx/res/img/ic-nav-settings-hover.svg rename to src/qt/res/images/ic-nav-settings-hover.svg diff --git a/src/qt/pivx/res/img/ic-nav-settings.svg b/src/qt/res/images/ic-nav-settings.svg similarity index 100% rename from src/qt/pivx/res/img/ic-nav-settings.svg rename to src/qt/res/images/ic-nav-settings.svg diff --git a/src/qt/pivx/res/img/ic-pending.svg b/src/qt/res/images/ic-pending.svg similarity index 100% rename from src/qt/pivx/res/img/ic-pending.svg rename to src/qt/res/images/ic-pending.svg diff --git a/src/qt/pivx/res/img/ic-radio-liliac-on.svg b/src/qt/res/images/ic-radio-liliac-on.svg similarity index 100% rename from src/qt/pivx/res/img/ic-radio-liliac-on.svg rename to src/qt/res/images/ic-radio-liliac-on.svg diff --git a/src/qt/pivx/res/img/ic-receive-off.svg b/src/qt/res/images/ic-receive-off.svg similarity index 100% rename from src/qt/pivx/res/img/ic-receive-off.svg rename to src/qt/res/images/ic-receive-off.svg diff --git a/src/qt/pivx/res/img/ic-receive-on.svg b/src/qt/res/images/ic-receive-on.svg similarity index 100% rename from src/qt/pivx/res/img/ic-receive-on.svg rename to src/qt/res/images/ic-receive-on.svg diff --git a/src/qt/pivx/res/img/ic-received.svg b/src/qt/res/images/ic-received.svg similarity index 100% rename from src/qt/pivx/res/img/ic-received.svg rename to src/qt/res/images/ic-received.svg diff --git a/src/qt/pivx/res/img/ic-send.svg b/src/qt/res/images/ic-send.svg similarity index 100% rename from src/qt/pivx/res/img/ic-send.svg rename to src/qt/res/images/ic-send.svg diff --git a/src/qt/pivx/res/img/ic-submenu-lock.svg b/src/qt/res/images/ic-submenu-lock.svg similarity index 100% rename from src/qt/pivx/res/img/ic-submenu-lock.svg rename to src/qt/res/images/ic-submenu-lock.svg diff --git a/src/qt/pivx/res/img/ic-submenu-staking.svg b/src/qt/res/images/ic-submenu-staking.svg similarity index 100% rename from src/qt/pivx/res/img/ic-submenu-staking.svg rename to src/qt/res/images/ic-submenu-staking.svg diff --git a/src/qt/pivx/res/img/ic-submenu-unlock.svg b/src/qt/res/images/ic-submenu-unlock.svg similarity index 100% rename from src/qt/pivx/res/img/ic-submenu-unlock.svg rename to src/qt/res/images/ic-submenu-unlock.svg diff --git a/src/qt/pivx/res/img/ic-switch-liliac-on.svg b/src/qt/res/images/ic-switch-liliac-on.svg similarity index 100% rename from src/qt/pivx/res/img/ic-switch-liliac-on.svg rename to src/qt/res/images/ic-switch-liliac-on.svg diff --git a/src/qt/pivx/res/img/ic-switch-off.svg b/src/qt/res/images/ic-switch-off.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/ic-switch-off.svg rename to src/qt/res/images/ic-switch-off.svg diff --git a/src/qt/pivx/res/img/ic-switch-on.svg b/src/qt/res/images/ic-switch-on.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/ic-switch-on.svg rename to src/qt/res/images/ic-switch-on.svg diff --git a/src/qt/pivx/res/img/ic-time.svg b/src/qt/res/images/ic-time.svg similarity index 100% rename from src/qt/pivx/res/img/ic-time.svg rename to src/qt/res/images/ic-time.svg diff --git a/src/qt/pivx/res/img/ic-transaction-cs-contract-inactive.svg b/src/qt/res/images/ic-transaction-cs-contract-inactive.svg similarity index 100% rename from src/qt/pivx/res/img/ic-transaction-cs-contract-inactive.svg rename to src/qt/res/images/ic-transaction-cs-contract-inactive.svg diff --git a/src/qt/pivx/res/img/ic-transaction-cs-contract.svg b/src/qt/res/images/ic-transaction-cs-contract.svg similarity index 100% rename from src/qt/pivx/res/img/ic-transaction-cs-contract.svg rename to src/qt/res/images/ic-transaction-cs-contract.svg diff --git a/src/qt/pivx/res/img/ic-transaction-mint-inactive.svg b/src/qt/res/images/ic-transaction-mint-inactive.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/ic-transaction-mint-inactive.svg rename to src/qt/res/images/ic-transaction-mint-inactive.svg diff --git a/src/qt/pivx/res/img/ic-transaction-mint.svg b/src/qt/res/images/ic-transaction-mint.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/ic-transaction-mint.svg rename to src/qt/res/images/ic-transaction-mint.svg diff --git a/src/qt/pivx/res/img/ic-transaction-received-inactive.svg b/src/qt/res/images/ic-transaction-received-inactive.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/ic-transaction-received-inactive.svg rename to src/qt/res/images/ic-transaction-received-inactive.svg diff --git a/src/qt/pivx/res/img/ic-transaction-received-memo.svg b/src/qt/res/images/ic-transaction-received-memo.svg similarity index 100% rename from src/qt/pivx/res/img/ic-transaction-received-memo.svg rename to src/qt/res/images/ic-transaction-received-memo.svg diff --git a/src/qt/pivx/res/img/ic-transaction-received.svg b/src/qt/res/images/ic-transaction-received.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/ic-transaction-received.svg rename to src/qt/res/images/ic-transaction-received.svg diff --git a/src/qt/pivx/res/img/ic-transaction-sent-inactive.svg b/src/qt/res/images/ic-transaction-sent-inactive.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/ic-transaction-sent-inactive.svg rename to src/qt/res/images/ic-transaction-sent-inactive.svg diff --git a/src/qt/pivx/res/img/ic-transaction-sent.svg b/src/qt/res/images/ic-transaction-sent.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/ic-transaction-sent.svg rename to src/qt/res/images/ic-transaction-sent.svg diff --git a/src/qt/pivx/res/img/ic-transaction-stake-delegated-inactive.svg b/src/qt/res/images/ic-transaction-stake-delegated-inactive.svg similarity index 100% rename from src/qt/pivx/res/img/ic-transaction-stake-delegated-inactive.svg rename to src/qt/res/images/ic-transaction-stake-delegated-inactive.svg diff --git a/src/qt/pivx/res/img/ic-transaction-stake-delegated.svg b/src/qt/res/images/ic-transaction-stake-delegated.svg similarity index 100% rename from src/qt/pivx/res/img/ic-transaction-stake-delegated.svg rename to src/qt/res/images/ic-transaction-stake-delegated.svg diff --git a/src/qt/pivx/res/img/ic-transaction-stake-hot-inactive.svg b/src/qt/res/images/ic-transaction-stake-hot-inactive.svg similarity index 100% rename from src/qt/pivx/res/img/ic-transaction-stake-hot-inactive.svg rename to src/qt/res/images/ic-transaction-stake-hot-inactive.svg diff --git a/src/qt/pivx/res/img/ic-transaction-stake-hot.svg b/src/qt/res/images/ic-transaction-stake-hot.svg similarity index 100% rename from src/qt/pivx/res/img/ic-transaction-stake-hot.svg rename to src/qt/res/images/ic-transaction-stake-hot.svg diff --git a/src/qt/pivx/res/img/ic-transaction-staked-inactive.svg b/src/qt/res/images/ic-transaction-staked-inactive.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/ic-transaction-staked-inactive.svg rename to src/qt/res/images/ic-transaction-staked-inactive.svg diff --git a/src/qt/pivx/res/img/ic-transaction-staked.svg b/src/qt/res/images/ic-transaction-staked.svg old mode 100755 new mode 100644 similarity index 100% rename from src/qt/pivx/res/img/ic-transaction-staked.svg rename to src/qt/res/images/ic-transaction-staked.svg diff --git a/src/qt/pivx/res/img/ic-transaction-warning.svg b/src/qt/res/images/ic-transaction-warning.svg similarity index 100% rename from src/qt/pivx/res/img/ic-transaction-warning.svg rename to src/qt/res/images/ic-transaction-warning.svg diff --git a/src/qt/pivx/res/img/ic-unlock-staking.svg b/src/qt/res/images/ic-unlock-staking.svg similarity index 100% rename from src/qt/pivx/res/img/ic-unlock-staking.svg rename to src/qt/res/images/ic-unlock-staking.svg diff --git a/src/qt/pivx/res/img/ic-update-liliac.svg b/src/qt/res/images/ic-update-liliac.svg similarity index 100% rename from src/qt/pivx/res/img/ic-update-liliac.svg rename to src/qt/res/images/ic-update-liliac.svg diff --git a/src/qt/pivx/res/img/ic-update.svg b/src/qt/res/images/ic-update.svg similarity index 100% rename from src/qt/pivx/res/img/ic-update.svg rename to src/qt/res/images/ic-update.svg diff --git a/src/qt/pivx/res/img/ic-wallet-status-locked.svg b/src/qt/res/images/ic-wallet-status-locked.svg similarity index 100% rename from src/qt/pivx/res/img/ic-wallet-status-locked.svg rename to src/qt/res/images/ic-wallet-status-locked.svg diff --git a/src/qt/pivx/res/img/ic-wallet-status-staking.svg b/src/qt/res/images/ic-wallet-status-staking.svg similarity index 100% rename from src/qt/pivx/res/img/ic-wallet-status-staking.svg rename to src/qt/res/images/ic-wallet-status-staking.svg diff --git a/src/qt/pivx/res/img/ic-wallet-status-unlocked.svg b/src/qt/res/images/ic-wallet-status-unlocked.svg similarity index 100% rename from src/qt/pivx/res/img/ic-wallet-status-unlocked.svg rename to src/qt/res/images/ic-wallet-status-unlocked.svg diff --git a/src/qt/pivx/res/img/ic-watch-password-white.svg b/src/qt/res/images/ic-watch-password-white.svg similarity index 100% rename from src/qt/pivx/res/img/ic-watch-password-white.svg rename to src/qt/res/images/ic-watch-password-white.svg diff --git a/src/qt/pivx/res/img/ic-watch-password.svg b/src/qt/res/images/ic-watch-password.svg similarity index 100% rename from src/qt/pivx/res/img/ic-watch-password.svg rename to src/qt/res/images/ic-watch-password.svg diff --git a/src/qt/pivx/res/img/img-dashboard-banner.jpg b/src/qt/res/images/img-dashboard-banner.jpg similarity index 100% rename from src/qt/pivx/res/img/img-dashboard-banner.jpg rename to src/qt/res/images/img-dashboard-banner.jpg diff --git a/src/qt/pivx/res/img/img-empty-contacts.svg b/src/qt/res/images/img-empty-contacts.svg similarity index 100% rename from src/qt/pivx/res/img/img-empty-contacts.svg rename to src/qt/res/images/img-empty-contacts.svg diff --git a/src/qt/pivx/res/img/img-empty-dark-contacts.svg b/src/qt/res/images/img-empty-dark-contacts.svg similarity index 100% rename from src/qt/pivx/res/img/img-empty-dark-contacts.svg rename to src/qt/res/images/img-empty-dark-contacts.svg diff --git a/src/qt/pivx/res/img/img-empty-dark-error.svg b/src/qt/res/images/img-empty-dark-error.svg similarity index 100% rename from src/qt/pivx/res/img/img-empty-dark-error.svg rename to src/qt/res/images/img-empty-dark-error.svg diff --git a/src/qt/pivx/res/img/img-empty-dark-governance.svg b/src/qt/res/images/img-empty-dark-governance.svg similarity index 100% rename from src/qt/pivx/res/img/img-empty-dark-governance.svg rename to src/qt/res/images/img-empty-dark-governance.svg diff --git a/src/qt/pivx/res/img/img-empty-dark-masternode.svg b/src/qt/res/images/img-empty-dark-masternode.svg similarity index 100% rename from src/qt/pivx/res/img/img-empty-dark-masternode.svg rename to src/qt/res/images/img-empty-dark-masternode.svg diff --git a/src/qt/pivx/res/img/img-empty-dark-multisend.svg b/src/qt/res/images/img-empty-dark-multisend.svg similarity index 100% rename from src/qt/pivx/res/img/img-empty-dark-multisend.svg rename to src/qt/res/images/img-empty-dark-multisend.svg diff --git a/src/qt/pivx/res/img/img-empty-dark-peers.svg b/src/qt/res/images/img-empty-dark-peers.svg similarity index 100% rename from src/qt/pivx/res/img/img-empty-dark-peers.svg rename to src/qt/res/images/img-empty-dark-peers.svg diff --git a/src/qt/pivx/res/img/img-empty-dark-staking-off.svg b/src/qt/res/images/img-empty-dark-staking-off.svg similarity index 100% rename from src/qt/pivx/res/img/img-empty-dark-staking-off.svg rename to src/qt/res/images/img-empty-dark-staking-off.svg diff --git a/src/qt/pivx/res/img/img-empty-dark-staking-on.svg b/src/qt/res/images/img-empty-dark-staking-on.svg similarity index 100% rename from src/qt/pivx/res/img/img-empty-dark-staking-on.svg rename to src/qt/res/images/img-empty-dark-staking-on.svg diff --git a/src/qt/pivx/res/img/img-empty-dark-transactions.svg b/src/qt/res/images/img-empty-dark-transactions.svg similarity index 100% rename from src/qt/pivx/res/img/img-empty-dark-transactions.svg rename to src/qt/res/images/img-empty-dark-transactions.svg diff --git a/src/qt/pivx/res/img/img-empty-error.svg b/src/qt/res/images/img-empty-error.svg similarity index 100% rename from src/qt/pivx/res/img/img-empty-error.svg rename to src/qt/res/images/img-empty-error.svg diff --git a/src/qt/pivx/res/img/img-empty-governance.svg b/src/qt/res/images/img-empty-governance.svg similarity index 100% rename from src/qt/pivx/res/img/img-empty-governance.svg rename to src/qt/res/images/img-empty-governance.svg diff --git a/src/qt/pivx/res/img/img-empty-masternode.svg b/src/qt/res/images/img-empty-masternode.svg similarity index 100% rename from src/qt/pivx/res/img/img-empty-masternode.svg rename to src/qt/res/images/img-empty-masternode.svg diff --git a/src/qt/pivx/res/img/img-empty-multisend.svg b/src/qt/res/images/img-empty-multisend.svg similarity index 100% rename from src/qt/pivx/res/img/img-empty-multisend.svg rename to src/qt/res/images/img-empty-multisend.svg diff --git a/src/qt/pivx/res/img/img-empty-peers.svg b/src/qt/res/images/img-empty-peers.svg similarity index 100% rename from src/qt/pivx/res/img/img-empty-peers.svg rename to src/qt/res/images/img-empty-peers.svg diff --git a/src/qt/pivx/res/img/img-empty-privacy-dark.svg b/src/qt/res/images/img-empty-privacy-dark.svg similarity index 100% rename from src/qt/pivx/res/img/img-empty-privacy-dark.svg rename to src/qt/res/images/img-empty-privacy-dark.svg diff --git a/src/qt/pivx/res/img/img-empty-privacy.svg b/src/qt/res/images/img-empty-privacy.svg similarity index 100% rename from src/qt/pivx/res/img/img-empty-privacy.svg rename to src/qt/res/images/img-empty-privacy.svg diff --git a/src/qt/pivx/res/img/img-empty-staking-off.svg b/src/qt/res/images/img-empty-staking-off.svg similarity index 100% rename from src/qt/pivx/res/img/img-empty-staking-off.svg rename to src/qt/res/images/img-empty-staking-off.svg diff --git a/src/qt/pivx/res/img/img-empty-staking-on.svg b/src/qt/res/images/img-empty-staking-on.svg similarity index 100% rename from src/qt/pivx/res/img/img-empty-staking-on.svg rename to src/qt/res/images/img-empty-staking-on.svg diff --git a/src/qt/pivx/res/img/img-empty-transactions.svg b/src/qt/res/images/img-empty-transactions.svg similarity index 100% rename from src/qt/pivx/res/img/img-empty-transactions.svg rename to src/qt/res/images/img-empty-transactions.svg diff --git a/src/qt/pivx/res/img/img-logo-pivx.png b/src/qt/res/images/img-logo-pivx.png similarity index 100% rename from src/qt/pivx/res/img/img-logo-pivx.png rename to src/qt/res/images/img-logo-pivx.png diff --git a/src/qt/pivx/res/img/img-logo-pivx.svg b/src/qt/res/images/img-logo-pivx.svg similarity index 100% rename from src/qt/pivx/res/img/img-logo-pivx.svg rename to src/qt/res/images/img-logo-pivx.svg diff --git a/src/qt/pivx/res/img/img-logo-pivx@2x.png b/src/qt/res/images/img-logo-pivx@2x.png similarity index 100% rename from src/qt/pivx/res/img/img-logo-pivx@2x.png rename to src/qt/res/images/img-logo-pivx@2x.png diff --git a/src/qt/pivx/res/img/img-logo-pivx@3x.png b/src/qt/res/images/img-logo-pivx@3x.png similarity index 100% rename from src/qt/pivx/res/img/img-logo-pivx@3x.png rename to src/qt/res/images/img-logo-pivx@3x.png diff --git a/src/qt/pivx/res/img/img-nav-logo-pivx.png b/src/qt/res/images/img-nav-logo-pivx.png similarity index 100% rename from src/qt/pivx/res/img/img-nav-logo-pivx.png rename to src/qt/res/images/img-nav-logo-pivx.png diff --git a/src/qt/pivx/res/img/img-nav-logo.png b/src/qt/res/images/img-nav-logo.png similarity index 100% rename from src/qt/pivx/res/img/img-nav-logo.png rename to src/qt/res/images/img-nav-logo.png diff --git a/src/qt/pivx/res/img/img-nav-logo.svg b/src/qt/res/images/img-nav-logo.svg similarity index 100% rename from src/qt/pivx/res/img/img-nav-logo.svg rename to src/qt/res/images/img-nav-logo.svg diff --git a/src/qt/pivx/res/img/img-qr-test-big.png b/src/qt/res/images/img-qr-test-big.png similarity index 100% rename from src/qt/pivx/res/img/img-qr-test-big.png rename to src/qt/res/images/img-qr-test-big.png diff --git a/src/qt/pivx/res/img/img-qr-test.png b/src/qt/res/images/img-qr-test.png similarity index 100% rename from src/qt/pivx/res/img/img-qr-test.png rename to src/qt/res/images/img-qr-test.png diff --git a/src/qt/pivx/res/img/img-qr.svg b/src/qt/res/images/img-qr.svg similarity index 100% rename from src/qt/pivx/res/img/img-qr.svg rename to src/qt/res/images/img-qr.svg diff --git a/src/qt/pivx/res/img/img-welcome-step1.png b/src/qt/res/images/img-welcome-step1.png similarity index 100% rename from src/qt/pivx/res/img/img-welcome-step1.png rename to src/qt/res/images/img-welcome-step1.png diff --git a/src/qt/pivx/res/img/img-welcome-step2.png b/src/qt/res/images/img-welcome-step2.png similarity index 100% rename from src/qt/pivx/res/img/img-welcome-step2.png rename to src/qt/res/images/img-welcome-step2.png diff --git a/src/qt/pivx/res/img/img-welcome-step3.png b/src/qt/res/images/img-welcome-step3.png similarity index 100% rename from src/qt/pivx/res/img/img-welcome-step3.png rename to src/qt/res/images/img-welcome-step3.png diff --git a/src/qt/pivx/res/img/img-welcome-step4.png b/src/qt/res/images/img-welcome-step4.png similarity index 100% rename from src/qt/pivx/res/img/img-welcome-step4.png rename to src/qt/res/images/img-welcome-step4.png diff --git a/src/qt/pivx/send.cpp b/src/qt/send.cpp similarity index 99% rename from src/qt/pivx/send.cpp rename to src/qt/send.cpp index 17dff917e8a4a..542b718433600 100644 --- a/src/qt/pivx/send.cpp +++ b/src/qt/send.cpp @@ -2,27 +2,28 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/send.h" +#include "send.h" +#include "ui_send.h" + +#include "addnewcontactdialog.h" #include "addresstablemodel.h" #include "clientmodel.h" #include "coincontrol.h" #include "destination_io.h" +#include "guitransactionsutils.h" #include "key_io.h" +#include "loadingdialog.h" #include "openuridialog.h" #include "operationresult.h" +#include "optionbutton.h" #include "optionsmodel.h" -#include "qt/pivx/addnewcontactdialog.h" -#include "qt/pivx/forms/ui_send.h" -#include "qt/pivx/guitransactionsutils.h" -#include "qt/pivx/loadingdialog.h" -#include "qt/pivx/optionbutton.h" -#include "qt/pivx/qtutils.h" -#include "qt/pivx/sendchangeaddressdialog.h" -#include "qt/pivx/sendconfirmdialog.h" #include "qt/walletmodel.h" +#include "qtutils.h" #include "sapling/address.h" #include "sapling/key_io_sapling.h" #include "script/standard.h" +#include "sendchangeaddressdialog.h" +#include "sendconfirmdialog.h" #define REQUEST_PREPARE_TX 1 #define REQUEST_REFRESH_BALANCE 2 diff --git a/src/qt/pivx/send.h b/src/qt/send.h similarity index 93% rename from src/qt/pivx/send.h rename to src/qt/send.h index b123966faa520..c665f50de392e 100644 --- a/src/qt/pivx/send.h +++ b/src/qt/send.h @@ -2,19 +2,19 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_SEND_H -#define PIVX_QT_PIVX_SEND_H +#ifndef PIVX_QT_SEND_H +#define PIVX_QT_SEND_H #include #include -#include "qt/pivx/pwidget.h" -#include "qt/pivx/contactsdropdown.h" -#include "qt/pivx/sendmultirow.h" -#include "qt/pivx/sendcustomfeedialog.h" -#include "walletmodel.h" #include "coincontroldialog.h" -#include "qt/pivx/tooltipmenu.h" +#include "contactsdropdown.h" +#include "pwidget.h" +#include "sendcustomfeedialog.h" +#include "sendmultirow.h" +#include "tooltipmenu.h" +#include "walletmodel.h" #include @@ -130,4 +130,4 @@ private Q_SLOTS: void tryRefreshAmounts(); }; -#endif // PIVX_QT_PIVX_SEND_H +#endif // PIVX_QT_SEND_H diff --git a/src/qt/pivx/sendchangeaddressdialog.cpp b/src/qt/sendchangeaddressdialog.cpp similarity index 96% rename from src/qt/pivx/sendchangeaddressdialog.cpp rename to src/qt/sendchangeaddressdialog.cpp index 63ecb7cec317f..e420cd6d96f1b 100644 --- a/src/qt/pivx/sendchangeaddressdialog.cpp +++ b/src/qt/sendchangeaddressdialog.cpp @@ -2,9 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/sendchangeaddressdialog.h" -#include "qt/pivx/forms/ui_sendchangeaddressdialog.h" -#include "qt/pivx/qtutils.h" +#include "sendchangeaddressdialog.h" +#include "ui_sendchangeaddressdialog.h" + +#include "qtutils.h" SendChangeAddressDialog::SendChangeAddressDialog(QWidget* parent, WalletModel* model, bool isTransparent) : FocusedDialog(parent), walletModel(model), diff --git a/src/qt/pivx/sendchangeaddressdialog.h b/src/qt/sendchangeaddressdialog.h similarity index 81% rename from src/qt/pivx/sendchangeaddressdialog.h rename to src/qt/sendchangeaddressdialog.h index 0875c71669183..2e64ea12a4a0e 100644 --- a/src/qt/pivx/sendchangeaddressdialog.h +++ b/src/qt/sendchangeaddressdialog.h @@ -2,13 +2,13 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_SENDCHANGEADDRESSDIALOG_H -#define PIVX_QT_PIVX_SENDCHANGEADDRESSDIALOG_H +#ifndef PIVX_QT_SENDCHANGEADDRESSDIALOG_H +#define PIVX_QT_SENDCHANGEADDRESSDIALOG_H #include "destination_io.h" -#include "qt/pivx/focuseddialog.h" -#include "qt/pivx/snackbar.h" +#include "focuseddialog.h" #include "script/standard.h" +#include "snackbar.h" class WalletModel; @@ -43,4 +43,4 @@ private Q_SLOTS: void accept() override; }; -#endif // PIVX_QT_PIVX_SENDCHANGEADDRESSDIALOG_H +#endif // PIVX_QT_SENDCHANGEADDRESSDIALOG_H diff --git a/src/qt/pivx/sendconfirmdialog.cpp b/src/qt/sendconfirmdialog.cpp similarity index 99% rename from src/qt/pivx/sendconfirmdialog.cpp rename to src/qt/sendconfirmdialog.cpp index 87ef97e87ab63..a93c249b4d1d3 100644 --- a/src/qt/pivx/sendconfirmdialog.cpp +++ b/src/qt/sendconfirmdialog.cpp @@ -2,17 +2,19 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/sendconfirmdialog.h" -#include "qt/pivx/forms/ui_sendconfirmdialog.h" +#include "sendconfirmdialog.h" +#include "ui_sendconfirmdialog.h" + #include "bitcoinunits.h" -#include "walletmodel.h" -#include "transactiontablemodel.h" +#include "guiutil.h" +#include "qtutils.h" #include "transactionrecord.h" +#include "transactiontablemodel.h" #include "wallet/wallet.h" -#include "guiutil.h" -#include "qt/pivx/qtutils.h" -#include +#include "walletmodel.h" + #include +#include TxDetailDialog::TxDetailDialog(QWidget *parent, bool _isConfirmDialog, const QString& warningStr) : FocusedDialog(parent), diff --git a/src/qt/pivx/sendconfirmdialog.h b/src/qt/sendconfirmdialog.h similarity index 88% rename from src/qt/pivx/sendconfirmdialog.h rename to src/qt/sendconfirmdialog.h index 1286d8e707cb3..0d0558e4b8ee1 100644 --- a/src/qt/pivx/sendconfirmdialog.h +++ b/src/qt/sendconfirmdialog.h @@ -2,12 +2,12 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_SENDCONFIRMDIALOG_H -#define PIVX_QT_PIVX_SENDCONFIRMDIALOG_H +#ifndef PIVX_QT_SENDCONFIRMDIALOG_H +#define PIVX_QT_SENDCONFIRMDIALOG_H +#include "focuseddialog.h" +#include "snackbar.h" #include "walletmodeltransaction.h" -#include "qt/pivx/focuseddialog.h" -#include "qt/pivx/snackbar.h" class WalletModelTransaction; class WalletModel; @@ -60,4 +60,4 @@ public Q_SLOTS: void setInputsType(CTransactionRef _tx); }; -#endif // PIVX_QT_PIVX_SENDCONFIRMDIALOG_H +#endif // PIVX_QT_SENDCONFIRMDIALOG_H diff --git a/src/qt/pivx/sendcustomfeedialog.cpp b/src/qt/sendcustomfeedialog.cpp similarity index 98% rename from src/qt/pivx/sendcustomfeedialog.cpp rename to src/qt/sendcustomfeedialog.cpp index 1432429416766..0daf4f55bc21f 100644 --- a/src/qt/pivx/sendcustomfeedialog.cpp +++ b/src/qt/sendcustomfeedialog.cpp @@ -2,15 +2,17 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/sendcustomfeedialog.h" -#include "qt/pivx/forms/ui_sendcustomfeedialog.h" -#include "qt/pivx/qtutils.h" -#include "qt/walletmodel.h" -#include "optionsmodel.h" +#include "sendcustomfeedialog.h" +#include "ui_sendcustomfeedialog.h" + #include "guiutil.h" +#include "optionsmodel.h" +#include "qt/walletmodel.h" +#include "qtutils.h" #include "wallet/fees.h" -#include + #include +#include SendCustomFeeDialog::SendCustomFeeDialog(PIVXGUI* parent, WalletModel* model) : FocusedDialog(parent), diff --git a/src/qt/pivx/sendcustomfeedialog.h b/src/qt/sendcustomfeedialog.h similarity index 83% rename from src/qt/pivx/sendcustomfeedialog.h rename to src/qt/sendcustomfeedialog.h index 77e196d20cc9c..029b929852845 100644 --- a/src/qt/pivx/sendcustomfeedialog.h +++ b/src/qt/sendcustomfeedialog.h @@ -2,12 +2,12 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_SENDCUSTOMFEEDIALOG_H -#define PIVX_QT_PIVX_SENDCUSTOMFEEDIALOG_H +#ifndef PIVX_QT_SENDCUSTOMFEEDIALOG_H +#define PIVX_QT_SENDCUSTOMFEEDIALOG_H +#include "focuseddialog.h" #include "policy/feerate.h" -#include "qt/pivx/focuseddialog.h" -#include "qt/pivx/snackbar.h" +#include "snackbar.h" class PIVXGUI; class WalletModel; @@ -46,4 +46,4 @@ protected Q_SLOTS: void inform(const QString& text); }; -#endif // PIVX_QT_PIVX_SENDCUSTOMFEEDIALOG_H +#endif // PIVX_QT_SENDCUSTOMFEEDIALOG_H diff --git a/src/qt/pivx/sendmemodialog.cpp b/src/qt/sendmemodialog.cpp similarity index 94% rename from src/qt/pivx/sendmemodialog.cpp rename to src/qt/sendmemodialog.cpp index bef09f7cb525a..ef79580eec55c 100644 --- a/src/qt/pivx/sendmemodialog.cpp +++ b/src/qt/sendmemodialog.cpp @@ -2,10 +2,11 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/sendmemodialog.h" -#include "qt/pivx/forms/ui_sendmemodialog.h" -#include "qt/pivx/snackbar.h" -#include "qt/pivx/qtutils.h" +#include "sendmemodialog.h" +#include "ui_sendmemodialog.h" + +#include "qtutils.h" +#include "snackbar.h" SendMemoDialog::SendMemoDialog(QWidget* parent, WalletModel* model) : FocusedDialog(parent), diff --git a/src/qt/pivx/sendmemodialog.h b/src/qt/sendmemodialog.h similarity index 86% rename from src/qt/pivx/sendmemodialog.h rename to src/qt/sendmemodialog.h index 3263dd6671814..f6613cc59bc2f 100644 --- a/src/qt/pivx/sendmemodialog.h +++ b/src/qt/sendmemodialog.h @@ -2,10 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or https://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_SENDMEMODIALOG_H -#define PIVX_QT_PIVX_SENDMEMODIALOG_H +#ifndef PIVX_QT_SENDMEMODIALOG_H +#define PIVX_QT_SENDMEMODIALOG_H -#include "qt/pivx/focuseddialog.h" +#include "focuseddialog.h" class WalletModel; class SnackBar; @@ -44,4 +44,4 @@ private Q_SLOTS: void accept() override; }; -#endif // PIVX_QT_PIVX_SENDMEMODIALOG_H +#endif // PIVX_QT_SENDMEMODIALOG_H diff --git a/src/qt/pivx/sendmultirow.cpp b/src/qt/sendmultirow.cpp similarity index 98% rename from src/qt/pivx/sendmultirow.cpp rename to src/qt/sendmultirow.cpp index dccb7ff89644c..0461740817325 100644 --- a/src/qt/pivx/sendmultirow.cpp +++ b/src/qt/sendmultirow.cpp @@ -2,15 +2,15 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/sendmultirow.h" -#include "qt/pivx/forms/ui_sendmultirow.h" +#include "sendmultirow.h" +#include "ui_sendmultirow.h" -#include "optionsmodel.h" #include "addresstablemodel.h" -#include "guiutil.h" #include "bitcoinunits.h" -#include "qt/pivx/sendmemodialog.h" -#include "qt/pivx/qtutils.h" +#include "guiutil.h" +#include "optionsmodel.h" +#include "qtutils.h" +#include "sendmemodialog.h" SendMultiRow::SendMultiRow(PIVXGUI* _window, PWidget *parent) : PWidget(_window, parent), diff --git a/src/qt/pivx/sendmultirow.h b/src/qt/sendmultirow.h similarity index 94% rename from src/qt/pivx/sendmultirow.h rename to src/qt/sendmultirow.h index b7a27c1e4b610..aeb0c63491e7d 100644 --- a/src/qt/pivx/sendmultirow.h +++ b/src/qt/sendmultirow.h @@ -2,15 +2,15 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_SENDMULTIROW_H -#define PIVX_QT_PIVX_SENDMULTIROW_H +#ifndef PIVX_QT_SENDMULTIROW_H +#define PIVX_QT_SENDMULTIROW_H -#include -#include -#include -#include "walletmodel.h" #include "amount.h" -#include "qt/pivx/pwidget.h" +#include "pwidget.h" +#include "walletmodel.h" +#include +#include +#include class WalletModel; class SendCoinsRecipient; @@ -98,4 +98,4 @@ private Q_SLOTS: }; -#endif // PIVX_QT_PIVX_SENDMULTIROW_H +#endif // PIVX_QT_SENDMULTIROW_H diff --git a/src/qt/pivx/settings/backupwallet.cpp b/src/qt/settings/backupwallet.cpp similarity index 95% rename from src/qt/pivx/settings/backupwallet.cpp rename to src/qt/settings/backupwallet.cpp index b160f055b9015..b9c35d2049367 100644 --- a/src/qt/pivx/settings/backupwallet.cpp +++ b/src/qt/settings/backupwallet.cpp @@ -2,13 +2,12 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/settings/backupwallet.h" - -#include "qt/pivx/settings/forms/ui_backupwallet.h" +#include "qt/settings/backupwallet.h" +#include "qt/settings/forms/ui_backupwallet.h" #include "guiinterface.h" #include "guiutil.h" -#include "qt/pivx/qtutils.h" +#include "qtutils.h" #include diff --git a/src/qt/pivx/settings/backupwallet.h b/src/qt/settings/backupwallet.h similarity index 77% rename from src/qt/pivx/settings/backupwallet.h rename to src/qt/settings/backupwallet.h index 4225e43eedfec..8e9a806188490 100644 --- a/src/qt/pivx/settings/backupwallet.h +++ b/src/qt/settings/backupwallet.h @@ -2,11 +2,11 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_SETTINGS_BACKUPWALLET_H -#define PIVX_QT_PIVX_SETTINGS_BACKUPWALLET_H +#ifndef PIVX_QT_SETTINGS_BACKUPWALLET_H +#define PIVX_QT_SETTINGS_BACKUPWALLET_H +#include "pwidget.h" #include -#include "qt/pivx/pwidget.h" namespace Ui { class SettingsBackupWallet; @@ -28,4 +28,4 @@ private Q_SLOTS: Ui::SettingsBackupWallet *ui; }; -#endif // PIVX_QT_PIVX_SETTINGS_BACKUPWALLET_H +#endif // PIVX_QT_SETTINGS_BACKUPWALLET_H diff --git a/src/qt/pivx/settings/bittoolwidget.cpp b/src/qt/settings/bittoolwidget.cpp similarity index 98% rename from src/qt/pivx/settings/bittoolwidget.cpp rename to src/qt/settings/bittoolwidget.cpp index f90fc030fbe5e..247e2ff3dc63a 100644 --- a/src/qt/pivx/settings/bittoolwidget.cpp +++ b/src/qt/settings/bittoolwidget.cpp @@ -2,10 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/settings/bittoolwidget.h" -#include "qt/pivx/settings/forms/ui_bittoolwidget.h" +#include "qt/settings/bittoolwidget.h" +#include "qt/settings/forms/ui_bittoolwidget.h" -#include "qt/pivx/qtutils.h" +#include "qtutils.h" #include "guiutil.h" #include "walletmodel.h" diff --git a/src/qt/pivx/settings/bittoolwidget.h b/src/qt/settings/bittoolwidget.h similarity index 82% rename from src/qt/pivx/settings/bittoolwidget.h rename to src/qt/settings/bittoolwidget.h index e7f9e09e6fc10..4ff7658d4dad4 100644 --- a/src/qt/pivx/settings/bittoolwidget.h +++ b/src/qt/settings/bittoolwidget.h @@ -2,13 +2,13 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_SETTINGS_BITTOOLWIDGET_H -#define PIVX_QT_PIVX_SETTINGS_BITTOOLWIDGET_H +#ifndef PIVX_QT_SETTINGS_BITTOOLWIDGET_H +#define PIVX_QT_SETTINGS_BITTOOLWIDGET_H -#include -#include "qt/pivx/pwidget.h" -#include "qt/pivx/contactsdropdown.h" +#include "contactsdropdown.h" #include "key.h" +#include "pwidget.h" +#include namespace Ui { class SettingsBitToolWidget; @@ -44,4 +44,4 @@ public Q_SLOTS: void resizeMenu(); }; -#endif // PIVX_QT_PIVX_SETTINGS_BITTOOLWIDGET_H +#endif // PIVX_QT_SETTINGS_BITTOOLWIDGET_H diff --git a/src/qt/pivx/settings/consolewidget.cpp b/src/qt/settings/consolewidget.cpp similarity index 99% rename from src/qt/pivx/settings/consolewidget.cpp rename to src/qt/settings/consolewidget.cpp index fdabe2fe58c5b..cda838e13b475 100644 --- a/src/qt/pivx/settings/consolewidget.cpp +++ b/src/qt/settings/consolewidget.cpp @@ -2,11 +2,11 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/settings/consolewidget.h" -#include "qt/pivx/settings/forms/ui_consolewidget.h" +#include "qt/settings/consolewidget.h" +#include "qt/settings/forms/ui_consolewidget.h" -#include "qt/pivx/qtutils.h" #include "qt/rpcexecutor.h" +#include "qtutils.h" #include "clientmodel.h" diff --git a/src/qt/pivx/settings/consolewidget.h b/src/qt/settings/consolewidget.h similarity index 90% rename from src/qt/pivx/settings/consolewidget.h rename to src/qt/settings/consolewidget.h index 26137bd80cfaf..e732eb1549828 100644 --- a/src/qt/pivx/settings/consolewidget.h +++ b/src/qt/settings/consolewidget.h @@ -2,14 +2,14 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_SETTINGS_CONSOLEWIDGET_H -#define PIVX_QT_PIVX_SETTINGS_CONSOLEWIDGET_H +#ifndef PIVX_QT_SETTINGS_CONSOLEWIDGET_H +#define PIVX_QT_SETTINGS_CONSOLEWIDGET_H -#include -#include "qt/pivx/pwidget.h" #include "guiutil.h" #include "net.h" +#include "pwidget.h" #include +#include class ClientModel; class RPCTimerInterface; @@ -71,4 +71,4 @@ private Q_SLOTS: }; -#endif // PIVX_QT_PIVX_SETTINGS_CONSOLEWIDGET_H +#endif // PIVX_QT_SETTINGS_CONSOLEWIDGET_H diff --git a/src/qt/pivx/settings/displayoptionswidget.cpp b/src/qt/settings/displayoptionswidget.cpp similarity index 97% rename from src/qt/pivx/settings/displayoptionswidget.cpp rename to src/qt/settings/displayoptionswidget.cpp index c9c36cf6ec5cb..104e420a446be 100644 --- a/src/qt/pivx/settings/displayoptionswidget.cpp +++ b/src/qt/settings/displayoptionswidget.cpp @@ -2,14 +2,14 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/settings/displayoptionswidget.h" -#include "qt/pivx/settings/forms/ui_displayoptionswidget.h" +#include "qt/settings/displayoptionswidget.h" +#include "qt/settings/forms/ui_displayoptionswidget.h" #include "bitcoinunits.h" #include "clientmodel.h" #include "guiutil.h" #include "optionsmodel.h" -#include "qt/pivx/qtutils.h" +#include "qtutils.h" #include #include diff --git a/src/qt/pivx/settings/displayoptionswidget.h b/src/qt/settings/displayoptionswidget.h similarity index 80% rename from src/qt/pivx/settings/displayoptionswidget.h rename to src/qt/settings/displayoptionswidget.h index 67d9cb9ead16c..ceeeaf2a05fe0 100644 --- a/src/qt/pivx/settings/displayoptionswidget.h +++ b/src/qt/settings/displayoptionswidget.h @@ -2,12 +2,12 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_SETTINGS_DISPLAYOPTIONSWIDGET_H -#define PIVX_QT_PIVX_SETTINGS_DISPLAYOPTIONSWIDGET_H +#ifndef PIVX_QT_SETTINGS_DISPLAYOPTIONSWIDGET_H +#define PIVX_QT_SETTINGS_DISPLAYOPTIONSWIDGET_H -#include +#include "pwidget.h" #include -#include "qt/pivx/pwidget.h" +#include namespace Ui { class SettingsDisplayOptionsWidget; @@ -36,4 +36,4 @@ public Q_SLOTS: Ui::SettingsDisplayOptionsWidget *ui; }; -#endif // PIVX_QT_PIVX_SETTINGS_DISPLAYOPTIONSWIDGET_H +#endif // PIVX_QT_SETTINGS_DISPLAYOPTIONSWIDGET_H diff --git a/src/qt/pivx/settings/exportcsv.cpp b/src/qt/settings/exportcsv.cpp similarity index 98% rename from src/qt/pivx/settings/exportcsv.cpp rename to src/qt/settings/exportcsv.cpp index 3b5098222022f..060ba72b72826 100644 --- a/src/qt/pivx/settings/exportcsv.cpp +++ b/src/qt/settings/exportcsv.cpp @@ -2,14 +2,14 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/settings/exportcsv.h" -#include "qt/pivx/settings/forms/ui_exportcsv.h" +#include "qt/settings/exportcsv.h" +#include "qt/settings/forms/ui_exportcsv.h" #include "csvmodelwriter.h" #include "guiinterface.h" #include "guiutil.h" #include "optionsmodel.h" -#include "qt/pivx/qtutils.h" +#include "qtutils.h" #include diff --git a/src/qt/pivx/settings/exportcsv.h b/src/qt/settings/exportcsv.h similarity index 83% rename from src/qt/pivx/settings/exportcsv.h rename to src/qt/settings/exportcsv.h index ede07c900102b..d0eefda617e05 100644 --- a/src/qt/pivx/settings/exportcsv.h +++ b/src/qt/settings/exportcsv.h @@ -2,13 +2,13 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_SETTINGS_EXPORTCSV_H -#define PIVX_QT_PIVX_SETTINGS_EXPORTCSV_H +#ifndef PIVX_QT_SETTINGS_EXPORTCSV_H +#define PIVX_QT_SETTINGS_EXPORTCSV_H -#include -#include "qt/pivx/pwidget.h" +#include "pwidget.h" #include "transactionfilterproxy.h" #include +#include namespace Ui { class SettingsExportCSV; @@ -33,4 +33,4 @@ private Q_SLOTS: QSortFilterProxyModel* addressFilter{nullptr}; }; -#endif // PIVX_QT_PIVX_SETTINGS_EXPORTCSV_H +#endif // PIVX_QT_SETTINGS_EXPORTCSV_H diff --git a/src/qt/pivx/settings/faqwidget.cpp b/src/qt/settings/faqwidget.cpp similarity index 98% rename from src/qt/pivx/settings/faqwidget.cpp rename to src/qt/settings/faqwidget.cpp index 48989ea7d9cbf..f36d998187302 100644 --- a/src/qt/pivx/settings/faqwidget.cpp +++ b/src/qt/settings/faqwidget.cpp @@ -6,11 +6,11 @@ #include "config/pivx-config.h" #endif -#include "qt/pivx/settings/faqwidget.h" -#include "qt/pivx/settings/forms/ui_faqwidget.h" +#include "qt/settings/faqwidget.h" +#include "qt/settings/forms/ui_faqwidget.h" -#include "qt/pivx/mnmodel.h" -#include "qt/pivx/qtutils.h" +#include "mnmodel.h" +#include "qtutils.h" #include #include diff --git a/src/qt/pivx/settings/faqwidget.h b/src/qt/settings/faqwidget.h similarity index 93% rename from src/qt/pivx/settings/faqwidget.h rename to src/qt/settings/faqwidget.h index 6cb69eed438bc..21308af4c7bae 100644 --- a/src/qt/pivx/settings/faqwidget.h +++ b/src/qt/settings/faqwidget.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_SETTINGS_FAQWIDGET_H -#define PIVX_QT_PIVX_SETTINGS_FAQWIDGET_H +#ifndef PIVX_QT_SETTINGS_FAQWIDGET_H +#define PIVX_QT_SETTINGS_FAQWIDGET_H #include @@ -70,4 +70,4 @@ private Q_SLOTS: } }; -#endif // PIVX_QT_PIVX_SETTINGS_FAQWIDGET_H +#endif // PIVX_QT_SETTINGS_FAQWIDGET_H diff --git a/src/qt/pivx/settings/forms/backupwallet.ui b/src/qt/settings/forms/backupwallet.ui similarity index 100% rename from src/qt/pivx/settings/forms/backupwallet.ui rename to src/qt/settings/forms/backupwallet.ui diff --git a/src/qt/pivx/settings/forms/bittoolwidget.ui b/src/qt/settings/forms/bittoolwidget.ui similarity index 100% rename from src/qt/pivx/settings/forms/bittoolwidget.ui rename to src/qt/settings/forms/bittoolwidget.ui diff --git a/src/qt/pivx/settings/forms/consolewidget.ui b/src/qt/settings/forms/consolewidget.ui similarity index 100% rename from src/qt/pivx/settings/forms/consolewidget.ui rename to src/qt/settings/forms/consolewidget.ui diff --git a/src/qt/pivx/settings/forms/displayoptionswidget.ui b/src/qt/settings/forms/displayoptionswidget.ui similarity index 100% rename from src/qt/pivx/settings/forms/displayoptionswidget.ui rename to src/qt/settings/forms/displayoptionswidget.ui diff --git a/src/qt/pivx/settings/forms/exportcsv.ui b/src/qt/settings/forms/exportcsv.ui similarity index 100% rename from src/qt/pivx/settings/forms/exportcsv.ui rename to src/qt/settings/forms/exportcsv.ui diff --git a/src/qt/pivx/settings/forms/faqwidget.ui b/src/qt/settings/forms/faqwidget.ui similarity index 99% rename from src/qt/pivx/settings/forms/faqwidget.ui rename to src/qt/settings/forms/faqwidget.ui index 7d1a8274007e7..2ceab6e2de685 100644 --- a/src/qt/pivx/settings/forms/faqwidget.ui +++ b/src/qt/settings/forms/faqwidget.ui @@ -1022,7 +1022,7 @@ PFBorderImage QFrame -
qt/pivx/pfborderimage.h
+
qt/pfborderimage.h
1 diff --git a/src/qt/pivx/settings/forms/informationwidget.ui b/src/qt/settings/forms/informationwidget.ui similarity index 100% rename from src/qt/pivx/settings/forms/informationwidget.ui rename to src/qt/settings/forms/informationwidget.ui diff --git a/src/qt/pivx/settings/forms/mainoptionswidget.ui b/src/qt/settings/forms/mainoptionswidget.ui similarity index 100% rename from src/qt/pivx/settings/forms/mainoptionswidget.ui rename to src/qt/settings/forms/mainoptionswidget.ui diff --git a/src/qt/pivx/settings/forms/settingswidget.ui b/src/qt/settings/forms/settingswidget.ui similarity index 100% rename from src/qt/pivx/settings/forms/settingswidget.ui rename to src/qt/settings/forms/settingswidget.ui diff --git a/src/qt/pivx/settings/forms/signmessagewidgets.ui b/src/qt/settings/forms/signmessagewidgets.ui similarity index 100% rename from src/qt/pivx/settings/forms/signmessagewidgets.ui rename to src/qt/settings/forms/signmessagewidgets.ui diff --git a/src/qt/pivx/settings/forms/walletoptionswidget.ui b/src/qt/settings/forms/walletoptionswidget.ui similarity index 100% rename from src/qt/pivx/settings/forms/walletoptionswidget.ui rename to src/qt/settings/forms/walletoptionswidget.ui diff --git a/src/qt/pivx/settings/forms/walletrepairwidget.ui b/src/qt/settings/forms/walletrepairwidget.ui similarity index 100% rename from src/qt/pivx/settings/forms/walletrepairwidget.ui rename to src/qt/settings/forms/walletrepairwidget.ui diff --git a/src/qt/pivx/settings/informationwidget.cpp b/src/qt/settings/informationwidget.cpp similarity index 98% rename from src/qt/pivx/settings/informationwidget.cpp rename to src/qt/settings/informationwidget.cpp index 021b535bd3646..9f694baf4d956 100644 --- a/src/qt/pivx/settings/informationwidget.cpp +++ b/src/qt/settings/informationwidget.cpp @@ -2,15 +2,15 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or https://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/settings/informationwidget.h" -#include "qt/pivx/settings/forms/ui_informationwidget.h" +#include "qt/settings/informationwidget.h" +#include "qt/settings/forms/ui_informationwidget.h" -#include "clientmodel.h" #include "chainparams.h" +#include "clientmodel.h" #include "db.h" -#include "util/system.h" #include "guiutil.h" -#include "qt/pivx/qtutils.h" +#include "qtutils.h" +#include "util/system.h" #include diff --git a/src/qt/pivx/settings/informationwidget.h b/src/qt/settings/informationwidget.h similarity index 86% rename from src/qt/pivx/settings/informationwidget.h rename to src/qt/settings/informationwidget.h index e1fb76950d373..8001530f4d577 100644 --- a/src/qt/pivx/settings/informationwidget.h +++ b/src/qt/settings/informationwidget.h @@ -2,12 +2,12 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_SETTINGS_INFORMATIONWIDGET_H -#define PIVX_QT_PIVX_SETTINGS_INFORMATIONWIDGET_H +#ifndef PIVX_QT_SETTINGS_INFORMATIONWIDGET_H +#define PIVX_QT_SETTINGS_INFORMATIONWIDGET_H -#include -#include "qt/pivx/pwidget.h" +#include "pwidget.h" #include "rpcconsole.h" +#include namespace Ui { class SettingsInformationWidget; @@ -45,4 +45,4 @@ public Q_SLOTS: void updateNetworkState(int numConnections); }; -#endif // PIVX_QT_PIVX_SETTINGS_INFORMATIONWIDGET_H +#endif // PIVX_QT_SETTINGS_INFORMATIONWIDGET_H diff --git a/src/qt/pivx/settings/mainoptionswidget.cpp b/src/qt/settings/mainoptionswidget.cpp similarity index 96% rename from src/qt/pivx/settings/mainoptionswidget.cpp rename to src/qt/settings/mainoptionswidget.cpp index dd2e562bb93fe..33eccd26b6852 100644 --- a/src/qt/pivx/settings/mainoptionswidget.cpp +++ b/src/qt/settings/mainoptionswidget.cpp @@ -2,18 +2,18 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/settings/mainoptionswidget.h" -#include "qt/pivx/settings/forms/ui_mainoptionswidget.h" +#include "qt/settings/mainoptionswidget.h" +#include "qt/settings/forms/ui_mainoptionswidget.h" #if defined(HAVE_CONFIG_H) #include "config/pivx-config.h" #endif #include "bitcoinunits.h" +#include "clientmodel.h" #include "guiutil.h" #include "optionsmodel.h" -#include "clientmodel.h" -#include "qt/pivx/qtutils.h" +#include "qtutils.h" #include "netbase.h" #include "txdb.h" // for -dbcache defaults diff --git a/src/qt/pivx/settings/mainoptionswidget.h b/src/qt/settings/mainoptionswidget.h similarity index 80% rename from src/qt/pivx/settings/mainoptionswidget.h rename to src/qt/settings/mainoptionswidget.h index de3ee6bb05832..3d183d889b186 100644 --- a/src/qt/pivx/settings/mainoptionswidget.h +++ b/src/qt/settings/mainoptionswidget.h @@ -2,10 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_SETTINGS_MAINOPTIONSWIDGET_H -#define PIVX_QT_PIVX_SETTINGS_MAINOPTIONSWIDGET_H +#ifndef PIVX_QT_SETTINGS_MAINOPTIONSWIDGET_H +#define PIVX_QT_SETTINGS_MAINOPTIONSWIDGET_H -#include "qt/pivx/pwidget.h" +#include "pwidget.h" #include @@ -38,4 +38,4 @@ public Q_SLOTS: Ui::SettingsMainOptionsWidget *ui; }; -#endif // PIVX_QT_PIVX_SETTINGS_MAINOPTIONSWIDGET_H +#endif // PIVX_QT_SETTINGS_MAINOPTIONSWIDGET_H diff --git a/src/qt/pivx/settings/networkwidget.cpp b/src/qt/settings/networkwidget.cpp similarity index 88% rename from src/qt/pivx/settings/networkwidget.cpp rename to src/qt/settings/networkwidget.cpp index c724c3f6a34e3..8cba7be0c4cad 100644 --- a/src/qt/pivx/settings/networkwidget.cpp +++ b/src/qt/settings/networkwidget.cpp @@ -2,11 +2,11 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/settings/networkwidget.h" -#include "qt/pivx/settings/forms/ui_networkwidget.h" +#include "qt/settings/networkwidget.h" +#include "qt/settings/forms/ui_networkwidget.h" #include "optionsmodel.h" -#include "qt/pivx/qtutils.h" +#include "qtutils.h" SettingsNetworkWidget::SettingsNetworkWidget(PIVXGUI* _window, QWidget *parent) : PWidget(_window, parent), diff --git a/src/qt/pivx/settings/networkwidget.h b/src/qt/settings/networkwidget.h similarity index 78% rename from src/qt/pivx/settings/networkwidget.h rename to src/qt/settings/networkwidget.h index 167bb6e14cd65..b6dede7e0ffbe 100644 --- a/src/qt/pivx/settings/networkwidget.h +++ b/src/qt/settings/networkwidget.h @@ -2,12 +2,12 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_SETTINGS_NETWORKWIDGET_H -#define PIVX_QT_PIVX_SETTINGS_NETWORKWIDGET_H +#ifndef PIVX_QT_SETTINGS_NETWORKWIDGET_H +#define PIVX_QT_SETTINGS_NETWORKWIDGET_H -#include +#include "pwidget.h" #include -#include "qt/pivx/pwidget.h" +#include namespace Ui { class SettingsNetworkWidget; @@ -30,4 +30,4 @@ class SettingsNetworkWidget : public PWidget void saveSettings() {}; }; -#endif // PIVX_QT_PIVX_SETTINGS_NETWORKWIDGET_H +#endif // PIVX_QT_SETTINGS_NETWORKWIDGET_H diff --git a/src/qt/pivx/settings/settingswidget.cpp b/src/qt/settings/settingswidget.cpp similarity index 99% rename from src/qt/pivx/settings/settingswidget.cpp rename to src/qt/settings/settingswidget.cpp index d2a235bd5ec6f..2da93f77fd8b6 100644 --- a/src/qt/pivx/settings/settingswidget.cpp +++ b/src/qt/settings/settingswidget.cpp @@ -2,15 +2,16 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/settings/settingswidget.h" -#include "qt/pivx/settings/forms/ui_settingswidget.h" -#include "qt/pivx/qtutils.h" -#include "qt/pivx/defaultdialog.h" -#include "optionsmodel.h" +#include "qt/settings/settingswidget.h" +#include "qt/settings/forms/ui_settingswidget.h" + #include "clientmodel.h" +#include "defaultdialog.h" +#include "optionsmodel.h" +#include "qtutils.h" #include "utilitydialog.h" -#include #include +#include SettingsWidget::SettingsWidget(PIVXGUI* parent) : PWidget(parent), diff --git a/src/qt/pivx/settings/settingswidget.h b/src/qt/settings/settingswidget.h similarity index 80% rename from src/qt/pivx/settings/settingswidget.h rename to src/qt/settings/settingswidget.h index 912a64f24f659..4851f2a691602 100644 --- a/src/qt/pivx/settings/settingswidget.h +++ b/src/qt/settings/settingswidget.h @@ -2,22 +2,22 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_SETTINGS_SETTINGSWIDGET_H -#define PIVX_QT_PIVX_SETTINGS_SETTINGSWIDGET_H +#ifndef PIVX_QT_SETTINGS_SETTINGSWIDGET_H +#define PIVX_QT_SETTINGS_SETTINGSWIDGET_H #include -#include "qt/pivx/pwidget.h" -#include "qt/pivx/settings/backupwallet.h" -#include "qt/pivx/settings/bittoolwidget.h" -#include "qt/pivx/settings/consolewidget.h" -#include "qt/pivx/settings/displayoptionswidget.h" -#include "qt/pivx/settings/exportcsv.h" -#include "qt/pivx/settings/informationwidget.h" -#include "qt/pivx/settings/mainoptionswidget.h" -#include "qt/pivx/settings/signmessagewidgets.h" -#include "qt/pivx/settings/walletoptionswidget.h" -#include "qt/pivx/settings/walletrepairwidget.h" +#include "pwidget.h" +#include "settings/backupwallet.h" +#include "settings/bittoolwidget.h" +#include "settings/consolewidget.h" +#include "settings/displayoptionswidget.h" +#include "settings/exportcsv.h" +#include "settings/informationwidget.h" +#include "settings/mainoptionswidget.h" +#include "settings/signmessagewidgets.h" +#include "settings/walletoptionswidget.h" +#include "settings/walletrepairwidget.h" class PIVXGUI; @@ -105,4 +105,4 @@ private Q_SLOTS: void selectMenu(QPushButton* btn); }; -#endif // PIVX_QT_PIVX_SETTINGS_SETTINGSWIDGET_H +#endif // PIVX_QT_SETTINGS_SETTINGSWIDGET_H diff --git a/src/qt/pivx/settings/signmessagewidgets.cpp b/src/qt/settings/signmessagewidgets.cpp similarity index 98% rename from src/qt/pivx/settings/signmessagewidgets.cpp rename to src/qt/settings/signmessagewidgets.cpp index bf69fd9594e7e..f5c91182a0d02 100644 --- a/src/qt/pivx/settings/signmessagewidgets.cpp +++ b/src/qt/settings/signmessagewidgets.cpp @@ -2,14 +2,14 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/settings/signmessagewidgets.h" -#include "qt/pivx/settings/forms/ui_signmessagewidgets.h" +#include "qt/settings/signmessagewidgets.h" +#include "qt/settings/forms/ui_signmessagewidgets.h" #include "key_io.h" #include "messagesigner.h" #include "qt/askpassphrasedialog.h" -#include "qt/pivx/qtutils.h" #include "qt/walletmodel.h" +#include "qtutils.h" #include "util/validation.h" #include diff --git a/src/qt/pivx/settings/signmessagewidgets.h b/src/qt/settings/signmessagewidgets.h similarity index 81% rename from src/qt/pivx/settings/signmessagewidgets.h rename to src/qt/settings/signmessagewidgets.h index 4276e40c44c9b..8877130eb6886 100644 --- a/src/qt/pivx/settings/signmessagewidgets.h +++ b/src/qt/settings/signmessagewidgets.h @@ -2,12 +2,12 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_SETTINGS_SIGNMESSAGEWIDGETS_H -#define PIVX_QT_PIVX_SETTINGS_SIGNMESSAGEWIDGETS_H +#ifndef PIVX_QT_SETTINGS_SIGNMESSAGEWIDGETS_H +#define PIVX_QT_SETTINGS_SIGNMESSAGEWIDGETS_H +#include "contactsdropdown.h" +#include "pwidget.h" #include -#include "qt/pivx/pwidget.h" -#include "qt/pivx/contactsdropdown.h" namespace Ui { class SettingsSignMessageWidgets; @@ -41,4 +41,4 @@ public Q_SLOTS: void resizeMenu(); }; -#endif // PIVX_QT_PIVX_SETTINGS_SIGNMESSAGEWIDGETS_H +#endif // PIVX_QT_SETTINGS_SIGNMESSAGEWIDGETS_H diff --git a/src/qt/pivx/settings/walletoptionswidget.cpp b/src/qt/settings/walletoptionswidget.cpp similarity index 97% rename from src/qt/pivx/settings/walletoptionswidget.cpp rename to src/qt/settings/walletoptionswidget.cpp index 0d78fea2325f8..8010a24038341 100644 --- a/src/qt/pivx/settings/walletoptionswidget.cpp +++ b/src/qt/settings/walletoptionswidget.cpp @@ -2,12 +2,12 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/settings/walletoptionswidget.h" -#include "qt/pivx/settings/forms/ui_walletoptionswidget.h" +#include "qt/settings/walletoptionswidget.h" +#include "qt/settings/forms/ui_walletoptionswidget.h" #include "clientmodel.h" #include "optionsmodel.h" -#include "qt/pivx/qtutils.h" +#include "qtutils.h" #include diff --git a/src/qt/pivx/settings/walletoptionswidget.h b/src/qt/settings/walletoptionswidget.h similarity index 85% rename from src/qt/pivx/settings/walletoptionswidget.h rename to src/qt/settings/walletoptionswidget.h index 2c225c1606eda..8b89c02577395 100644 --- a/src/qt/pivx/settings/walletoptionswidget.h +++ b/src/qt/settings/walletoptionswidget.h @@ -2,12 +2,12 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_SETTINGS_WALLETOPTIONSWIDGET_H -#define PIVX_QT_PIVX_SETTINGS_WALLETOPTIONSWIDGET_H +#ifndef PIVX_QT_SETTINGS_WALLETOPTIONSWIDGET_H +#define PIVX_QT_SETTINGS_WALLETOPTIONSWIDGET_H -#include +#include "pwidget.h" #include -#include "qt/pivx/pwidget.h" +#include namespace Ui { class SettingsWalletOptionsWidget; } @@ -48,4 +48,4 @@ public Q_SLOTS: void setNetworkActivity(bool active); }; -#endif // PIVX_QT_PIVX_SETTINGS_WALLETOPTIONSWIDGET_H +#endif // PIVX_QT_SETTINGS_WALLETOPTIONSWIDGET_H diff --git a/src/qt/pivx/settings/walletrepairwidget.cpp b/src/qt/settings/walletrepairwidget.cpp similarity index 97% rename from src/qt/pivx/settings/walletrepairwidget.cpp rename to src/qt/settings/walletrepairwidget.cpp index 1faccd5004bd9..4a113f703640f 100644 --- a/src/qt/pivx/settings/walletrepairwidget.cpp +++ b/src/qt/settings/walletrepairwidget.cpp @@ -2,10 +2,10 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/settings/walletrepairwidget.h" -#include "qt/pivx/settings/forms/ui_walletrepairwidget.h" +#include "qt/settings/walletrepairwidget.h" +#include "qt/settings/forms/ui_walletrepairwidget.h" -#include "qt/pivx/qtutils.h" +#include "qtutils.h" SettingsWalletRepairWidget::SettingsWalletRepairWidget(PIVXGUI* _window, QWidget *parent) : PWidget(_window, parent), diff --git a/src/qt/pivx/settings/walletrepairwidget.h b/src/qt/settings/walletrepairwidget.h similarity index 83% rename from src/qt/pivx/settings/walletrepairwidget.h rename to src/qt/settings/walletrepairwidget.h index 8da3ccda71a0d..7e296a53c7d77 100644 --- a/src/qt/pivx/settings/walletrepairwidget.h +++ b/src/qt/settings/walletrepairwidget.h @@ -2,11 +2,11 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_SETTINGS_WALLETREPAIRWIDGET_H -#define PIVX_QT_PIVX_SETTINGS_WALLETREPAIRWIDGET_H +#ifndef PIVX_QT_SETTINGS_WALLETREPAIRWIDGET_H +#define PIVX_QT_SETTINGS_WALLETREPAIRWIDGET_H +#include "pwidget.h" #include -#include "qt/pivx/pwidget.h" namespace Ui { class SettingsWalletRepairWidget; @@ -40,4 +40,4 @@ public Q_SLOTS: Ui::SettingsWalletRepairWidget *ui; }; -#endif // PIVX_QT_PIVX_SETTINGS_WALLETREPAIRWIDGET_H +#endif // PIVX_QT_SETTINGS_WALLETREPAIRWIDGET_H diff --git a/src/qt/pivx/snackbar.cpp b/src/qt/snackbar.cpp similarity index 94% rename from src/qt/pivx/snackbar.cpp rename to src/qt/snackbar.cpp index b7b4e012c32b7..743938241ed34 100644 --- a/src/qt/pivx/snackbar.cpp +++ b/src/qt/snackbar.cpp @@ -2,9 +2,11 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/snackbar.h" -#include "qt/pivx/forms/ui_snackbar.h" -#include "qt/pivx/qtutils.h" +#include "snackbar.h" +#include "ui_snackbar.h" + +#include "qtutils.h" + #include diff --git a/src/qt/pivx/snackbar.h b/src/qt/snackbar.h similarity index 91% rename from src/qt/pivx/snackbar.h rename to src/qt/snackbar.h index 10811e4ea888b..0c8762318a7a3 100644 --- a/src/qt/pivx/snackbar.h +++ b/src/qt/snackbar.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_SNACKBAR_H -#define PIVX_QT_PIVX_SNACKBAR_H +#ifndef PIVX_QT_SNACKBAR_H +#define PIVX_QT_SNACKBAR_H #include #include @@ -39,4 +39,4 @@ private Q_SLOTS: void setTimeoutForText(const QString& text); }; -#endif // PIVX_QT_PIVX_SNACKBAR_H +#endif // PIVX_QT_SNACKBAR_H diff --git a/src/qt/pivx/splash.cpp b/src/qt/splash.cpp similarity index 97% rename from src/qt/pivx/splash.cpp rename to src/qt/splash.cpp index c327528ac2869..198c5a1580c96 100644 --- a/src/qt/pivx/splash.cpp +++ b/src/qt/splash.cpp @@ -6,9 +6,8 @@ #include "config/pivx-config.h" #endif -#include "qt/pivx/splash.h" -#include "qt/pivx/forms/ui_splash.h" -#include "QFile" +#include "splash.h" +#include "ui_splash.h" #include "interfaces/handler.h" #include "guiinterface.h" @@ -24,6 +23,7 @@ #include #include +#include #include #include diff --git a/src/qt/pivx/splash.h b/src/qt/splash.h similarity index 92% rename from src/qt/pivx/splash.h rename to src/qt/splash.h index 3bfd3e9d9f62d..2204bdd9bbd2e 100644 --- a/src/qt/pivx/splash.h +++ b/src/qt/splash.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_SPLASH_H -#define PIVX_QT_PIVX_SPLASH_H +#ifndef PIVX_QT_SPLASH_H +#define PIVX_QT_SPLASH_H #include @@ -51,4 +51,4 @@ public Q_SLOTS: void unsubscribeFromCoreSignals(); }; -#endif // PIVX_QT_PIVX_SPLASH_H +#endif // PIVX_QT_SPLASH_H diff --git a/src/qt/pivx/tooltipmenu.cpp b/src/qt/tooltipmenu.cpp similarity index 95% rename from src/qt/pivx/tooltipmenu.cpp rename to src/qt/tooltipmenu.cpp index 9b36248c2a580..2159bef1e5298 100644 --- a/src/qt/pivx/tooltipmenu.cpp +++ b/src/qt/tooltipmenu.cpp @@ -2,10 +2,11 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/tooltipmenu.h" -#include "qt/pivx/forms/ui_tooltipmenu.h" +#include "tooltipmenu.h" +#include "ui_tooltipmenu.h" + +#include "qtutils.h" -#include "qt/pivx/qtutils.h" #include TooltipMenu::TooltipMenu(PIVXGUI *_window, QWidget *parent) : diff --git a/src/qt/pivx/tooltipmenu.h b/src/qt/tooltipmenu.h similarity index 90% rename from src/qt/pivx/tooltipmenu.h rename to src/qt/tooltipmenu.h index c95c7c8250431..71fb14b1a9d38 100644 --- a/src/qt/pivx/tooltipmenu.h +++ b/src/qt/tooltipmenu.h @@ -2,12 +2,12 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_TOOLTIPMENU_H -#define PIVX_QT_PIVX_TOOLTIPMENU_H +#ifndef PIVX_QT_TOOLTIPMENU_H +#define PIVX_QT_TOOLTIPMENU_H -#include "qt/pivx/pwidget.h" -#include +#include "pwidget.h" #include +#include class PIVXGUI; class WalletModel; @@ -57,4 +57,4 @@ private Q_SLOTS: QModelIndex index; }; -#endif // PIVX_QT_PIVX_TOOLTIPMENU_H +#endif // PIVX_QT_TOOLTIPMENU_H diff --git a/src/qt/pivx/topbar.cpp b/src/qt/topbar.cpp similarity index 99% rename from src/qt/pivx/topbar.cpp rename to src/qt/topbar.cpp index 27a6b84db3fc0..1baba42b9bc35 100644 --- a/src/qt/pivx/topbar.cpp +++ b/src/qt/topbar.cpp @@ -2,21 +2,23 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or https://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/topbar.h" -#include "qt/pivx/forms/ui_topbar.h" -#include "qt/pivx/lockunlock.h" -#include "qt/pivx/qtutils.h" -#include "qt/pivx/receivedialog.h" -#include "qt/pivx/loadingdialog.h" +#include "topbar.h" +#include "ui_topbar.h" + #include "askpassphrasedialog.h" +#include "loadingdialog.h" +#include "lockunlock.h" + +#include "qtutils.h" +#include "receivedialog.h" +#include "addresstablemodel.h" +#include "balancebubble.h" #include "bitcoinunits.h" -#include "qt/pivx/balancebubble.h" #include "clientmodel.h" -#include "qt/guiutil.h" #include "optionsmodel.h" +#include "qt/guiutil.h" #include "walletmodel.h" -#include "addresstablemodel.h" #include "masternode-sync.h" // for MASTERNODE_SYNC_THRESHOLD #include "tiertwo/tiertwo_sync_state.h" diff --git a/src/qt/pivx/topbar.h b/src/qt/topbar.h similarity index 93% rename from src/qt/pivx/topbar.h rename to src/qt/topbar.h index 7b8b5b8447497..c372bdace8445 100644 --- a/src/qt/pivx/topbar.h +++ b/src/qt/topbar.h @@ -2,16 +2,17 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_TOPBAR_H -#define PIVX_QT_PIVX_TOPBAR_H +#ifndef PIVX_QT_TOPBAR_H +#define PIVX_QT_TOPBAR_H -#include -#include "qt/askpassphrasedialog.h" -#include "qt/pivx/pwidget.h" -#include "qt/pivx/lockunlock.h" #include "amount.h" -#include +#include "lockunlock.h" +#include "pwidget.h" +#include "qt/askpassphrasedialog.h" + #include +#include +#include class BalanceBubble; class PIVXGUI; @@ -91,4 +92,4 @@ private Q_SLOTS: void connectUpgradeBtnAndDialogTimer(const QString& message); }; -#endif // PIVX_QT_PIVX_TOPBAR_H +#endif // PIVX_QT_TOPBAR_H diff --git a/src/qt/pivx/txrow.cpp b/src/qt/txrow.cpp similarity index 98% rename from src/qt/pivx/txrow.cpp rename to src/qt/txrow.cpp index de7ef2890f8aa..f474913ce8429 100644 --- a/src/qt/pivx/txrow.cpp +++ b/src/qt/txrow.cpp @@ -2,11 +2,11 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/txrow.h" -#include "qt/pivx/forms/ui_txrow.h" +#include "txrow.h" +#include "ui_txrow.h" #include "guiutil.h" -#include "qt/pivx/qtutils.h" +#include "qtutils.h" TxRow::TxRow(QWidget *parent) : QWidget(parent), diff --git a/src/qt/pivx/txrow.h b/src/qt/txrow.h similarity index 90% rename from src/qt/pivx/txrow.h rename to src/qt/txrow.h index e173c63dce1d6..1ac435e9d79e5 100644 --- a/src/qt/pivx/txrow.h +++ b/src/qt/txrow.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_TXROW_H -#define PIVX_QT_PIVX_TXROW_H +#ifndef PIVX_QT_TXROW_H +#define PIVX_QT_TXROW_H #include #include @@ -37,4 +37,4 @@ class TxRow : public QWidget bool isDoubleAmount = false; }; -#endif // PIVX_QT_PIVX_TXROW_H +#endif // PIVX_QT_TXROW_H diff --git a/src/qt/pivx/txviewholder.cpp b/src/qt/txviewholder.cpp similarity index 98% rename from src/qt/pivx/txviewholder.cpp rename to src/qt/txviewholder.cpp index 36cf9d7a3c0cd..589db9aaae52a 100644 --- a/src/qt/pivx/txviewholder.cpp +++ b/src/qt/txviewholder.cpp @@ -2,9 +2,11 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/txviewholder.h" -#include "qt/pivx/qtutils.h" +#include "txviewholder.h" + +#include "qtutils.h" #include "transactiontablemodel.h" + #include #define ADDRESS_SIZE 12 diff --git a/src/qt/pivx/txviewholder.h b/src/qt/txviewholder.h similarity index 86% rename from src/qt/pivx/txviewholder.h rename to src/qt/txviewholder.h index 408dabdf5dbb8..4d2b1ee5c4165 100644 --- a/src/qt/pivx/txviewholder.h +++ b/src/qt/txviewholder.h @@ -2,12 +2,12 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_TXVIEWHOLDER_H -#define PIVX_QT_PIVX_TXVIEWHOLDER_H +#ifndef PIVX_QT_TXVIEWHOLDER_H +#define PIVX_QT_TXVIEWHOLDER_H -#include "qt/pivx/furlistrow.h" -#include "qt/pivx/txrow.h" #include "bitcoinunits.h" +#include "furlistrow.h" +#include "txrow.h" #include QT_BEGIN_NAMESPACE @@ -45,4 +45,4 @@ class TxViewHolder : public FurListRow TxRow* txRow{nullptr}; }; -#endif // PIVX_QT_PIVX_TXVIEWHOLDER_H +#endif // PIVX_QT_TXVIEWHOLDER_H diff --git a/src/qt/utilitydialog.cpp b/src/qt/utilitydialog.cpp index d92acb620d60b..adb0fe2ed673c 100644 --- a/src/qt/utilitydialog.cpp +++ b/src/qt/utilitydialog.cpp @@ -15,10 +15,10 @@ #include "clientmodel.h" #include "clientversion.h" #include "guiconstants.h" +#include "guiutil.h" #include "init.h" #include "intro.h" -#include "guiutil.h" -#include "qt/pivx/qtutils.h" +#include "qtutils.h" #include "util/system.h" #include diff --git a/src/qt/pivx/votedialog.cpp b/src/qt/votedialog.cpp similarity index 97% rename from src/qt/pivx/votedialog.cpp rename to src/qt/votedialog.cpp index 72a61fbdf9cfe..bd91999f11082 100644 --- a/src/qt/pivx/votedialog.cpp +++ b/src/qt/votedialog.cpp @@ -2,12 +2,12 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or https://www.opensource.org/licenses/mit-license.php. -#include "qt/pivx/votedialog.h" -#include "qt/pivx/forms/ui_votedialog.h" +#include "votedialog.h" +#include "ui_votedialog.h" -#include "qt/pivx/mnmodel.h" -#include "qt/pivx/mnselectiondialog.h" -#include "qt/pivx/qtutils.h" +#include "mnmodel.h" +#include "mnselectiondialog.h" +#include "qtutils.h" VoteDialog::VoteDialog(QWidget *parent, GovernanceModel* _govModel, MNModel* _mnModel) : QDialog(parent), diff --git a/src/qt/pivx/votedialog.h b/src/qt/votedialog.h similarity index 91% rename from src/qt/pivx/votedialog.h rename to src/qt/votedialog.h index cd30b40ec0ec3..d0329600bdf14 100644 --- a/src/qt/pivx/votedialog.h +++ b/src/qt/votedialog.h @@ -2,14 +2,14 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or https://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_VOTEDIALOG_H -#define PIVX_QT_PIVX_VOTEDIALOG_H +#ifndef PIVX_QT_VOTEDIALOG_H +#define PIVX_QT_VOTEDIALOG_H #include #include #include -#include "qt/pivx/governancemodel.h" +#include "governancemodel.h" #include namespace Ui { @@ -62,4 +62,4 @@ public Q_SLOTS: void updateMnSelectionNum(); }; -#endif // PIVX_QT_PIVX_VOTEDIALOG_H +#endif // PIVX_QT_VOTEDIALOG_H diff --git a/src/qt/pivx/welcomecontentwidget.cpp b/src/qt/welcomecontentwidget.cpp similarity index 99% rename from src/qt/pivx/welcomecontentwidget.cpp rename to src/qt/welcomecontentwidget.cpp index 7b1a89bf3b529..4b7aaf9c0f5f4 100644 --- a/src/qt/pivx/welcomecontentwidget.cpp +++ b/src/qt/welcomecontentwidget.cpp @@ -6,8 +6,8 @@ #include "config/pivx-config.h" #endif -#include "qt/pivx/welcomecontentwidget.h" -#include "qt/pivx/forms/ui_welcomecontentwidget.h" +#include "welcomecontentwidget.h" +#include "ui_welcomecontentwidget.h" #include "guiutil.h" diff --git a/src/qt/pivx/welcomecontentwidget.h b/src/qt/welcomecontentwidget.h similarity index 88% rename from src/qt/pivx/welcomecontentwidget.h rename to src/qt/welcomecontentwidget.h index 941efc56af611..e9adc408e802d 100644 --- a/src/qt/pivx/welcomecontentwidget.h +++ b/src/qt/welcomecontentwidget.h @@ -2,8 +2,8 @@ // Distributed under the MIT software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef PIVX_QT_PIVX_WELCOMECONTENTWIDGET_H -#define PIVX_QT_PIVX_WELCOMECONTENTWIDGET_H +#ifndef PIVX_QT_WELCOMECONTENTWIDGET_H +#define PIVX_QT_WELCOMECONTENTWIDGET_H #include #include @@ -49,4 +49,4 @@ public Q_SLOTS: void initLanguages(); }; -#endif // PIVX_QT_PIVX_WELCOMECONTENTWIDGET_H +#endif // PIVX_QT_WELCOMECONTENTWIDGET_H diff --git a/test/lint/lint-circular-dependencies.sh b/test/lint/lint-circular-dependencies.sh index 609848a25f4e0..89368704e512a 100755 --- a/test/lint/lint-circular-dependencies.sh +++ b/test/lint/lint-circular-dependencies.sh @@ -26,8 +26,6 @@ EXPECTED_CIRCULAR_DEPENDENCIES=( "net -> tiertwo/net_masternodes -> net" "policy/fees -> txmempool -> policy/fees" "policy/policy -> validation -> policy/policy" - "qt/pivx/pivxgui -> qt/pivx/qtutils -> qt/pivx/pivxgui" - "qt/pivx/qtutils -> qt/pivx/snackbar -> qt/pivx/qtutils" "sapling/saplingscriptpubkeyman -> wallet/wallet -> sapling/saplingscriptpubkeyman" "spork -> sporkdb -> spork" "spork -> validation -> spork"