From 1afa06af9110dd9380e8dd68377d8c2c823dee11 Mon Sep 17 00:00:00 2001 From: tobtoht Date: Sun, 27 Jun 2021 13:46:32 +0200 Subject: [PATCH] Rename dialogs --- src/WindowManager.cpp | 4 +- src/WindowManager.h | 2 +- src/coinswidget.cpp | 4 +- src/contactswidget.cpp | 2 +- .../{aboutdialog.cpp => AboutDialog.cpp} | 4 +- src/dialog/{aboutdialog.h => AboutDialog.h} | 0 src/dialog/{aboutdialog.ui => AboutDialog.ui} | 0 src/dialog/AddressInfoDialog.ui | 139 ++++++++++++++++++ .../{balancedialog.cpp => BalanceDialog.cpp} | 4 +- .../{balancedialog.h => BalanceDialog.h} | 0 .../{balancedialog.ui => BalanceDialog.ui} | 0 ...casttxdialog.cpp => BroadcastTxDialog.cpp} | 4 +- ...roadcasttxdialog.h => BroadcastTxDialog.h} | 0 ...adcasttxdialog.ui => BroadcastTxDialog.ui} | 0 src/dialog/CMakeLists.txt | 0 ...{contactsdialog.cpp => ContactsDialog.cpp} | 4 +- .../{contactsdialog.h => ContactsDialog.h} | 0 .../{contactsdialog.ui => ContactsDialog.ui} | 0 ...ebuginfodialog.cpp => DebugInfoDialog.cpp} | 4 +- .../{debuginfodialog.h => DebugInfoDialog.h} | 0 ...{debuginfodialog.ui => DebugInfoDialog.ui} | 0 src/dialog/{keysdialog.cpp => KeysDialog.cpp} | 4 +- src/dialog/{keysdialog.h => KeysDialog.h} | 0 src/dialog/{keysdialog.ui => KeysDialog.ui} | 0 ...putinfodialog.cpp => OutputInfoDialog.cpp} | 4 +- ...{outputinfodialog.h => OutputInfoDialog.h} | 0 ...utputinfodialog.ui => OutputInfoDialog.ui} | 0 ...tsweepdialog.cpp => OutputSweepDialog.cpp} | 4 +- ...utputsweepdialog.h => OutputSweepDialog.h} | 0 ...putsweepdialog.ui => OutputSweepDialog.ui} | 0 ...ngedialog.cpp => PasswordChangeDialog.cpp} | 4 +- ...dchangedialog.h => PasswordChangeDialog.h} | 0 ...hangedialog.ui => PasswordChangeDialog.ui} | 0 ...{passworddialog.cpp => PasswordDialog.cpp} | 4 +- .../{passworddialog.h => PasswordDialog.h} | 0 .../{passworddialog.ui => PasswordDialog.ui} | 0 .../{qrcodedialog.cpp => QrCodeDialog.cpp} | 4 +- src/dialog/{qrcodedialog.h => QrCodeDialog.h} | 0 .../{qrcodedialog.ui => QrCodeDialog.ui} | 0 src/dialog/{seeddialog.cpp => SeedDialog.cpp} | 4 +- src/dialog/{seeddialog.h => SeedDialog.h} | 0 src/dialog/{seeddialog.ui => SeedDialog.ui} | 0 ...nverifydialog.cpp => SignVerifyDialog.cpp} | 4 +- ...{signverifydialog.h => SignVerifyDialog.h} | 0 ...ignverifydialog.ui => SignVerifyDialog.ui} | 0 .../{splashdialog.cpp => SplashDialog.cpp} | 4 +- src/dialog/{splashdialog.h => SplashDialog.h} | 0 .../{splashdialog.ui => SplashDialog.ui} | 0 .../{torinfodialog.cpp => TorInfoDialog.cpp} | 4 +- .../{torinfodialog.h => TorInfoDialog.h} | 0 .../{torinfodialog.ui => TorInfoDialog.ui} | 0 ...fodialog.cpp => TransactionInfoDialog.cpp} | 4 +- ...oninfodialog.h => TransactionInfoDialog.h} | 0 ...infodialog.ui => TransactionInfoDialog.ui} | 0 ...xconfadvdialog.cpp => TxConfAdvDialog.cpp} | 7 +- .../{txconfadvdialog.h => TxConfAdvDialog.h} | 0 ...{txconfadvdialog.ui => TxConfAdvDialog.ui} | 0 .../{txconfdialog.cpp => TxConfDialog.cpp} | 11 +- src/dialog/{txconfdialog.h => TxConfDialog.h} | 0 .../{txconfdialog.ui => TxConfDialog.ui} | 0 ...{tximportdialog.cpp => TxImportDialog.cpp} | 4 +- .../{tximportdialog.h => TxImportDialog.h} | 0 .../{tximportdialog.ui => TxImportDialog.ui} | 0 ...yproofdialog.cpp => VerifyProofDialog.cpp} | 4 +- ...erifyproofdialog.h => VerifyProofDialog.h} | 0 ...ifyproofdialog.ui => VerifyProofDialog.ui} | 0 ...{viewonlydialog.cpp => ViewOnlyDialog.cpp} | 4 +- .../{viewonlydialog.h => ViewOnlyDialog.h} | 0 .../{viewonlydialog.ui => ViewOnlyDialog.ui} | 0 ...letinfodialog.cpp => WalletInfoDialog.cpp} | 4 +- ...{walletinfodialog.h => WalletInfoDialog.h} | 0 ...alletinfodialog.ui => WalletInfoDialog.ui} | 0 src/historywidget.cpp | 2 +- src/mainwindow.cpp | 20 +-- src/mainwindow.h | 16 +- src/receivewidget.cpp | 2 +- 76 files changed, 215 insertions(+), 74 deletions(-) rename src/dialog/{aboutdialog.cpp => AboutDialog.cpp} (96%) rename src/dialog/{aboutdialog.h => AboutDialog.h} (100%) rename src/dialog/{aboutdialog.ui => AboutDialog.ui} (100%) create mode 100644 src/dialog/AddressInfoDialog.ui rename src/dialog/{balancedialog.cpp => BalanceDialog.cpp} (93%) rename src/dialog/{balancedialog.h => BalanceDialog.h} (100%) rename src/dialog/{balancedialog.ui => BalanceDialog.ui} (100%) rename src/dialog/{broadcasttxdialog.cpp => BroadcastTxDialog.cpp} (96%) rename src/dialog/{broadcasttxdialog.h => BroadcastTxDialog.h} (100%) rename src/dialog/{broadcasttxdialog.ui => BroadcastTxDialog.ui} (100%) create mode 100644 src/dialog/CMakeLists.txt rename src/dialog/{contactsdialog.cpp => ContactsDialog.cpp} (93%) rename src/dialog/{contactsdialog.h => ContactsDialog.h} (100%) rename src/dialog/{contactsdialog.ui => ContactsDialog.ui} (100%) rename src/dialog/{debuginfodialog.cpp => DebugInfoDialog.cpp} (99%) rename src/dialog/{debuginfodialog.h => DebugInfoDialog.h} (100%) rename src/dialog/{debuginfodialog.ui => DebugInfoDialog.ui} (100%) rename src/dialog/{keysdialog.cpp => KeysDialog.cpp} (94%) rename src/dialog/{keysdialog.h => KeysDialog.h} (100%) rename src/dialog/{keysdialog.ui => KeysDialog.ui} (100%) rename src/dialog/{outputinfodialog.cpp => OutputInfoDialog.cpp} (95%) rename src/dialog/{outputinfodialog.h => OutputInfoDialog.h} (100%) rename src/dialog/{outputinfodialog.ui => OutputInfoDialog.ui} (100%) rename src/dialog/{outputsweepdialog.cpp => OutputSweepDialog.cpp} (95%) rename src/dialog/{outputsweepdialog.h => OutputSweepDialog.h} (100%) rename src/dialog/{outputsweepdialog.ui => OutputSweepDialog.ui} (100%) rename src/dialog/{passwordchangedialog.cpp => PasswordChangeDialog.cpp} (97%) rename src/dialog/{passwordchangedialog.h => PasswordChangeDialog.h} (100%) rename src/dialog/{passwordchangedialog.ui => PasswordChangeDialog.ui} (100%) rename src/dialog/{passworddialog.cpp => PasswordDialog.cpp} (92%) rename src/dialog/{passworddialog.h => PasswordDialog.h} (100%) rename src/dialog/{passworddialog.ui => PasswordDialog.ui} (100%) rename src/dialog/{qrcodedialog.cpp => QrCodeDialog.cpp} (96%) rename src/dialog/{qrcodedialog.h => QrCodeDialog.h} (100%) rename src/dialog/{qrcodedialog.ui => QrCodeDialog.ui} (100%) rename src/dialog/{seeddialog.cpp => SeedDialog.cpp} (98%) rename src/dialog/{seeddialog.h => SeedDialog.h} (100%) rename src/dialog/{seeddialog.ui => SeedDialog.ui} (100%) rename src/dialog/{signverifydialog.cpp => SignVerifyDialog.cpp} (96%) rename src/dialog/{signverifydialog.h => SignVerifyDialog.h} (100%) rename src/dialog/{signverifydialog.ui => SignVerifyDialog.ui} (100%) rename src/dialog/{splashdialog.cpp => SplashDialog.cpp} (93%) rename src/dialog/{splashdialog.h => SplashDialog.h} (100%) rename src/dialog/{splashdialog.ui => SplashDialog.ui} (100%) rename src/dialog/{torinfodialog.cpp => TorInfoDialog.cpp} (99%) rename src/dialog/{torinfodialog.h => TorInfoDialog.h} (100%) rename src/dialog/{torinfodialog.ui => TorInfoDialog.ui} (100%) rename src/dialog/{transactioninfodialog.cpp => TransactionInfoDialog.cpp} (98%) rename src/dialog/{transactioninfodialog.h => TransactionInfoDialog.h} (100%) rename src/dialog/{transactioninfodialog.ui => TransactionInfoDialog.ui} (100%) rename src/dialog/{txconfadvdialog.cpp => TxConfAdvDialog.cpp} (98%) rename src/dialog/{txconfadvdialog.h => TxConfAdvDialog.h} (100%) rename src/dialog/{txconfadvdialog.ui => TxConfAdvDialog.ui} (100%) rename src/dialog/{txconfdialog.cpp => TxConfDialog.cpp} (97%) rename src/dialog/{txconfdialog.h => TxConfDialog.h} (100%) rename src/dialog/{txconfdialog.ui => TxConfDialog.ui} (100%) rename src/dialog/{tximportdialog.cpp => TxImportDialog.cpp} (98%) rename src/dialog/{tximportdialog.h => TxImportDialog.h} (100%) rename src/dialog/{tximportdialog.ui => TxImportDialog.ui} (100%) rename src/dialog/{verifyproofdialog.cpp => VerifyProofDialog.cpp} (98%) rename src/dialog/{verifyproofdialog.h => VerifyProofDialog.h} (100%) rename src/dialog/{verifyproofdialog.ui => VerifyProofDialog.ui} (100%) rename src/dialog/{viewonlydialog.cpp => ViewOnlyDialog.cpp} (97%) rename src/dialog/{viewonlydialog.h => ViewOnlyDialog.h} (100%) rename src/dialog/{viewonlydialog.ui => ViewOnlyDialog.ui} (100%) rename src/dialog/{walletinfodialog.cpp => WalletInfoDialog.cpp} (95%) rename src/dialog/{walletinfodialog.h => WalletInfoDialog.h} (100%) rename src/dialog/{walletinfodialog.ui => WalletInfoDialog.ui} (100%) diff --git a/src/WindowManager.cpp b/src/WindowManager.cpp index ad5326e..df0bf12 100644 --- a/src/WindowManager.cpp +++ b/src/WindowManager.cpp @@ -3,8 +3,8 @@ #include "WindowManager.h" #include "constants.h" -#include "dialog/passworddialog.h" -#include "dialog/splashdialog.h" +#include "dialog/PasswordDialog.h" +#include "dialog/SplashDialog.h" #include "utils/WebsocketNotifier.h" #include "utils/os/tails.h" #include "utils/Icons.h" diff --git a/src/WindowManager.h b/src/WindowManager.h index 7c9c3d9..ffcd636 100644 --- a/src/WindowManager.h +++ b/src/WindowManager.h @@ -8,7 +8,7 @@ #include "libwalletqt/WalletManager.h" #include "libwalletqt/Wallet.h" #include "wizard/WalletWizard.h" -#include "dialog/torinfodialog.h" +#include "dialog/TorInfoDialog.h" #include "mainwindow.h" class MainWindow; diff --git a/src/coinswidget.cpp b/src/coinswidget.cpp index 60228c1..8c83acf 100644 --- a/src/coinswidget.cpp +++ b/src/coinswidget.cpp @@ -3,8 +3,8 @@ #include "coinswidget.h" #include "ui_coinswidget.h" -#include "dialog/outputinfodialog.h" -#include "dialog/outputsweepdialog.h" +#include "dialog/OutputInfoDialog.h" +#include "dialog/OutputSweepDialog.h" #include "mainwindow.h" #include "utils/Icons.h" diff --git a/src/contactswidget.cpp b/src/contactswidget.cpp index 62b0908..679f8cc 100644 --- a/src/contactswidget.cpp +++ b/src/contactswidget.cpp @@ -3,7 +3,7 @@ #include "contactswidget.h" #include "ui_contactswidget.h" -#include "dialog/contactsdialog.h" +#include "dialog/ContactsDialog.h" #include "model/ModelUtils.h" #include "mainwindow.h" #include "libwalletqt/AddressBook.h" diff --git a/src/dialog/aboutdialog.cpp b/src/dialog/AboutDialog.cpp similarity index 96% rename from src/dialog/aboutdialog.cpp rename to src/dialog/AboutDialog.cpp index a076c0b..781bdb0 100644 --- a/src/dialog/aboutdialog.cpp +++ b/src/dialog/AboutDialog.cpp @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#include "aboutdialog.h" -#include "ui_aboutdialog.h" +#include "AboutDialog.h" +#include "ui_AboutDialog.h" #include "utils/utils.h" #include "config-feather.h" diff --git a/src/dialog/aboutdialog.h b/src/dialog/AboutDialog.h similarity index 100% rename from src/dialog/aboutdialog.h rename to src/dialog/AboutDialog.h diff --git a/src/dialog/aboutdialog.ui b/src/dialog/AboutDialog.ui similarity index 100% rename from src/dialog/aboutdialog.ui rename to src/dialog/AboutDialog.ui diff --git a/src/dialog/AddressInfoDialog.ui b/src/dialog/AddressInfoDialog.ui new file mode 100644 index 0000000..b5edc52 --- /dev/null +++ b/src/dialog/AddressInfoDialog.ui @@ -0,0 +1,139 @@ + + + AddressInfoDialog + + + + 0 + 0 + 520 + 310 + + + + Address + + + + + + Address: + + + + + + + true + + + + + + + Public view key: + + + + + + + true + + + + + + + Public spend key: + + + + + + + true + + + + + + + Subaddress index: + + + + + + + + 500 + 0 + + + + true + + + + + + + Qt::Vertical + + + + 20 + 0 + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Ok + + + + + + + + + buttonBox + accepted() + AddressInfoDialog + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + AddressInfoDialog + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/src/dialog/balancedialog.cpp b/src/dialog/BalanceDialog.cpp similarity index 93% rename from src/dialog/balancedialog.cpp rename to src/dialog/BalanceDialog.cpp index 0d13121..64af6d5 100644 --- a/src/dialog/balancedialog.cpp +++ b/src/dialog/BalanceDialog.cpp @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#include "balancedialog.h" -#include "ui_balancedialog.h" +#include "BalanceDialog.h" +#include "ui_BalanceDialog.h" #include "libwalletqt/WalletManager.h" diff --git a/src/dialog/balancedialog.h b/src/dialog/BalanceDialog.h similarity index 100% rename from src/dialog/balancedialog.h rename to src/dialog/BalanceDialog.h diff --git a/src/dialog/balancedialog.ui b/src/dialog/BalanceDialog.ui similarity index 100% rename from src/dialog/balancedialog.ui rename to src/dialog/BalanceDialog.ui diff --git a/src/dialog/broadcasttxdialog.cpp b/src/dialog/BroadcastTxDialog.cpp similarity index 96% rename from src/dialog/broadcasttxdialog.cpp rename to src/dialog/BroadcastTxDialog.cpp index 42b5d59..c18f0ab 100644 --- a/src/dialog/broadcasttxdialog.cpp +++ b/src/dialog/BroadcastTxDialog.cpp @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#include "broadcasttxdialog.h" -#include "ui_broadcasttxdialog.h" +#include "BroadcastTxDialog.h" +#include "ui_BroadcastTxDialog.h" #include "utils/NetworkManager.h" #include diff --git a/src/dialog/broadcasttxdialog.h b/src/dialog/BroadcastTxDialog.h similarity index 100% rename from src/dialog/broadcasttxdialog.h rename to src/dialog/BroadcastTxDialog.h diff --git a/src/dialog/broadcasttxdialog.ui b/src/dialog/BroadcastTxDialog.ui similarity index 100% rename from src/dialog/broadcasttxdialog.ui rename to src/dialog/BroadcastTxDialog.ui diff --git a/src/dialog/CMakeLists.txt b/src/dialog/CMakeLists.txt new file mode 100644 index 0000000..e69de29 diff --git a/src/dialog/contactsdialog.cpp b/src/dialog/ContactsDialog.cpp similarity index 93% rename from src/dialog/contactsdialog.cpp rename to src/dialog/ContactsDialog.cpp index 455a265..4e32db0 100644 --- a/src/dialog/contactsdialog.cpp +++ b/src/dialog/ContactsDialog.cpp @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#include "ui_contactsdialog.h" -#include "contactsdialog.h" +#include "ui_ContactsDialog.h" +#include "ContactsDialog.h" ContactsDialog::ContactsDialog(QWidget *parent, const QString &address, const QString &name) : QDialog(parent) diff --git a/src/dialog/contactsdialog.h b/src/dialog/ContactsDialog.h similarity index 100% rename from src/dialog/contactsdialog.h rename to src/dialog/ContactsDialog.h diff --git a/src/dialog/contactsdialog.ui b/src/dialog/ContactsDialog.ui similarity index 100% rename from src/dialog/contactsdialog.ui rename to src/dialog/ContactsDialog.ui diff --git a/src/dialog/debuginfodialog.cpp b/src/dialog/DebugInfoDialog.cpp similarity index 99% rename from src/dialog/debuginfodialog.cpp rename to src/dialog/DebugInfoDialog.cpp index f6371ad..8e9b490 100644 --- a/src/dialog/debuginfodialog.cpp +++ b/src/dialog/DebugInfoDialog.cpp @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#include "debuginfodialog.h" -#include "ui_debuginfodialog.h" +#include "DebugInfoDialog.h" +#include "ui_DebugInfoDialog.h" #include "config-feather.h" #include "utils/WebsocketClient.h" #include "utils/TorManager.h" diff --git a/src/dialog/debuginfodialog.h b/src/dialog/DebugInfoDialog.h similarity index 100% rename from src/dialog/debuginfodialog.h rename to src/dialog/DebugInfoDialog.h diff --git a/src/dialog/debuginfodialog.ui b/src/dialog/DebugInfoDialog.ui similarity index 100% rename from src/dialog/debuginfodialog.ui rename to src/dialog/DebugInfoDialog.ui diff --git a/src/dialog/keysdialog.cpp b/src/dialog/KeysDialog.cpp similarity index 94% rename from src/dialog/keysdialog.cpp rename to src/dialog/KeysDialog.cpp index 5618481..96a499b 100644 --- a/src/dialog/keysdialog.cpp +++ b/src/dialog/KeysDialog.cpp @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#include "keysdialog.h" -#include "ui_keysdialog.h" +#include "KeysDialog.h" +#include "ui_KeysDialog.h" KeysDialog::KeysDialog(QSharedPointer ctx, QWidget *parent) : QDialog(parent) diff --git a/src/dialog/keysdialog.h b/src/dialog/KeysDialog.h similarity index 100% rename from src/dialog/keysdialog.h rename to src/dialog/KeysDialog.h diff --git a/src/dialog/keysdialog.ui b/src/dialog/KeysDialog.ui similarity index 100% rename from src/dialog/keysdialog.ui rename to src/dialog/KeysDialog.ui diff --git a/src/dialog/outputinfodialog.cpp b/src/dialog/OutputInfoDialog.cpp similarity index 95% rename from src/dialog/outputinfodialog.cpp rename to src/dialog/OutputInfoDialog.cpp index 26895bd..0ae203f 100644 --- a/src/dialog/outputinfodialog.cpp +++ b/src/dialog/OutputInfoDialog.cpp @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#include "outputinfodialog.h" -#include "ui_outputinfodialog.h" +#include "OutputInfoDialog.h" +#include "ui_OutputInfoDialog.h" #include "model/ModelUtils.h" #include "utils/utils.h" diff --git a/src/dialog/outputinfodialog.h b/src/dialog/OutputInfoDialog.h similarity index 100% rename from src/dialog/outputinfodialog.h rename to src/dialog/OutputInfoDialog.h diff --git a/src/dialog/outputinfodialog.ui b/src/dialog/OutputInfoDialog.ui similarity index 100% rename from src/dialog/outputinfodialog.ui rename to src/dialog/OutputInfoDialog.ui diff --git a/src/dialog/outputsweepdialog.cpp b/src/dialog/OutputSweepDialog.cpp similarity index 95% rename from src/dialog/outputsweepdialog.cpp rename to src/dialog/OutputSweepDialog.cpp index f92c3a2..9625ab2 100644 --- a/src/dialog/outputsweepdialog.cpp +++ b/src/dialog/OutputSweepDialog.cpp @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#include "ui_outputsweepdialog.h" -#include "outputsweepdialog.h" +#include "OutputSweepDialog.h" +#include "ui_OutputSweepDialog.h" #include "libwalletqt/WalletManager.h" OutputSweepDialog::OutputSweepDialog(QWidget *parent, CoinsInfo* coin) diff --git a/src/dialog/outputsweepdialog.h b/src/dialog/OutputSweepDialog.h similarity index 100% rename from src/dialog/outputsweepdialog.h rename to src/dialog/OutputSweepDialog.h diff --git a/src/dialog/outputsweepdialog.ui b/src/dialog/OutputSweepDialog.ui similarity index 100% rename from src/dialog/outputsweepdialog.ui rename to src/dialog/OutputSweepDialog.ui diff --git a/src/dialog/passwordchangedialog.cpp b/src/dialog/PasswordChangeDialog.cpp similarity index 97% rename from src/dialog/passwordchangedialog.cpp rename to src/dialog/PasswordChangeDialog.cpp index 106e001..c0a02b5 100644 --- a/src/dialog/passwordchangedialog.cpp +++ b/src/dialog/PasswordChangeDialog.cpp @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#include "passwordchangedialog.h" -#include "ui_passwordchangedialog.h" +#include "PasswordChangeDialog.h" +#include "ui_PasswordChangeDialog.h" #include diff --git a/src/dialog/passwordchangedialog.h b/src/dialog/PasswordChangeDialog.h similarity index 100% rename from src/dialog/passwordchangedialog.h rename to src/dialog/PasswordChangeDialog.h diff --git a/src/dialog/passwordchangedialog.ui b/src/dialog/PasswordChangeDialog.ui similarity index 100% rename from src/dialog/passwordchangedialog.ui rename to src/dialog/PasswordChangeDialog.ui diff --git a/src/dialog/passworddialog.cpp b/src/dialog/PasswordDialog.cpp similarity index 92% rename from src/dialog/passworddialog.cpp rename to src/dialog/PasswordDialog.cpp index 284c47f..bca2d3c 100644 --- a/src/dialog/passworddialog.cpp +++ b/src/dialog/PasswordDialog.cpp @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#include "passworddialog.h" -#include "ui_passworddialog.h" +#include "PasswordDialog.h" +#include "ui_PasswordDialog.h" #include "utils/Icons.h" PasswordDialog::PasswordDialog(const QString &walletName, bool incorrectPassword, QWidget *parent) diff --git a/src/dialog/passworddialog.h b/src/dialog/PasswordDialog.h similarity index 100% rename from src/dialog/passworddialog.h rename to src/dialog/PasswordDialog.h diff --git a/src/dialog/passworddialog.ui b/src/dialog/PasswordDialog.ui similarity index 100% rename from src/dialog/passworddialog.ui rename to src/dialog/PasswordDialog.ui diff --git a/src/dialog/qrcodedialog.cpp b/src/dialog/QrCodeDialog.cpp similarity index 96% rename from src/dialog/qrcodedialog.cpp rename to src/dialog/QrCodeDialog.cpp index a7dee06..411133b 100644 --- a/src/dialog/qrcodedialog.cpp +++ b/src/dialog/QrCodeDialog.cpp @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#include "qrcodedialog.h" -#include "ui_qrcodedialog.h" +#include "QrCodeDialog.h" +#include "ui_QrCodeDialog.h" #include #include diff --git a/src/dialog/qrcodedialog.h b/src/dialog/QrCodeDialog.h similarity index 100% rename from src/dialog/qrcodedialog.h rename to src/dialog/QrCodeDialog.h diff --git a/src/dialog/qrcodedialog.ui b/src/dialog/QrCodeDialog.ui similarity index 100% rename from src/dialog/qrcodedialog.ui rename to src/dialog/QrCodeDialog.ui diff --git a/src/dialog/seeddialog.cpp b/src/dialog/SeedDialog.cpp similarity index 98% rename from src/dialog/seeddialog.cpp rename to src/dialog/SeedDialog.cpp index ca8405d..b2788b7 100644 --- a/src/dialog/seeddialog.cpp +++ b/src/dialog/SeedDialog.cpp @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#include "ui_seeddialog.h" -#include "seeddialog.h" +#include "ui_SeedDialog.h" +#include "SeedDialog.h" #include "constants.h" SeedDialog::SeedDialog(QSharedPointer ctx, QWidget *parent) diff --git a/src/dialog/seeddialog.h b/src/dialog/SeedDialog.h similarity index 100% rename from src/dialog/seeddialog.h rename to src/dialog/SeedDialog.h diff --git a/src/dialog/seeddialog.ui b/src/dialog/SeedDialog.ui similarity index 100% rename from src/dialog/seeddialog.ui rename to src/dialog/SeedDialog.ui diff --git a/src/dialog/signverifydialog.cpp b/src/dialog/SignVerifyDialog.cpp similarity index 96% rename from src/dialog/signverifydialog.cpp rename to src/dialog/SignVerifyDialog.cpp index 283c33b..49f8363 100644 --- a/src/dialog/signverifydialog.cpp +++ b/src/dialog/SignVerifyDialog.cpp @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#include "signverifydialog.h" -#include "ui_signverifydialog.h" +#include "SignVerifyDialog.h" +#include "ui_SignVerifyDialog.h" #include "utils/utils.h" #include diff --git a/src/dialog/signverifydialog.h b/src/dialog/SignVerifyDialog.h similarity index 100% rename from src/dialog/signverifydialog.h rename to src/dialog/SignVerifyDialog.h diff --git a/src/dialog/signverifydialog.ui b/src/dialog/SignVerifyDialog.ui similarity index 100% rename from src/dialog/signverifydialog.ui rename to src/dialog/SignVerifyDialog.ui diff --git a/src/dialog/splashdialog.cpp b/src/dialog/SplashDialog.cpp similarity index 93% rename from src/dialog/splashdialog.cpp rename to src/dialog/SplashDialog.cpp index 06b2481..191ae89 100644 --- a/src/dialog/splashdialog.cpp +++ b/src/dialog/SplashDialog.cpp @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#include "splashdialog.h" -#include "ui_splashdialog.h" +#include "SplashDialog.h" +#include "ui_SplashDialog.h" #include "utils/Icons.h" SplashDialog::SplashDialog(QWidget *parent) diff --git a/src/dialog/splashdialog.h b/src/dialog/SplashDialog.h similarity index 100% rename from src/dialog/splashdialog.h rename to src/dialog/SplashDialog.h diff --git a/src/dialog/splashdialog.ui b/src/dialog/SplashDialog.ui similarity index 100% rename from src/dialog/splashdialog.ui rename to src/dialog/SplashDialog.ui diff --git a/src/dialog/torinfodialog.cpp b/src/dialog/TorInfoDialog.cpp similarity index 99% rename from src/dialog/torinfodialog.cpp rename to src/dialog/TorInfoDialog.cpp index 59ebbf5..9abda78 100644 --- a/src/dialog/torinfodialog.cpp +++ b/src/dialog/TorInfoDialog.cpp @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#include "torinfodialog.h" -#include "ui_torinfodialog.h" +#include "TorInfoDialog.h" +#include "ui_TorInfoDialog.h" #include #include diff --git a/src/dialog/torinfodialog.h b/src/dialog/TorInfoDialog.h similarity index 100% rename from src/dialog/torinfodialog.h rename to src/dialog/TorInfoDialog.h diff --git a/src/dialog/torinfodialog.ui b/src/dialog/TorInfoDialog.ui similarity index 100% rename from src/dialog/torinfodialog.ui rename to src/dialog/TorInfoDialog.ui diff --git a/src/dialog/transactioninfodialog.cpp b/src/dialog/TransactionInfoDialog.cpp similarity index 98% rename from src/dialog/transactioninfodialog.cpp rename to src/dialog/TransactionInfoDialog.cpp index b4d0adc..547ae96 100644 --- a/src/dialog/transactioninfodialog.cpp +++ b/src/dialog/TransactionInfoDialog.cpp @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#include "transactioninfodialog.h" -#include "ui_transactioninfodialog.h" +#include "TransactionInfoDialog.h" +#include "ui_TransactionInfoDialog.h" #include "libwalletqt/CoinsInfo.h" #include "libwalletqt/WalletManager.h" diff --git a/src/dialog/transactioninfodialog.h b/src/dialog/TransactionInfoDialog.h similarity index 100% rename from src/dialog/transactioninfodialog.h rename to src/dialog/TransactionInfoDialog.h diff --git a/src/dialog/transactioninfodialog.ui b/src/dialog/TransactionInfoDialog.ui similarity index 100% rename from src/dialog/transactioninfodialog.ui rename to src/dialog/TransactionInfoDialog.ui diff --git a/src/dialog/txconfadvdialog.cpp b/src/dialog/TxConfAdvDialog.cpp similarity index 98% rename from src/dialog/txconfadvdialog.cpp rename to src/dialog/TxConfAdvDialog.cpp index 2f27c55..c10665e 100644 --- a/src/dialog/txconfadvdialog.cpp +++ b/src/dialog/TxConfAdvDialog.cpp @@ -1,10 +1,11 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#include "txconfadvdialog.h" -#include "ui_txconfadvdialog.h" +#include "TxConfAdvDialog.h" +#include "ui_TxConfAdvDialog.h" + #include "qrcode/QrCode.h" -#include "dialog/qrcodedialog.h" +#include "dialog/QrCodeDialog.h" #include "libwalletqt/Transfer.h" #include "libwalletqt/Input.h" #include "model/ModelUtils.h" diff --git a/src/dialog/txconfadvdialog.h b/src/dialog/TxConfAdvDialog.h similarity index 100% rename from src/dialog/txconfadvdialog.h rename to src/dialog/TxConfAdvDialog.h diff --git a/src/dialog/txconfadvdialog.ui b/src/dialog/TxConfAdvDialog.ui similarity index 100% rename from src/dialog/txconfadvdialog.ui rename to src/dialog/TxConfAdvDialog.ui diff --git a/src/dialog/txconfdialog.cpp b/src/dialog/TxConfDialog.cpp similarity index 97% rename from src/dialog/txconfdialog.cpp rename to src/dialog/TxConfDialog.cpp index dbf9f23..d7880f2 100644 --- a/src/dialog/txconfdialog.cpp +++ b/src/dialog/TxConfDialog.cpp @@ -1,16 +1,17 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#include "txconfdialog.h" -#include "ui_txconfdialog.h" +#include "TxConfDialog.h" +#include "ui_TxConfDialog.h" + +#include + #include "model/ModelUtils.h" -#include "txconfadvdialog.h" +#include "TxConfAdvDialog.h" #include "constants.h" #include "utils/AppData.h" #include "utils/ColorScheme.h" -#include - TxConfDialog::TxConfDialog(QSharedPointer ctx, PendingTransaction *tx, const QString &address, const QString &description, QWidget *parent) : QDialog(parent) , ui(new Ui::TxConfDialog) diff --git a/src/dialog/txconfdialog.h b/src/dialog/TxConfDialog.h similarity index 100% rename from src/dialog/txconfdialog.h rename to src/dialog/TxConfDialog.h diff --git a/src/dialog/txconfdialog.ui b/src/dialog/TxConfDialog.ui similarity index 100% rename from src/dialog/txconfdialog.ui rename to src/dialog/TxConfDialog.ui diff --git a/src/dialog/tximportdialog.cpp b/src/dialog/TxImportDialog.cpp similarity index 98% rename from src/dialog/tximportdialog.cpp rename to src/dialog/TxImportDialog.cpp index a256248..1a47a56 100644 --- a/src/dialog/tximportdialog.cpp +++ b/src/dialog/TxImportDialog.cpp @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#include "tximportdialog.h" -#include "ui_tximportdialog.h" +#include "TxImportDialog.h" +#include "ui_TxImportDialog.h" #include "utils/NetworkManager.h" #include diff --git a/src/dialog/tximportdialog.h b/src/dialog/TxImportDialog.h similarity index 100% rename from src/dialog/tximportdialog.h rename to src/dialog/TxImportDialog.h diff --git a/src/dialog/tximportdialog.ui b/src/dialog/TxImportDialog.ui similarity index 100% rename from src/dialog/tximportdialog.ui rename to src/dialog/TxImportDialog.ui diff --git a/src/dialog/verifyproofdialog.cpp b/src/dialog/VerifyProofDialog.cpp similarity index 98% rename from src/dialog/verifyproofdialog.cpp rename to src/dialog/VerifyProofDialog.cpp index ecabd65..ff7238e 100644 --- a/src/dialog/verifyproofdialog.cpp +++ b/src/dialog/VerifyProofDialog.cpp @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#include "verifyproofdialog.h" -#include "ui_verifyproofdialog.h" +#include "VerifyProofDialog.h" +#include "ui_VerifyProofDialog.h" #include "libwalletqt/WalletManager.h" #include "utils/utils.h" diff --git a/src/dialog/verifyproofdialog.h b/src/dialog/VerifyProofDialog.h similarity index 100% rename from src/dialog/verifyproofdialog.h rename to src/dialog/VerifyProofDialog.h diff --git a/src/dialog/verifyproofdialog.ui b/src/dialog/VerifyProofDialog.ui similarity index 100% rename from src/dialog/verifyproofdialog.ui rename to src/dialog/VerifyProofDialog.ui diff --git a/src/dialog/viewonlydialog.cpp b/src/dialog/ViewOnlyDialog.cpp similarity index 97% rename from src/dialog/viewonlydialog.cpp rename to src/dialog/ViewOnlyDialog.cpp index 8aead69..2a6b88b 100644 --- a/src/dialog/viewonlydialog.cpp +++ b/src/dialog/ViewOnlyDialog.cpp @@ -5,8 +5,8 @@ #include #include -#include "viewonlydialog.h" -#include "ui_viewonlydialog.h" +#include "ViewOnlyDialog.h" +#include "ui_ViewOnlyDialog.h" ViewOnlyDialog::ViewOnlyDialog(QSharedPointer ctx, QWidget *parent) : QDialog(parent) diff --git a/src/dialog/viewonlydialog.h b/src/dialog/ViewOnlyDialog.h similarity index 100% rename from src/dialog/viewonlydialog.h rename to src/dialog/ViewOnlyDialog.h diff --git a/src/dialog/viewonlydialog.ui b/src/dialog/ViewOnlyDialog.ui similarity index 100% rename from src/dialog/viewonlydialog.ui rename to src/dialog/ViewOnlyDialog.ui diff --git a/src/dialog/walletinfodialog.cpp b/src/dialog/WalletInfoDialog.cpp similarity index 95% rename from src/dialog/walletinfodialog.cpp rename to src/dialog/WalletInfoDialog.cpp index 57ae5c4..58cfaee 100644 --- a/src/dialog/walletinfodialog.cpp +++ b/src/dialog/WalletInfoDialog.cpp @@ -1,8 +1,8 @@ // SPDX-License-Identifier: BSD-3-Clause // Copyright (c) 2020-2021, The Monero Project. -#include "walletinfodialog.h" -#include "ui_walletinfodialog.h" +#include "WalletInfoDialog.h" +#include "ui_WalletInfoDialog.h" #include diff --git a/src/dialog/walletinfodialog.h b/src/dialog/WalletInfoDialog.h similarity index 100% rename from src/dialog/walletinfodialog.h rename to src/dialog/WalletInfoDialog.h diff --git a/src/dialog/walletinfodialog.ui b/src/dialog/WalletInfoDialog.ui similarity index 100% rename from src/dialog/walletinfodialog.ui rename to src/dialog/WalletInfoDialog.ui diff --git a/src/historywidget.cpp b/src/historywidget.cpp index a0e8602..ccff54b 100644 --- a/src/historywidget.cpp +++ b/src/historywidget.cpp @@ -3,7 +3,7 @@ #include "historywidget.h" #include "ui_historywidget.h" -#include "dialog/transactioninfodialog.h" +#include "dialog/TransactionInfoDialog.h" #include "dialog/TxProofDialog.h" #include "utils/Icons.h" #include "utils/config.h" diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index b869d89..22d78a6 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -8,16 +8,16 @@ #include "ui_mainwindow.h" #include "config-feather.h" -#include "dialog/txconfdialog.h" -#include "dialog/txconfadvdialog.h" -#include "dialog/debuginfodialog.h" -#include "dialog/walletinfodialog.h" -#include "dialog/torinfodialog.h" -#include "dialog/viewonlydialog.h" -#include "dialog/broadcasttxdialog.h" -#include "dialog/tximportdialog.h" -#include "dialog/passworddialog.h" -#include "dialog/balancedialog.h" +#include "dialog/TxConfDialog.h" +#include "dialog/TxConfAdvDialog.h" +#include "dialog/DebugInfoDialog.h" +#include "dialog/WalletInfoDialog.h" +#include "dialog/TorInfoDialog.h" +#include "dialog/ViewOnlyDialog.h" +#include "dialog/BroadcastTxDialog.h" +#include "dialog/TxImportDialog.h" +#include "dialog/PasswordDialog.h" +#include "dialog/BalanceDialog.h" #include "dialog/WalletCacheDebugDialog.h" #include "dialog/UpdateDialog.h" #include "dialog/AccountSwitcherDialog.h" diff --git a/src/mainwindow.h b/src/mainwindow.h index a54f2b8..228a469 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -14,15 +14,15 @@ #include "calcwindow.h" #include "settings.h" -#include "dialog/aboutdialog.h" -#include "dialog/signverifydialog.h" -#include "dialog/verifyproofdialog.h" -#include "dialog/seeddialog.h" -#include "dialog/passwordchangedialog.h" -#include "dialog/keysdialog.h" -#include "dialog/aboutdialog.h" +#include "dialog/AboutDialog.h" +#include "dialog/SignVerifyDialog.h" +#include "dialog/VerifyProofDialog.h" +#include "dialog/SeedDialog.h" +#include "dialog/PasswordChangeDialog.h" +#include "dialog/KeysDialog.h" +#include "dialog/AboutDialog.h" #include "dialog/RestoreHeightDialog.h" -#include "dialog/splashdialog.h" +#include "dialog/SplashDialog.h" #include "libwalletqt/Wallet.h" #include "model/SubaddressModel.h" #include "model/SubaddressProxyModel.h" diff --git a/src/receivewidget.cpp b/src/receivewidget.cpp index e5a74e6..68f4cee 100644 --- a/src/receivewidget.cpp +++ b/src/receivewidget.cpp @@ -4,7 +4,7 @@ #include "ui_receivewidget.h" #include "receivewidget.h" #include "model/ModelUtils.h" -#include "dialog/qrcodedialog.h" +#include "dialog/QrCodeDialog.h" #include "utils/Icons.h" #include