From 5a886fd7f45d67669d36fc9542e15ea3d0290018 Mon Sep 17 00:00:00 2001 From: cryptonotefoundation Date: Thu, 30 Apr 2015 15:11:48 +0300 Subject: [PATCH] Improve CryptoNoteCoin settings usage --- README.md | 2 +- src/CommandLineParser.cpp | 1 - src/CommandLineParser.h | 1 - src/CryptoNote.cpp | 1 - src/CryptoNote.h | 1 - src/CurrencyAdapter.cpp | 5 +- src/CurrencyAdapter.h | 2 +- src/NodeAdapter.cpp | 4 +- src/NodeAdapter.h | 1 - src/Settings.cpp | 1 - src/Settings.h | 1 - src/SignalHandler.cpp | 1 - src/SignalHandler.h | 1 - src/WalletAdapter.cpp | 1 - src/WalletAdapter.h | 1 - src/gui/AboutDialog.cpp | 1 - src/gui/AboutDialog.h | 1 - src/gui/AddressBookDialog.cpp | 1 - src/gui/AddressBookDialog.h | 1 - src/gui/AddressBookFrame.cpp | 1 - src/gui/AddressBookFrame.h | 1 - src/gui/AddressBookModel.cpp | 1 - src/gui/AddressBookModel.h | 1 - src/gui/AnimatedLabel.cpp | 1 - src/gui/AnimatedLabel.h | 1 - src/gui/ChangePasswordDialog.cpp | 1 - src/gui/ChangePasswordDialog.h | 1 - src/gui/ExitWidget.cpp | 1 - src/gui/ExitWidget.h | 1 - src/gui/MainWindow.cpp | 1 - src/gui/MainWindow.h | 1 - src/gui/MainWindow.mm | 1 - src/gui/NewAddressDialog.cpp | 1 - src/gui/NewAddressDialog.h | 1 - src/gui/NewPasswordDialog.cpp | 1 - src/gui/NewPasswordDialog.h | 1 - src/gui/OverviewFrame.cpp | 1 - src/gui/OverviewFrame.h | 1 - src/gui/PasswordDialog.cpp | 1 - src/gui/PasswordDialog.h | 1 - src/gui/ReceiveFrame.cpp | 1 - src/gui/ReceiveFrame.h | 1 - src/gui/RecentTransactionsModel.cpp | 1 - src/gui/RecentTransactionsModel.h | 1 - src/gui/SendFrame.cpp | 22 +++--- src/gui/SendFrame.h | 3 +- src/gui/SortedTransactionsModel.cpp | 1 - src/gui/SortedTransactionsModel.h | 1 - src/gui/TransactionDetailsDialog.cpp | 1 - src/gui/TransactionDetailsDialog.h | 1 - src/gui/TransactionFrame.cpp | 1 - src/gui/TransactionFrame.h | 1 - src/gui/TransactionsFrame.cpp | 1 - src/gui/TransactionsFrame.h | 1 - src/gui/TransactionsListModel.cpp | 1 - src/gui/TransactionsListModel.h | 1 - src/gui/TransactionsModel.cpp | 1 - src/gui/TransactionsModel.h | 1 - src/gui/TransferFrame.cpp | 1 - src/gui/TransferFrame.h | 1 - src/gui/WalletEvents.h | 1 - src/gui/ui/sendframe.ui | 108 +++++++++++++-------------- src/main.cpp | 1 - 63 files changed, 71 insertions(+), 131 deletions(-) diff --git a/README.md b/README.md index 681feba..a3d153c 100644 --- a/README.md +++ b/README.md @@ -29,5 +29,5 @@ Replace URL with git remote repository of your coin. **4. Build** ``` -mkdir build && cmake .. && make +mkdir build && cd build && cmake .. && make ``` diff --git a/src/CommandLineParser.cpp b/src/CommandLineParser.cpp index 817e314..e2bbb72 100644 --- a/src/CommandLineParser.cpp +++ b/src/CommandLineParser.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #include #include diff --git a/src/CommandLineParser.h b/src/CommandLineParser.h index e6930e2..cbc2ebb 100644 --- a/src/CommandLineParser.h +++ b/src/CommandLineParser.h @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #pragma once #include diff --git a/src/CryptoNote.cpp b/src/CryptoNote.cpp index 440fb7a..f3590ac 100644 --- a/src/CryptoNote.cpp +++ b/src/CryptoNote.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #include "CryptoNote.h" #include "cryptonote_core/cryptonote_basic_impl.h" #include "cryptonote_core/cryptonote_format_utils.h" diff --git a/src/CryptoNote.h b/src/CryptoNote.h index ee3acdc..bcf452c 100644 --- a/src/CryptoNote.h +++ b/src/CryptoNote.h @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #pragma once #include diff --git a/src/CurrencyAdapter.cpp b/src/CurrencyAdapter.cpp index 26d0514..49c5326 100644 --- a/src/CurrencyAdapter.cpp +++ b/src/CurrencyAdapter.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #include "CurrencyAdapter.h" #include "CryptoNoteWalletConfig.h" @@ -39,6 +38,10 @@ QString CurrencyAdapter::getCurrencyTicker() const { return WALLET_CURRENCY_TICKER; } +quint64 CurrencyAdapter::getMinimumFee() const { + return m_currency.minimumFee(); +} + QString CurrencyAdapter::formatAmount(quint64 _amount) const { QString result = QString::number(_amount); if (result.length() < getNumberOfDecimalPlaces() + 1) { diff --git a/src/CurrencyAdapter.h b/src/CurrencyAdapter.h index 3f9a720..57dbef4 100644 --- a/src/CurrencyAdapter.h +++ b/src/CurrencyAdapter.h @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #pragma once #include @@ -20,6 +19,7 @@ public: QString getCurrencyDisplayName() const; QString getCurrencyName() const; QString getCurrencyTicker() const; + quint64 getMinimumFee() const; quintptr getNumberOfDecimalPlaces() const; QString formatAmount(quint64 _amount) const; quint64 parseAmount(const QString& _amountString) const; diff --git a/src/NodeAdapter.cpp b/src/NodeAdapter.cpp index 1f14ab8..2df069e 100644 --- a/src/NodeAdapter.cpp +++ b/src/NodeAdapter.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #include #include #include @@ -111,8 +110,7 @@ CryptoNote::IWallet* NodeAdapter::createWallet() const { bool NodeAdapter::init() { Q_ASSERT(m_node == nullptr); - // TODO Insert the right URL for the local daemon - QUrl localNodeUrl = QUrl::fromUserInput(""); + QUrl localNodeUrl = QUrl::fromUserInput(QString("127.0.0.1:%1").arg(cryptonote::RPC_DEFAULT_PORT)); m_node = createRpcNode(CurrencyAdapter::instance().getCurrency(), *this, localNodeUrl.host().toStdString(), localNodeUrl.port()); diff --git a/src/NodeAdapter.h b/src/NodeAdapter.h index 18467a4..d344d33 100644 --- a/src/NodeAdapter.h +++ b/src/NodeAdapter.h @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #pragma once #include diff --git a/src/Settings.cpp b/src/Settings.cpp index 547047b..3bb8308 100644 --- a/src/Settings.cpp +++ b/src/Settings.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #include #include #include diff --git a/src/Settings.h b/src/Settings.h index 20ffe4d..5e6c5c9 100644 --- a/src/Settings.h +++ b/src/Settings.h @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #pragma once #include diff --git a/src/SignalHandler.cpp b/src/SignalHandler.cpp index 445250f..1a1f96c 100644 --- a/src/SignalHandler.cpp +++ b/src/SignalHandler.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #include #include "SignalHandler.h" diff --git a/src/SignalHandler.h b/src/SignalHandler.h index fac3966..959fae7 100644 --- a/src/SignalHandler.h +++ b/src/SignalHandler.h @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #pragma once #include diff --git a/src/WalletAdapter.cpp b/src/WalletAdapter.cpp index 436e2cd..316c3b9 100644 --- a/src/WalletAdapter.cpp +++ b/src/WalletAdapter.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #include #include #include diff --git a/src/WalletAdapter.h b/src/WalletAdapter.h index 615f819..43bde8c 100644 --- a/src/WalletAdapter.h +++ b/src/WalletAdapter.h @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #pragma once #include diff --git a/src/gui/AboutDialog.cpp b/src/gui/AboutDialog.cpp index 1e3418e..db31103 100644 --- a/src/gui/AboutDialog.cpp +++ b/src/gui/AboutDialog.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #include "AboutDialog.h" #include "CurrencyAdapter.h" #include "Settings.h" diff --git a/src/gui/AboutDialog.h b/src/gui/AboutDialog.h index fdb9775..3523d93 100644 --- a/src/gui/AboutDialog.h +++ b/src/gui/AboutDialog.h @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #pragma once #include diff --git a/src/gui/AddressBookDialog.cpp b/src/gui/AddressBookDialog.cpp index 71c66b3..cef815d 100644 --- a/src/gui/AddressBookDialog.cpp +++ b/src/gui/AddressBookDialog.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #include "AddressBookDialog.h" #include "AddressBookModel.h" diff --git a/src/gui/AddressBookDialog.h b/src/gui/AddressBookDialog.h index d9aba9f..915dba6 100644 --- a/src/gui/AddressBookDialog.h +++ b/src/gui/AddressBookDialog.h @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #pragma once #include diff --git a/src/gui/AddressBookFrame.cpp b/src/gui/AddressBookFrame.cpp index ca612aa..4b3d2c5 100644 --- a/src/gui/AddressBookFrame.cpp +++ b/src/gui/AddressBookFrame.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #include #include diff --git a/src/gui/AddressBookFrame.h b/src/gui/AddressBookFrame.h index 444d733..2e6c411 100644 --- a/src/gui/AddressBookFrame.h +++ b/src/gui/AddressBookFrame.h @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #pragma once #include diff --git a/src/gui/AddressBookModel.cpp b/src/gui/AddressBookModel.cpp index 7f9d457..93c6a46 100644 --- a/src/gui/AddressBookModel.cpp +++ b/src/gui/AddressBookModel.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #include #include #include diff --git a/src/gui/AddressBookModel.h b/src/gui/AddressBookModel.h index a07a3ab..9d21903 100644 --- a/src/gui/AddressBookModel.h +++ b/src/gui/AddressBookModel.h @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #pragma once #include diff --git a/src/gui/AnimatedLabel.cpp b/src/gui/AnimatedLabel.cpp index 88b919f..3c8cdd1 100644 --- a/src/gui/AnimatedLabel.cpp +++ b/src/gui/AnimatedLabel.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #include "AnimatedLabel.h" namespace WalletGui { diff --git a/src/gui/AnimatedLabel.h b/src/gui/AnimatedLabel.h index 42bd642..3636ff3 100644 --- a/src/gui/AnimatedLabel.h +++ b/src/gui/AnimatedLabel.h @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #pragma once #include diff --git a/src/gui/ChangePasswordDialog.cpp b/src/gui/ChangePasswordDialog.cpp index a4267e0..a956452 100644 --- a/src/gui/ChangePasswordDialog.cpp +++ b/src/gui/ChangePasswordDialog.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #include "ChangePasswordDialog.h" #include "ui_changepassworddialog.h" diff --git a/src/gui/ChangePasswordDialog.h b/src/gui/ChangePasswordDialog.h index 8e83d41..1bf3291 100644 --- a/src/gui/ChangePasswordDialog.h +++ b/src/gui/ChangePasswordDialog.h @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #pragma once #include diff --git a/src/gui/ExitWidget.cpp b/src/gui/ExitWidget.cpp index 6395905..5777b51 100644 --- a/src/gui/ExitWidget.cpp +++ b/src/gui/ExitWidget.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #include #include "CurrencyAdapter.h" diff --git a/src/gui/ExitWidget.h b/src/gui/ExitWidget.h index dbe75b2..88cf1d6 100644 --- a/src/gui/ExitWidget.h +++ b/src/gui/ExitWidget.h @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #pragma once #include diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp index 0bbb18f..8ff81ad 100644 --- a/src/gui/MainWindow.cpp +++ b/src/gui/MainWindow.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #include #include #include diff --git a/src/gui/MainWindow.h b/src/gui/MainWindow.h index 0ae5574..50178e4 100644 --- a/src/gui/MainWindow.h +++ b/src/gui/MainWindow.h @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #pragma once #include diff --git a/src/gui/MainWindow.mm b/src/gui/MainWindow.mm index 146ff6e..68e088c 100644 --- a/src/gui/MainWindow.mm +++ b/src/gui/MainWindow.mm @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #import #import diff --git a/src/gui/NewAddressDialog.cpp b/src/gui/NewAddressDialog.cpp index 084d5cb..f964988 100644 --- a/src/gui/NewAddressDialog.cpp +++ b/src/gui/NewAddressDialog.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #include "NewAddressDialog.h" #include "ui_newaddressdialog.h" diff --git a/src/gui/NewAddressDialog.h b/src/gui/NewAddressDialog.h index 152c377..a0f10d5 100644 --- a/src/gui/NewAddressDialog.h +++ b/src/gui/NewAddressDialog.h @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #pragma once #include diff --git a/src/gui/NewPasswordDialog.cpp b/src/gui/NewPasswordDialog.cpp index f169301..3197b3c 100644 --- a/src/gui/NewPasswordDialog.cpp +++ b/src/gui/NewPasswordDialog.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #include "NewPasswordDialog.h" #include "ui_newpassworddialog.h" diff --git a/src/gui/NewPasswordDialog.h b/src/gui/NewPasswordDialog.h index f84e907..e9428b5 100644 --- a/src/gui/NewPasswordDialog.h +++ b/src/gui/NewPasswordDialog.h @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #pragma once #include diff --git a/src/gui/OverviewFrame.cpp b/src/gui/OverviewFrame.cpp index 0141677..dba280b 100644 --- a/src/gui/OverviewFrame.cpp +++ b/src/gui/OverviewFrame.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #include "CurrencyAdapter.h" #include "OverviewFrame.h" #include "TransactionFrame.h" diff --git a/src/gui/OverviewFrame.h b/src/gui/OverviewFrame.h index e44456b..aeb12c4 100644 --- a/src/gui/OverviewFrame.h +++ b/src/gui/OverviewFrame.h @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #pragma once #include diff --git a/src/gui/PasswordDialog.cpp b/src/gui/PasswordDialog.cpp index bd1d982..a4a5236 100644 --- a/src/gui/PasswordDialog.cpp +++ b/src/gui/PasswordDialog.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #include "PasswordDialog.h" #include "ui_passworddialog.h" diff --git a/src/gui/PasswordDialog.h b/src/gui/PasswordDialog.h index ee2c68c..7480f26 100644 --- a/src/gui/PasswordDialog.h +++ b/src/gui/PasswordDialog.h @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #pragma once #include diff --git a/src/gui/ReceiveFrame.cpp b/src/gui/ReceiveFrame.cpp index b167cca..20d18b3 100644 --- a/src/gui/ReceiveFrame.cpp +++ b/src/gui/ReceiveFrame.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #include #include "ReceiveFrame.h" diff --git a/src/gui/ReceiveFrame.h b/src/gui/ReceiveFrame.h index c407acf..b9a3386 100644 --- a/src/gui/ReceiveFrame.h +++ b/src/gui/ReceiveFrame.h @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #pragma once #include diff --git a/src/gui/RecentTransactionsModel.cpp b/src/gui/RecentTransactionsModel.cpp index 1a0992c..fc42acc 100644 --- a/src/gui/RecentTransactionsModel.cpp +++ b/src/gui/RecentTransactionsModel.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #include "RecentTransactionsModel.h" #include "SortedTransactionsModel.h" diff --git a/src/gui/RecentTransactionsModel.h b/src/gui/RecentTransactionsModel.h index 7a86cca..6d8bf9d 100644 --- a/src/gui/RecentTransactionsModel.h +++ b/src/gui/RecentTransactionsModel.h @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #pragma once #include diff --git a/src/gui/SendFrame.cpp b/src/gui/SendFrame.cpp index 9ac69ad..499898c 100644 --- a/src/gui/SendFrame.cpp +++ b/src/gui/SendFrame.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #include "AddressBookModel.h" #include "CurrencyAdapter.h" #include "MainWindow.h" @@ -16,8 +15,6 @@ namespace WalletGui { -const quint64 MINIMAL_FEE = 1000000; - SendFrame::SendFrame(QWidget* _parent) : QFrame(_parent), m_ui(new Ui::SendFrame) { m_ui->setupUi(this); clearAllClicked(); @@ -85,12 +82,7 @@ void SendFrame::sendClicked() { } } - quint64 fee = MINIMAL_FEE; - if (fee < MINIMAL_FEE) { - QCoreApplication::postEvent(&MainWindow::instance(), new ShowMessageEvent(tr("Minimum allowed fee is 0.01"), QtCriticalMsg)); - return; - } - + quint64 fee = CurrencyAdapter::instance().getMinimumFee(); if (WalletAdapter::instance().isOpen()) { WalletAdapter::instance().sendTransaction(walletTransfers, fee, m_ui->m_paymentIdEdit->text(), m_ui->m_mixinSlider->value()); } @@ -100,11 +92,15 @@ void SendFrame::mixinValueChanged(int _value) { m_ui->m_mixinEdit->setText(QString::number(_value)); } -void SendFrame::sendTransactionCompleted(CryptoNote::TransactionId _id, bool _result, const QString& _errorText) { +void SendFrame::sendTransactionCompleted(CryptoNote::TransactionId _id, bool _error, const QString& _errorText) { Q_UNUSED(_id); - Q_UNUSED(_result); - Q_UNUSED(_errorText); - clearAllClicked(); + if (_error) { + QCoreApplication::postEvent( + &MainWindow::instance(), + new ShowMessageEvent(_errorText, QtCriticalMsg)); + } else { + clearAllClicked(); + } } void SendFrame::walletActualBalanceUpdated(quint64 _balance) { diff --git a/src/gui/SendFrame.h b/src/gui/SendFrame.h index eceac98..83692eb 100644 --- a/src/gui/SendFrame.h +++ b/src/gui/SendFrame.h @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #pragma once #include @@ -29,7 +28,7 @@ private: QScopedPointer m_ui; QList m_transfers; - void sendTransactionCompleted(CryptoNote::TransactionId _id, bool _result, const QString& _error_text); + void sendTransactionCompleted(CryptoNote::TransactionId _id, bool _error, const QString& _error_text); void walletActualBalanceUpdated(quint64 _balance); Q_SLOT void addRecipientClicked(); diff --git a/src/gui/SortedTransactionsModel.cpp b/src/gui/SortedTransactionsModel.cpp index 47fe856..62e291a 100644 --- a/src/gui/SortedTransactionsModel.cpp +++ b/src/gui/SortedTransactionsModel.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #include #include "SortedTransactionsModel.h" diff --git a/src/gui/SortedTransactionsModel.h b/src/gui/SortedTransactionsModel.h index bd46883..15722b8 100644 --- a/src/gui/SortedTransactionsModel.h +++ b/src/gui/SortedTransactionsModel.h @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #pragma once #include diff --git a/src/gui/TransactionDetailsDialog.cpp b/src/gui/TransactionDetailsDialog.cpp index e3c3313..af3d2f6 100644 --- a/src/gui/TransactionDetailsDialog.cpp +++ b/src/gui/TransactionDetailsDialog.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #include #include "CurrencyAdapter.h" diff --git a/src/gui/TransactionDetailsDialog.h b/src/gui/TransactionDetailsDialog.h index 0d116bb..63e53ff 100644 --- a/src/gui/TransactionDetailsDialog.h +++ b/src/gui/TransactionDetailsDialog.h @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #pragma once #include diff --git a/src/gui/TransactionFrame.cpp b/src/gui/TransactionFrame.cpp index 3cf53ed..4b719a6 100644 --- a/src/gui/TransactionFrame.cpp +++ b/src/gui/TransactionFrame.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #include #include "MainWindow.h" diff --git a/src/gui/TransactionFrame.h b/src/gui/TransactionFrame.h index ba5a971..9b414d5 100644 --- a/src/gui/TransactionFrame.h +++ b/src/gui/TransactionFrame.h @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #pragma once #include diff --git a/src/gui/TransactionsFrame.cpp b/src/gui/TransactionsFrame.cpp index 97a533d..708402a 100644 --- a/src/gui/TransactionsFrame.cpp +++ b/src/gui/TransactionsFrame.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #include #include diff --git a/src/gui/TransactionsFrame.h b/src/gui/TransactionsFrame.h index 7bbbddd..59da753 100644 --- a/src/gui/TransactionsFrame.h +++ b/src/gui/TransactionsFrame.h @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #pragma once #include diff --git a/src/gui/TransactionsListModel.cpp b/src/gui/TransactionsListModel.cpp index 1921a17..56635ba 100644 --- a/src/gui/TransactionsListModel.cpp +++ b/src/gui/TransactionsListModel.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #include "SortedTransactionsModel.h" #include "TransactionsListModel.h" #include "TransactionsModel.h" diff --git a/src/gui/TransactionsListModel.h b/src/gui/TransactionsListModel.h index ead5f02..ea7fc3b 100644 --- a/src/gui/TransactionsListModel.h +++ b/src/gui/TransactionsListModel.h @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #pragma once #include diff --git a/src/gui/TransactionsModel.cpp b/src/gui/TransactionsModel.cpp index a0dc94e..95ba54d 100644 --- a/src/gui/TransactionsModel.cpp +++ b/src/gui/TransactionsModel.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #include #include #include diff --git a/src/gui/TransactionsModel.h b/src/gui/TransactionsModel.h index 883e9ea..9c117b0 100644 --- a/src/gui/TransactionsModel.h +++ b/src/gui/TransactionsModel.h @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #pragma once #include diff --git a/src/gui/TransferFrame.cpp b/src/gui/TransferFrame.cpp index a19dc24..54c562a 100644 --- a/src/gui/TransferFrame.cpp +++ b/src/gui/TransferFrame.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #include #include diff --git a/src/gui/TransferFrame.h b/src/gui/TransferFrame.h index e6bee51..22bd5bf 100644 --- a/src/gui/TransferFrame.h +++ b/src/gui/TransferFrame.h @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #pragma once #include diff --git a/src/gui/WalletEvents.h b/src/gui/WalletEvents.h index 4e55a78..7a71774 100644 --- a/src/gui/WalletEvents.h +++ b/src/gui/WalletEvents.h @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #pragma once #include diff --git a/src/gui/ui/sendframe.ui b/src/gui/ui/sendframe.ui index 69040c6..b2465a7 100644 --- a/src/gui/ui/sendframe.ui +++ b/src/gui/ui/sendframe.ui @@ -72,60 +72,6 @@ 5 - - - - - 200 - 16777215 - - - - 10 - - - 1 - - - 2 - - - false - - - Qt::Horizontal - - - QSlider::TicksBothSides - - - 1 - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 298 - 20 - - - - - - - - PaymentID: - - - @@ -158,6 +104,60 @@ + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 298 + 20 + + + + + + + + PaymentID: + + + + + + + + 200 + 16777215 + + + + 10 + + + 1 + + + 1 + + + false + + + Qt::Horizontal + + + QSlider::TicksBothSides + + + 1 + + + diff --git a/src/main.cpp b/src/main.cpp index bf49ad9..f29e932 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2,7 +2,6 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. - #include #include #include